fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-10 12:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

GLSLGamma_GammaCorrect: support this code path on old cards without the NPOT extension

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1231 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Eric Wasylishen 2015-06-15 21:17:39 +00:00
parent 4c7ebfd20b
commit 56a7b45200
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Quake/gl_rmain.c
View file

@ -113,6 +113,7 @@ qboolean r_drawflat_cheatsafe, r_fullbright_cheatsafe, r_lightmap_cheatsafe, r_d
static GLuint r_gamma_texture; static GLuint r_gamma_texture;
static GLuint r_gamma_program; static GLuint r_gamma_program;
static int r_gamma_texture_width, r_gamma_texture_height;
// uniforms used in gamma shader // uniforms used in gamma shader
static GLuint gammaLoc; static GLuint gammaLoc;
@ -173,6 +174,8 @@ GLSLGamma_GammaCorrect
*/ */
void GLSLGamma_GammaCorrect (void) void GLSLGamma_GammaCorrect (void)
{ {
float smax, tmax;
if (!gl_glsl_gamma_able) if (!gl_glsl_gamma_able)
return; return;
@ -185,7 +188,16 @@ void GLSLGamma_GammaCorrect (void)
glGenTextures (1, &r_gamma_texture); glGenTextures (1, &r_gamma_texture);
glBindTexture (GL_TEXTURE_2D, r_gamma_texture); glBindTexture (GL_TEXTURE_2D, r_gamma_texture);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, glwidth, glheight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); r_gamma_texture_width = glwidth;
r_gamma_texture_height = glheight;
if (!gl_texture_NPOT)
{
r_gamma_texture_width = TexMgr_Pad(r_gamma_texture_width);
r_gamma_texture_height = TexMgr_Pad(r_gamma_texture_height);
}
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, r_gamma_texture_width, r_gamma_texture_height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
} }
@ -215,14 +227,17 @@ void GLSLGamma_GammaCorrect (void)
glViewport (glx, gly, glwidth, glheight); glViewport (glx, gly, glwidth, glheight);
smax = glwidth/(float)r_gamma_texture_width;
tmax = glheight/(float)r_gamma_texture_height;
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord2f (0, 0); glTexCoord2f (0, 0);
glVertex2f (-1, -1); glVertex2f (-1, -1);
glTexCoord2f (1, 0); glTexCoord2f (smax, 0);
glVertex2f (1, -1); glVertex2f (1, -1);
glTexCoord2f (1, 1); glTexCoord2f (smax, tmax);
glVertex2f (1, 1); glVertex2f (1, 1);
glTexCoord2f (0, 1); glTexCoord2f (0, tmax);
glVertex2f (-1, 1); glVertex2f (-1, 1);
glEnd (); glEnd ();

2
Quake/gl_vidsdl.c
View file

@ -1160,7 +1160,7 @@ static void GL_CheckExtensions (void)
// //
if (COM_CheckParm("-noglslgamma")) if (COM_CheckParm("-noglslgamma"))
Con_Warning ("GLSL gamma disabled at command line\n"); Con_Warning ("GLSL gamma disabled at command line\n");
else if (gl_glsl_able && gl_texture_NPOT) else if (gl_glsl_able)
{ {
gl_glsl_gamma_able = true; gl_glsl_gamma_able = true;
} }