zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed some Linux warnings.

This commit is contained in:
Christoph Oelckers 2014-05-24 16:53:57 +02:00
parent 12c038a234
commit a1ec6ab1ba
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gl/scene/gl_scene.cpp
View File

@ -747,7 +747,7 @@ void FGLRenderer::DrawBlend(sector_t * viewsector)
// for various reasons (performance and keeping the lighting code clean) // for various reasons (performance and keeping the lighting code clean)
// we no longer do colormapped textures on pre GL 3.0 hardware and instead do // we no longer do colormapped textures on pre GL 3.0 hardware and instead do
// just a fullscreen overlay to emulate the inverse invulnerability effect or similar fullscreen blends. // just a fullscreen overlay to emulate the inverse invulnerability effect or similar fullscreen blends.
if (gl_fixedcolormap >= CM_FIRSTSPECIALCOLORMAP && gl_fixedcolormap < CM_MAXCOLORMAP) if (gl_fixedcolormap >= (DWORD)CM_FIRSTSPECIALCOLORMAP && gl_fixedcolormap < (DWORD)CM_MAXCOLORMAP)
{ {
FSpecialColormap *scm = &SpecialColormaps[gl_fixedcolormap - CM_FIRSTSPECIALCOLORMAP]; FSpecialColormap *scm = &SpecialColormaps[gl_fixedcolormap - CM_FIRSTSPECIALCOLORMAP];
@ -764,13 +764,14 @@ void FGLRenderer::DrawBlend(sector_t * viewsector)
g = scm->ColorizeEnd[1]; g = scm->ColorizeEnd[1];
b = scm->ColorizeEnd[2]; b = scm->ColorizeEnd[2];
} }
} }
else if (gl_enhanced_nightvision) else if (gl_enhanced_nightvision)
{ {
if (gl_fixedcolormap == CM_LITE) if (gl_fixedcolormap == CM_LITE)
{ {
r = 0.375f, g = 1.0f, b = 0.375f; r = 0.375f;
g = 1.0f;
b = 0.375f;
} }
else if (gl_fixedcolormap >= CM_TORCH) else if (gl_fixedcolormap >= CM_TORCH)
{ {
@ -782,6 +783,7 @@ void FGLRenderer::DrawBlend(sector_t * viewsector)
} }
else r = g = b = 1.f; else r = g = b = 1.f;
} }
else r = g = b = 1.f;
if (inverse) if (inverse)
{ {

4
src/gl/shaders/gl_shader.cpp
View File

@ -400,7 +400,7 @@ void FShaderManager::Clean()
{ {
if (gl.hasGLSL()) if (gl.hasGLSL())
{ {
glUseProgram(NULL); glUseProgram(0);
mActiveShader = NULL; mActiveShader = NULL;
for (unsigned int i = 0; i < mTextureEffects.Size(); i++) for (unsigned int i = 0; i < mTextureEffects.Size(); i++)
@ -446,7 +446,7 @@ void FShaderManager::SetActiveShader(FShader *sh)
{ {
if (gl.hasGLSL() && mActiveShader != sh) if (gl.hasGLSL() && mActiveShader != sh)
{ {
glUseProgram(sh!= NULL? sh->GetHandle() : NULL); glUseProgram(sh!= NULL? sh->GetHandle() : 0);
mActiveShader = sh; mActiveShader = sh;
} }
} }