Difference for arch/ogl/include/ogl_init.h from version 1.24 to 1.25

version 1.24

version 1.25

Line 53

extern int ogl_mem_target;

ogl_texture* ogl_get_free_texture(void);

void ogl_init_texture(ogl_texture* t);

void ogl_init_texture(ogl_texture* t, int w, int h, int flags);

void ogl_init_texture_list_internal(void);

void ogl_smash_texture_list_internal(void);

void ogl_vivify_texture_list_internal(void);

Line 67

extern int ogl_voodoohack;

extern int ogl_alttexmerge;//merge textures by just printing the seperate textures?

extern int ogl_rgba_format;

extern int ogl_rgba_internalformat;

extern int ogl_rgb_internalformat;

extern int ogl_setgammaramp_ok;

extern int ogl_intensity4_ok;

extern int ogl_luminance4_alpha4_ok;

Line 178

Line 179

#define OGLTEXBUFSIZE (2048*2048*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,int type);

void ogl_filltexbuf(unsigned char *data,GLubyte *texp,int truewidth,int width,int height,int dxo,int dyo,int twidth,int theight,int type, int bm_flags);

void ogl_loadbmtexture_m(grs_bitmap *bm,int domipmap);

#define OGL_FLAG_MIPMAP (1<<0)

#define OGL_FLAG_NOCOLOR (1<<1)

#define OGL_FLAG_ALPHA (1<<31) //not required for ogl_loadbmtexture, since it uses the BM_FLAG_TRANSPARENT, but is needed for ogl_init_texture.

void ogl_loadbmtexture_f(grs_bitmap *bm,int flags);

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 dxo,int dyo, ogl_texture *tex, int bm_flags);

Legend:
line(s) removed in v.1.24
line(s) changed
	line(s) added in v.1.25