Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary glClearColor calls. (They do not make fog any less broken.) 

Turn deprecated GL_CLAMP into GL_CLAMP_TO_EDGE.
master
per 2013-12-08 11:07:06 +01:00
parent 38dd24351e
commit eb9e6ee9f3
5 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ivis_opengl/piestate.cpp
View File

@ -511,10 +511,8 @@ void pie_SetFogStatus(bool val)
glFogf(GL_FOG_DENSITY, 0.35f);
glHint(GL_FOG_HINT, GL_DONT_CARE);
glEnable(GL_FOG);
glClearColor(fog_colour[0], fog_colour[1], fog_colour[2], fog_colour[3]);
} else {
glDisable(GL_FOG);
glClearColor(0, 0, 0, 0);
}
}
}

2
lib/ivis_opengl/screen.cpp
View File

@ -191,7 +191,6 @@ bool screenInitialise()
exit(1);
}
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
pie_Skybox_Init();
@ -317,7 +316,6 @@ void screenShutDown(void)
delete backdropGfx;
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
glErrors();
}

2
lib/qtgame/wzapp_qt.cpp
View File

@ -239,8 +239,6 @@ void WzMainWindow::resizeGL(int width, int height)
glLoadIdentity();
glCullFace(GL_FRONT);
glEnable(GL_CULL_FACE);
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
}
void WzMainWindow::paintGL()

3
lib/sdl/main_sdl.cpp
View File

@ -1245,9 +1245,6 @@ bool wzMain2(int antialiasing, bool fullscreen, bool vsync)
glCullFace(GL_FRONT);
glEnable(GL_CULL_FACE);
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
//END **** Was in old screenInitialise. ****
init_scrap();
return true;
}

4
src/terrain.cpp
View File

@ -997,8 +997,8 @@ bool initTerrain(void)
glBindTexture(GL_TEXTURE_2D, lightmap_tex_num);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);