TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mark various OGL functions static

Browse source
This commit is contained in:
Kp 2013-08-14 21:12:51 +00:00
parent 8ef8371563
commit 20cf3f4cdb
5 changed files with 37 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/include/internal.h
View file

@ -12,8 +12,6 @@ extern "C" {
/* I assume this ought to be >= MAX_BITMAP_FILES in piggy.h? */ /* I assume this ought to be >= MAX_BITMAP_FILES in piggy.h? */
#define OGL_TEXTURE_LIST_SIZE 20000 #define OGL_TEXTURE_LIST_SIZE 20000
extern ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE];
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); void ogl_vivify_texture_list_internal(void);
@ -21,6 +19,7 @@ void ogl_vivify_texture_list_internal(void);
extern int ogl_brightness_ok; extern int ogl_brightness_ok;
extern int ogl_brightness_r, ogl_brightness_g, ogl_brightness_b; extern int ogl_brightness_r, ogl_brightness_g, ogl_brightness_b;
extern int ogl_fullscreen; extern int ogl_fullscreen;
extern int r_upixelc;
extern int GL_TEXTURE_2D_enabled; extern int GL_TEXTURE_2D_enabled;
#define OGL_ENABLE2(a,f) {if (a ## _enabled!=1) {f;a ## _enabled=1;}} #define OGL_ENABLE2(a,f) {if (a ## _enabled!=1) {f;a ## _enabled=1;}}
@ -51,8 +50,6 @@ static inline void OGL_VIEWPORT(const unsigned x, const unsigned y, const unsign
//platform specific funcs //platform specific funcs
extern void ogl_swap_buffers_internal(void); extern void ogl_swap_buffers_internal(void);
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)

3
common/include/ogl_init.h
View file

