Difference for arch/ogl/include/ogl_init.h from version 1.14 to 1.15


version 1.14 version 1.15
Line 18
 
Line 18
 #include <GL/gl.h>  #include <GL/gl.h>
 #endif  #endif
   
   #ifndef GL_VERSION_1_1
   #ifdef GL_EXT_texture
   #define GL_INTENSITY4 GL_INTENSITY4_EXT
   #define GL_INTENSITY8 GL_INTENSITY8_EXT
   #endif
   #endif
   
   
 #include "gr.h"  #include "gr.h"
 #include "palette.h"  #include "palette.h"
 #include "types.h"  #include "types.h"
Line 29
 
Line 37
  int handle;   int handle;
  GLint internalformat;   GLint internalformat;
  GLenum format;   GLenum format;
  int w,h,tw,th;   int w,h,tw,th,lw;
    int bytesu;
    int bytes;
  GLfloat u,v;   GLfloat u,v;
  GLfloat prio;   GLfloat prio;
  int wrapstate;   int wrapstate;
  fix lastrend;   fix lastrend;
  ulong numrend;   ulong numrend;
    char wantmip;
 } ogl_texture;  } ogl_texture;
   
 extern ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE];  extern ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE];
Line 44
 
Line 55
 void ogl_init_texture(ogl_texture* t);  void ogl_init_texture(ogl_texture* t);
 void ogl_init_texture_list_internal(void);  void ogl_init_texture_list_internal(void);
 void ogl_smash_texture_list_internal(void);  void ogl_smash_texture_list_internal(void);
   void ogl_vivify_texture_list_internal(void);
   
 extern int ogl_fullscreen;  extern int ogl_fullscreen;
 void ogl_do_fullscreen_internal(void);  void ogl_do_fullscreen_internal(void);
Line 51
 
Line 63
 extern int ogl_voodoohack;  extern int ogl_voodoohack;
   
 extern int ogl_alttexmerge;//merge textures by just printing the seperate textures?  extern int ogl_alttexmerge;//merge textures by just printing the seperate textures?
 extern int ogl_16bittextures;  extern int ogl_rgba_format;
   extern int ogl_intensity4_ok;
   extern int ogl_luminance4_alpha4_ok;
   extern int ogl_rgba2_ok;
   extern int ogl_readpixels_ok;
   
 extern int gl_initialized;  extern int gl_initialized;
 extern int GL_texmagfilt,GL_texminfilt,GL_needmipmaps;  extern int GL_texmagfilt,GL_texminfilt,GL_needmipmaps;
Line 97
 
Line 113
 void ogl_loadbmtexture_m(grs_bitmap *bm,int domipmap);  void ogl_loadbmtexture_m(grs_bitmap *bm,int domipmap);
 void ogl_loadbmtexture(grs_bitmap *bm);  void ogl_loadbmtexture(grs_bitmap *bm);
 //void ogl_loadtexture(unsigned char * data, int width, int height,int dxo,int dyo, int *texid,float *u,float *v,char domipmap,float prio);  //void ogl_loadtexture(unsigned char * data, int width, int height,int dxo,int dyo, int *texid,float *u,float *v,char domipmap,float prio);
 void ogl_loadtexture(unsigned char * data, int dxo,int dyo, ogl_texture *tex,char domipmap);  void ogl_loadtexture(unsigned char * data, int dxo,int dyo, ogl_texture *tex);
 void ogl_freetexture(ogl_texture *gltexture);  void ogl_freetexture(ogl_texture *gltexture);
 void ogl_freebmtexture(grs_bitmap *bm);  void ogl_freebmtexture(grs_bitmap *bm);
 void ogl_do_palfx(void);  void ogl_do_palfx(void);
Line 111
 
Line 127
 bool ogl_ubitmapm_c(int x, int y,grs_bitmap *bm,int c);  bool ogl_ubitmapm_c(int x, int y,grs_bitmap *bm,int c);
 bool ogl_ubitmapm(int x, int y,grs_bitmap *bm);  bool ogl_ubitmapm(int x, int y,grs_bitmap *bm);
 bool ogl_ubitblt(int w,int h,int dx,int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);  bool ogl_ubitblt(int w,int h,int dx,int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
   bool ogl_ubitblt_tolinear(int w,int h,int dx,int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
   bool ogl_ubitblt_copy(int w,int h,int dx,int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
 void ogl_upixelc(int x, int y, int c);  void ogl_upixelc(int x, int y, int c);
 void ogl_ulinec(int left,int top,int right,int bot,int c);  void ogl_ulinec(int left,int top,int right,int bot,int c);
   

Legend:
line(s) removed in v.1.14 
line(s) changed
 line(s) added in v.1.15