stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 21:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix NOTEXTURE_NUM

Browse source
This commit is contained in:
Jaime Passos 2020-01-25 22:20:27 -03:00
parent 9b88edc458
commit 4a489c4d95
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/hardware/r_opengl/r_opengl.c
View file

@ -49,8 +49,7 @@ static const GLubyte white[4] = { 255, 255, 255, 255 };
// ========================================================================== // ==========================================================================
// With OpenGL 1.1+, the first texture should be 1 // With OpenGL 1.1+, the first texture should be 1
#define NOTEXTURE_NUM 1 // small white texture static GLuint NOTEXTURE_NUM = 0;
#define FIRST_TEX_AVAIL (NOTEXTURE_NUM + 1)
#define N_PI_DEMI (M_PIl/2.0f) //(1.5707963268f) #define N_PI_DEMI (M_PIl/2.0f) //(1.5707963268f)
@ -524,6 +523,8 @@ static void SetNoTexture(void)
// Set small white texture. // Set small white texture.
if (tex_downloaded != NOTEXTURE_NUM) if (tex_downloaded != NOTEXTURE_NUM)
{ {
if (NOTEXTURE_NUM == 0)
pglGenTextures(1, &NOTEXTURE_NUM);
pglBindTexture(GL_TEXTURE_2D, NOTEXTURE_NUM); pglBindTexture(GL_TEXTURE_2D, NOTEXTURE_NUM);
tex_downloaded = NOTEXTURE_NUM; tex_downloaded = NOTEXTURE_NUM;
} }
@ -638,11 +639,6 @@ void SetModelView(GLint w, GLint h)
// -----------------+ // -----------------+
void SetStates(void) void SetStates(void)
{ {
// Bind little white RGBA texture to ID NOTEXTURE_NUM.
/*
FUINT Data[8*8];
INT32 i;
*/
#ifdef GL_LIGHT_MODEL_AMBIENT #ifdef GL_LIGHT_MODEL_AMBIENT
GLfloat LightDiffuse[] = {1.0f, 1.0f, 1.0f, 1.0f}; GLfloat LightDiffuse[] = {1.0f, 1.0f, 1.0f, 1.0f};
#endif #endif
@ -676,16 +672,8 @@ void SetStates(void)
CurrentPolyFlags = 0xffffffff; CurrentPolyFlags = 0xffffffff;
SetBlend(0); SetBlend(0);
/* tex_downloaded = 0;
for (i = 0; i < 64; i++)
Data[i] = 0xffFFffFF; // white pixel
*/
tex_downloaded = (GLuint)-1;
SetNoTexture(); SetNoTexture();
//pglBindTexture(GL_TEXTURE_2D, NOTEXTURE_NUM);
//tex_downloaded = NOTEXTURE_NUM;
//pglTexImage2D(GL_TEXTURE_2D, 0, 4, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, Data);
pglPolygonOffset(-1.0f, -1.0f); pglPolygonOffset(-1.0f, -1.0f);