@ -71,9 +71,6 @@ typedef struct _ogl_texture {
extern ogl_texture* ogl_get_free_texture(); extern ogl_texture* ogl_get_free_texture();
void ogl_init_texture(ogl_texture* t, int w, int h, int flags); void ogl_init_texture(ogl_texture* t, int w, int h, int flags);
extern int ogl_rgba_internalformat;
extern int ogl_rgb_internalformat;
void ogl_init_shared_palette(void); void ogl_init_shared_palette(void);
extern int gl_initialized; extern int gl_initialized;

1
similar/arch/ogl/gr.cpp
View file

@ -821,7 +821,6 @@ void gr_close()
#endif #endif
} }
extern int r_upixelc;
void ogl_upixelc(int x, int y, int c) void ogl_upixelc(int x, int y, int c)
{ {
GLfloat vertex_array[] = { (x+grd_curcanv->cv_bitmap.bm_x)/(float)last_width, 1.0-(y+grd_curcanv->cv_bitmap.bm_y)/(float)last_height }; GLfloat vertex_array[] = { (x+grd_curcanv->cv_bitmap.bm_x)/(float)last_width, 1.0-(y+grd_curcanv->cv_bitmap.bm_y)/(float)last_height };

77
similar/arch/ogl/ogl.c
View file

@ -69,46 +69,50 @@
#define sinf(a) sin(a) #define sinf(a) sin(a)
#endif #endif
unsigned char *ogl_pal=gr_palette; static GLubyte *pixels = NULL;
static GLubyte *texbuf = NULL;
static unsigned char *ogl_pal=gr_palette;
unsigned last_width=~0u,last_height=~0u; unsigned last_width=~0u,last_height=~0u;
int GL_TEXTURE_2D_enabled=-1; int GL_TEXTURE_2D_enabled=-1;
int GL_texclamp_enabled=-1;
GLfloat ogl_maxanisotropy = 0; GLfloat ogl_maxanisotropy = 0;
int r_texcount = 0, r_cachedtexcount = 0; static int r_texcount = 0, r_cachedtexcount = 0;
#ifdef OGLES #ifdef OGLES
int ogl_rgba_internalformat = GL_RGBA; static int ogl_rgba_internalformat = GL_RGBA;
int ogl_rgb_internalformat = GL_RGB; static int ogl_rgb_internalformat = GL_RGB;
#else #else
int ogl_rgba_internalformat = GL_RGBA8; static int ogl_rgba_internalformat = GL_RGBA8;
int ogl_rgb_internalformat = GL_RGB8; static int ogl_rgb_internalformat = GL_RGB8;
#endif #endif
GLfloat *sphere_va = NULL, *circle_va = NULL, *disk_va = NULL; static GLfloat *sphere_va = NULL, *circle_va = NULL, *disk_va = NULL;
GLfloat *secondary_lva[3]={NULL, NULL, NULL}; static GLfloat *secondary_lva[3]={NULL, NULL, NULL};
int r_polyc,r_tpolyc,r_bitmapc,r_ubitbltc,r_upixelc; static int r_polyc,r_tpolyc,r_bitmapc,r_ubitbltc;
int r_upixelc;
extern int linedotscale; extern int linedotscale;
#define f2glf(x) (f2fl(x)) #define f2glf(x) (f2fl(x))
#define OGL_BINDTEXTURE(a) glBindTexture(GL_TEXTURE_2D, a); #define OGL_BINDTEXTURE(a) glBindTexture(GL_TEXTURE_2D, a);
ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE]; static ogl_texture ogl_texture_list[OGL_TEXTURE_LIST_SIZE];
int ogl_texture_list_cur; static int ogl_texture_list_cur;
/* some function prototypes */ /* some function prototypes */
#define GL_TEXTURE0_ARB 0x84C0 #define GL_TEXTURE0_ARB 0x84C0
extern GLubyte *pixels; static int ogl_loadtexture(unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format, int texfilt);
extern GLubyte *texbuf; static void ogl_freetexture(ogl_texture *gltexture);
void ogl_filltexbuf(unsigned char *data, GLubyte *texp, unsigned truewidth, unsigned width, unsigned height, int dxo, int dyo, unsigned twidth, unsigned theight, int type, int bm_flags, int data_format);
void ogl_loadbmtexture(grs_bitmap *bm); static void ogl_loadbmtexture(grs_bitmap *bm)
int ogl_loadtexture(unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format, int texfilt); {
void ogl_freetexture(ogl_texture *gltexture); ogl_loadbmtexture_f(bm, GameCfg.TexFilt);
}
#ifdef OGLES #ifdef OGLES
// Replacement for gluPerspective // Replacement for gluPerspective
void perspective(double fovy, double aspect, double zNear, double zFar) static void perspective(double fovy, double aspect, double zNear, double zFar)
{ {
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
@ -127,7 +131,7 @@ void perspective(double fovy, double aspect, double zNear, double zFar)
} }
#endif #endif
void ogl_init_texture_stats(ogl_texture* t){ static void ogl_init_texture_stats(ogl_texture* t){
t->prio=0.3;//default prio t->prio=0.3;//default prio
t->numrend=0; t->numrend=0;
} }
@ -191,12 +195,12 @@ void ogl_init_texture(ogl_texture* t, int w, int h, int flags)
ogl_init_texture_stats(t); ogl_init_texture_stats(t);
} }
void ogl_reset_texture(ogl_texture* t) static void ogl_reset_texture(ogl_texture* t)
{ {
ogl_init_texture(t, 0, 0, 0); ogl_init_texture(t, 0, 0, 0);
} }
void ogl_reset_texture_stats_internal(void){ static void ogl_reset_texture_stats_internal(void){
int i; int i;
for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++) for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++)
if (ogl_texture_list[i].handle>0){ if (ogl_texture_list[i].handle>0){
@ -314,7 +318,7 @@ void ogl_texture_stats(void)
gr_printf(FSPACX(2), FSPACY(1)+(LINE_SPACING*3), "total=%iK", (colorsize + depthsize + truebytes) / 1024); gr_printf(FSPACX(2), FSPACY(1)+(LINE_SPACING*3), "total=%iK", (colorsize + depthsize + truebytes) / 1024);
} }
void ogl_bindbmtex(grs_bitmap *bm){ static void ogl_bindbmtex(grs_bitmap *bm){
if (bm->gltexture==NULL || bm->gltexture->handle<=0) if (bm->gltexture==NULL || bm->gltexture->handle<=0)
ogl_loadbmtexture(bm); ogl_loadbmtexture(bm);
OGL_BINDTEXTURE(bm->gltexture->handle); OGL_BINDTEXTURE(bm->gltexture->handle);
@ -322,7 +326,7 @@ void ogl_bindbmtex(grs_bitmap *bm){
} }
//gltexture MUST be bound first //gltexture MUST be bound first
void ogl_texwrap(ogl_texture *gltexture,int state) static void ogl_texwrap(ogl_texture *gltexture,int state)
{ {
if (gltexture->wrapstate != state || gltexture->numrend < 1) if (gltexture->wrapstate != state || gltexture->numrend < 1)
{ {
@ -533,7 +537,7 @@ void ogl_drawcircle(int nsides, int type, GLfloat *vertex_array)
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
} }
GLfloat *circle_array_init(int nsides) static GLfloat *circle_array_init(int nsides)
{ {
int i; int i;
float ang; float ang;
@ -547,8 +551,8 @@ GLfloat *circle_array_init(int nsides)
return vertex_array; return vertex_array;
} }
GLfloat *circle_array_init_2(int nsides, float xsc, float xo, float ysc, float yo) static GLfloat *circle_array_init_2(int nsides, float xsc, float xo, float ysc, float yo)
{ {
int i; int i;
float ang; float ang;
@ -1193,8 +1197,6 @@ void ogl_set_blending()
} }
} }
GLubyte *pixels = NULL;
void ogl_start_frame(void){ void ogl_start_frame(void){
r_polyc=0;r_tpolyc=0;r_bitmapc=0;r_ubitbltc=0;r_upixelc=0; r_polyc=0;r_tpolyc=0;r_bitmapc=0;r_ubitbltc=0;r_upixelc=0;
@ -1258,8 +1260,6 @@ int pow2ize(int x){
return i; return i;
} }
GLubyte *texbuf = NULL;
// Allocate the pixel buffers 'pixels' and 'texbuf' based on current screen resolution // Allocate the pixel buffers 'pixels' and 'texbuf' based on current screen resolution
void ogl_init_pixel_buffers(unsigned w, unsigned h) void ogl_init_pixel_buffers(unsigned w, unsigned h)
{ {
@ -1284,7 +1284,7 @@ void ogl_close_pixel_buffers(void)
d_free(texbuf); d_free(texbuf);
} }
void ogl_filltexbuf(unsigned char *data, GLubyte *texp, unsigned truewidth, unsigned width, unsigned height, int dxo, int dyo, unsigned twidth, unsigned theight, int type, int bm_flags, int data_format) static void ogl_filltexbuf(unsigned char *data, GLubyte *texp, unsigned truewidth, unsigned width, unsigned height, int dxo, int dyo, unsigned twidth, unsigned theight, int type, int bm_flags, int data_format)
{ {
if ((width > max(grd_curscreen->sc_w, 1024)) || (height > max(grd_curscreen->sc_h, 256))) if ((width > max(grd_curscreen->sc_w, 1024)) || (height > max(grd_curscreen->sc_h, 256)))
Error("Texture is too big: %ix%i", width, height); Error("Texture is too big: %ix%i", width, height);
@ -1416,7 +1416,7 @@ void ogl_filltexbuf(unsigned char *data, GLubyte *texp, unsigned truewidth, unsi
} }
} }
void tex_set_size1(ogl_texture *tex,int dbits,int bits,int w, int h){ static void tex_set_size1(ogl_texture *tex,int dbits,int bits,int w, int h){
int u; int u;
if (tex->tw!=w || tex->th!=h){ if (tex->tw!=w || tex->th!=h){
u=(tex->w/(float)tex->tw*w) * (tex->h/(float)tex->th*h); u=(tex->w/(float)tex->tw*w) * (tex->h/(float)tex->th*h);
@ -1433,7 +1433,7 @@ void tex_set_size1(ogl_texture *tex,int dbits,int bits,int w, int h){
glmprintf((0,"tex_set_size1: %ix%i, %ib(%i) %iB\n",w,h,bits,dbits,tex->bytes)); glmprintf((0,"tex_set_size1: %ix%i, %ib(%i) %iB\n",w,h,bits,dbits,tex->bytes));
} }
void tex_set_size(ogl_texture *tex){ static void tex_set_size(ogl_texture *tex){
GLint w,h; GLint w,h;
int bi=16,a=0; int bi=16,a=0;
#ifndef OGLES #ifndef OGLES
@ -1482,7 +1482,7 @@ void tex_set_size(ogl_texture *tex){
//In theory this could be a problem for repeating textures, but all real //In theory this could be a problem for repeating textures, but all real
//textures (not sprites, etc) in descent are 64x64, so we are ok. //textures (not sprites, etc) in descent are 64x64, so we are ok.
//stores OpenGL textured id in *texid and u/v values required to get only the real data in *u/*v //stores OpenGL textured id in *texid and u/v values required to get only the real data in *u/*v
int ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format, int texfilt) static int ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format, int texfilt)
{ {
GLubyte *bufP = texbuf; GLubyte *bufP = texbuf;
tex->tw = pow2ize (tex->w); tex->tw = pow2ize (tex->w);
@ -1653,12 +1653,7 @@ void ogl_loadbmtexture_f(grs_bitmap *bm, int texfilt)
ogl_loadtexture(buf, 0, 0, bm->gltexture, bm->bm_flags, 0, texfilt); ogl_loadtexture(buf, 0, 0, bm->gltexture, bm->bm_flags, 0, texfilt);
} }
void ogl_loadbmtexture(grs_bitmap *bm) static void ogl_freetexture(ogl_texture *gltexture)
{
ogl_loadbmtexture_f(bm, GameCfg.TexFilt);
}
void ogl_freetexture(ogl_texture *gltexture)
{ {
if (gltexture->handle>0) { if (gltexture->handle>0) {
r_texcount--; r_texcount--;

1
similar/main/gamerend.c
View file

@ -661,7 +661,6 @@ void toggle_cockpit()
} }
int last_drawn_cockpit = -1; int last_drawn_cockpit = -1;
extern void ogl_loadbmtexture(grs_bitmap *bm);
// This actually renders the new cockpit onto the screen. // This actually renders the new cockpit onto the screen.
void update_cockpits() void update_cockpits()