Difference for arch/ogl/include/ogl_init.h from version 1.10 to 1.11


version 1.10 version 1.11
Line 34
 
Line 34
 #ifndef _MSC_VER  #ifndef _MSC_VER
 inline   inline
 #endif  #endif
 void ogl_swap_buffers(void);  void ogl_swap_buffers_internal(void);
 int ogl_init_window(int x, int y);//create a window/switch modes/etc  int ogl_init_window(int x, int y);//create a window/switch modes/etc
 void ogl_destroy_window(void);//destroy window/etc  void ogl_destroy_window(void);//destroy window/etc
 void ogl_init(void);//one time initialization  void ogl_init(void);//one time initialization
 void ogl_close(void);//one time shutdown  void ogl_close(void);//one time shutdown
   
 //generic funcs  //generic funcs
   #define OGLTEXBUFSIZE (1024*1024*4)
   extern GLubyte texbuf[OGLTEXBUFSIZE];
   //void ogl_filltexbuf(unsigned char *data,GLubyte *texp,int width,int height,int twidth,int theight);
   void ogl_filltexbuf(unsigned char *data,GLubyte *texp,int truewidth,int width,int height,int dxo,int dyo,int twidth,int theight);
 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 *texid,float *u,float *v,int domipmap);  void ogl_loadtexture(unsigned char * data, int width, int height,int dxo,int dyo, int *texid,float *u,float *v,int domipmap);
   void ogl_freetexture(int *gltexture);
   void ogl_freebmtexture(grs_bitmap *bm);
 void ogl_do_palfx(void);  void ogl_do_palfx(void);
   void ogl_start_frame(void);
   void ogl_end_frame(void);
   void ogl_swap_buffers(void);
   void ogl_set_screen_mode(void);
   void ogl_cache_level_textures(void);
   
   void ogl_urect(int left,int top,int right,int bot);
 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);
   void ogl_upixelc(int x, int y, int c);
   void ogl_ulinec(int left,int top,int right,int bot,int c);
   
   extern unsigned char *ogl_pal;
   
 //whee  //whee
 //#define PAL2Tr(c) ((gr_palette[c*3]+gr_palette_gamma)/63.0)  //#define PAL2Tr(c) ((gr_palette[c*3]+gr_palette_gamma)/63.0)
 //#define PAL2Tg(c) ((gr_palette[c*3+1]+gr_palette_gamma)/63.0)  //#define PAL2Tg(c) ((gr_palette[c*3+1]+gr_palette_gamma)/63.0)
 //#define PAL2Tb(c) ((gr_palette[c*3+2]+gr_palette_gamma)/63.0)  //#define PAL2Tb(c) ((gr_palette[c*3+2]+gr_palette_gamma)/63.0)
 #define PAL2Tr(c) ((gr_palette[c*3])/63.0)  //#define PAL2Tr(c) ((gr_palette[c*3])/63.0)
 #define PAL2Tg(c) ((gr_palette[c*3+1])/63.0)  //#define PAL2Tg(c) ((gr_palette[c*3+1])/63.0)
 #define PAL2Tb(c) ((gr_palette[c*3+2])/63.0)  //#define PAL2Tb(c) ((gr_palette[c*3+2])/63.0)
   #define CPAL2Tr(c) ((gr_current_pal[c*3])/63.0)
   #define CPAL2Tg(c) ((gr_current_pal[c*3+1])/63.0)
   #define CPAL2Tb(c) ((gr_current_pal[c*3+2])/63.0)
   #define PAL2Tr(c) ((ogl_pal[c*3])/63.0)
   #define PAL2Tg(c) ((ogl_pal[c*3+1])/63.0)
   #define PAL2Tb(c) ((ogl_pal[c*3+2])/63.0)
 //inline GLfloat PAL2Tr(int c);  //inline GLfloat PAL2Tr(int c);
 //inline GLfloat PAL2Tg(int c);  //inline GLfloat PAL2Tg(int c);
 //inline GLfloat PAL2Tb(int c);  //inline GLfloat PAL2Tb(int c);

Legend:
line(s) removed in v.1.10 
line(s) changed
 line(s) added in v.1.11