@ -106,6 +106,7 @@ void GL_Bind (int texnum)
return ;
currenttexture = texnum ;
# ifdef UQ_GLDEBUG
/ / jkrige - opengl ' s bind function
/ / # ifdef _WIN32
/ / bindTexFunc ( GL_TEXTURE_2D , texnum ) ;
@ -113,7 +114,7 @@ void GL_Bind (int texnum)
glBindTexture ( GL_TEXTURE_2D , texnum ) ;
/ / # endif
/ / jkrige - opengl ' s bind function
# endif / / UQ_GLDEBUG
}
@ -461,6 +462,7 @@ void Draw_TextureMode_f (void)
gl_filter_min = modes [ i ] . minimize ;
gl_filter_max = modes [ i ] . maximize ;
# ifdef UQ_GLDEBUG
/ / change all the existing mipmap texture objects
for ( j = 0 , glt = gltextures ; j < numgltextures ; j + + , glt + + )
{
@ -527,7 +529,7 @@ void Draw_TextureMode_f (void)
glTexParameterf ( GL_TEXTURE_2D , GL_TEXTURE_MAG_FILTER , GL_LINEAR ) ;
}
/ / sky textures
# endif / / UQ_GLDEBUG
tex_mode = gl_texturemode . value ;
}
@ -648,8 +650,10 @@ void Draw_Init (void)
gl - > texnum = GL_LoadTexture ( " conback " , " lump " , conback - > width , conback - > height , ncdata , false , false , 1 ) ;
/ / jkrige - external texture loading
# ifdef UQ_GLDEBUG
glTexParameterf ( GL_TEXTURE_2D , GL_TEXTURE_MIN_FILTER , GL_LINEAR ) ;
glTexParameterf ( GL_TEXTURE_2D , GL_TEXTURE_MAG_FILTER , GL_LINEAR ) ;
# endif / / UQ_GLDEBUG
gl - > sl = 0 ;
gl - > sh = 1 ;
gl - > tl = 0 ;
@ -687,6 +691,7 @@ smoothly scrolled off.
*/
void Draw_Character ( int x , int y , int num )
{
# ifdef UQ_GLDEBUG
byte * dest ;
byte * source ;
unsigned short * pusdest ;
@ -721,6 +726,7 @@ void Draw_Character (int x, int y, int num)
glTexCoord2f ( fcol , frow + size ) ;
glVertex2f ( x , y + 8 ) ;
glEnd ( ) ;
# endif / / UQ_GLDEBUG
}
/*
@ -758,6 +764,7 @@ Draw_AlphaPic
*/
void Draw_AlphaPic ( int x , int y , qpic_t * pic , float alpha )
{
# ifdef UQ_GLDEBUG
byte * dest , * source ;
unsigned short * pusdest ;
int v , u ;
@ -785,6 +792,7 @@ void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
glColor4f ( 1 , 1 , 1 , 1 ) ;
glEnable ( GL_ALPHA_TEST ) ;
glDisable ( GL_BLEND ) ;
# endif
}
@ -795,6 +803,7 @@ Draw_Pic
*/
void Draw_Pic ( int x , int y , qpic_t * pic )
{
# ifdef UQ_GLDEBUG
byte * dest , * source ;
unsigned short * pusdest ;
int v , u ;
@ -815,6 +824,7 @@ void Draw_Pic (int x, int y, qpic_t *pic)
glTexCoord2f ( gl - > sl , gl - > th ) ;
glVertex2f ( x , y + pic - > height ) ;
glEnd ( ) ;
# endif
}
@ -847,6 +857,7 @@ Only used for the player color selection menu
*/
void Draw_TransPicTranslate ( int x , int y , qpic_t * pic , byte * translation )
{
# ifdef UQ_GLDEBUG
int v , u , c ;
unsigned trans [ 64 * 64 ] , * dest ;
byte * src ;
@ -888,6 +899,7 @@ void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation)
glTexCoord2f ( 0 , 1 ) ;
glVertex2f ( x , y + pic - > height ) ;
glEnd ( ) ;
# endif / / UQ_GLDEBUG
}
/ / jkrige - print version info to the console
@ -949,6 +961,7 @@ refresh window.
*/
void Draw_TileClear ( int x , int y , int w , int h )
{
# ifdef UQ_GLDEBUG
glColor3f ( 1 , 1 , 1 ) ;
GL_Bind ( * ( int * ) draw_backtile - > data ) ;
glBegin ( GL_QUADS ) ;
@ -961,6 +974,7 @@ void Draw_TileClear (int x, int y, int w, int h)
glTexCoord2f ( x / 64.0 , ( y + h ) / 64.0 ) ;
glVertex2f ( x , y + h ) ;
glEnd ( ) ;
# endif / / UQ_GLDEBUG
}
@ -973,6 +987,7 @@ Fills a box of pixels with a single color
*/
void Draw_Fill ( int x , int y , int w , int h , int c )
{
# ifdef UQ_GLDEBUG
glDisable ( GL_TEXTURE_2D ) ;
glColor3f ( host_basepal [ c * 3 ] / 255.0 ,
host_basepal [ c * 3 + 1 ] / 255.0 ,
@ -988,6 +1003,7 @@ void Draw_Fill (int x, int y, int w, int h, int c)
glEnd ( ) ;
glColor3f ( 1 , 1 , 1 ) ;
glEnable ( GL_TEXTURE_2D ) ;
# endif
}
/ / = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@ -999,6 +1015,7 @@ Draw_FadeScreen
*/
void Draw_FadeScreen ( void )
{
# ifdef UQ_GLDEBUG
glEnable ( GL_BLEND ) ;
glDisable ( GL_TEXTURE_2D ) ;
glColor4f ( 0 , 0 , 0 , 0.8 ) ;
@ -1015,6 +1032,7 @@ void Draw_FadeScreen (void)
glDisable ( GL_BLEND ) ;
/ / Sbar_Changed ( ) ; / / jkrige - always draw sbar
# endif
}
/ / = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@ -1029,11 +1047,13 @@ Call before beginning any disc IO.
*/
void Draw_BeginDisc ( void )
{
# ifdef UQ_GLDEBUG
if ( ! draw_disc )
return ;
glDrawBuffer ( GL_FRONT ) ;
Draw_Pic ( vid . width - 24 , 0 , draw_disc ) ;
glDrawBuffer ( GL_BACK ) ;
# endif
}
@ -1058,6 +1078,7 @@ Setup as if the screen was 320*200
*/
void GL_Set2D ( void )
{
# ifdef UQ_GLDEBUG
glViewport ( glx , gly , glwidth , glheight ) ;
glMatrixMode ( GL_PROJECTION ) ;
@ -1074,6 +1095,7 @@ void GL_Set2D (void)
/ / glDisable ( GL_ALPHA_TEST ) ;
glColor4f ( 1 , 1 , 1 , 1 ) ;
# endif
}
/ / = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@ -1226,6 +1248,7 @@ GL_Upload32
*/
void GL_Upload32 ( unsigned * data , int width , int height , qboolean mipmap , qboolean alpha )
{
# ifdef UQ_GLDEBUG
int samples ;
/ / jkrige - doubled textures
@ -1441,6 +1464,7 @@ done: ;
glTexParameterf ( GL_TEXTURE_2D , GL_TEXTURE_MIN_FILTER , gl_filter_max ) ;
glTexParameterf ( GL_TEXTURE_2D , GL_TEXTURE_MAG_FILTER , gl_filter_max ) ;
} */
# endif / / UQ_GLDEBUG
}
@ -1682,6 +1706,7 @@ GL_LoadTexture
int lhcsumtable [ 256 ] ;
int GL_LoadTexture ( char * identifier , char * textype , int width , int height , byte * data , qboolean mipmap , qboolean alpha , int bytesperpixel )
{
# ifdef UQ_GLDEBUG
/ / qboolean noalpha ;
int i , /*p,*/ s , lhcsum ;
gltexture_t * glt ;
@ -1828,6 +1853,7 @@ int GL_LoadTexture (char *identifier, char *textype, int width, int height, byte
}
return glt - > texnum ;
# endif / / UQ_GLDEBUG
}
/ / jkrige - memleak & texture mismatch