Difference for arch/ogl/include/ogl_init.h from version 1.21 to 1.22


version 1.21 version 1.22
Line 16
 
Line 16
 int ogl_init_load_library(void);  int ogl_init_load_library(void);
 #else  #else
 #include <GL/gl.h>  #include <GL/gl.h>
 //######hack, since multi texture support is not working  
 #undef GL_ARB_multitexture  
 #undef GL_SGIS_multitexture  
 #endif  #endif
   
 #ifndef GL_VERSION_1_1  #ifndef GL_VERSION_1_1
Line 45
 
Line 42
  int bytes;   int bytes;
  GLfloat u,v;   GLfloat u,v;
  GLfloat prio;   GLfloat prio;
  int wrapstate;   int wrapstate[2];
  fix lastrend;   fix lastrend;
  ulong numrend;   ulong numrend;
  char wantmip;   char wantmip;
Line 87
 
Line 84
 #define ogl_sgis_multitexture_ok 0  #define ogl_sgis_multitexture_ok 0
 #endif  #endif
   
   #ifndef EXT_texture_env_combine
   #define EXT_texture_env_combine 1
   #define GL_COMBINE_RGB_EXT                0x8571
   #define GL_COMBINE_ALPHA_EXT              0x8572
   #define GL_PRIMARY_COLOR_EXT              0x8577
   #define GL_PREVIOUS_EXT                   0x8578
   #define GL_SOURCE0_RGB_EXT                0x8580
   #define GL_SOURCE1_RGB_EXT                0x8581
   #define GL_SOURCE2_RGB_EXT                0x8582
   #define GL_SOURCE0_ALPHA_EXT              0x8588
   #define GL_SOURCE1_ALPHA_EXT              0x8589
   #define GL_SOURCE2_ALPHA_EXT              0x858A
   #define GL_OPERAND0_RGB_EXT               0x8590
   #define GL_OPERAND1_RGB_EXT               0x8591
   #define GL_OPERAND2_RGB_EXT               0x8592
   #define GL_OPERAND0_ALPHA_EXT             0x8598
   #define GL_OPERAND1_ALPHA_EXT             0x8599
   #define GL_OPERAND2_ALPHA_EXT             0x859A
   #endif
   
   #ifndef GL_NV_texture_env_combine4
   #define GL_NV_texture_env_combine4 1
   #define GL_COMBINE4_NV                    0x8503
   #define GL_SOURCE3_RGB_NV                 0x8583
   #define GL_SOURCE3_ALPHA_NV               0x858B
   #define GL_OPERAND3_RGB_NV                0x8593
   #define GL_OPERAND3_ALPHA_NV              0x859B
   #endif
   extern int ogl_nv_texture_env_combine4_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;
 extern int gl_reticle;  extern int gl_reticle;
   
   extern int active_texture_unit;
   void ogl_setActiveTexture(int t);
 extern int GL_TEXTURE_2D_enabled;  extern int GL_TEXTURE_2D_enabled;
 //extern int GL_texclamp_enabled;  //extern int GL_texclamp_enabled;
 //extern int GL_TEXTURE_ENV_MODE_state,GL_TEXTURE_MAG_FILTER_state,GL_TEXTURE_MIN_FILTER_state;  //extern int GL_TEXTURE_ENV_MODE_state,GL_TEXTURE_MAG_FILTER_state,GL_TEXTURE_MIN_FILTER_state;

Legend:
line(s) removed in v.1.21 
line(s) changed
 line(s) added in v.1.22