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

Fix bug from resizing the window with glsl gamma in use.

Browse source
This commit is contained in:
Shpoike 2020-06-19 21:23:04 +01:00
parent 36b2046f57
commit 1f521aadb2
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Quake/gl_rmain.c
View file

@ -188,6 +188,7 @@ GLSLGamma_GammaCorrect
*/ */
void GLSLGamma_GammaCorrect (void) void GLSLGamma_GammaCorrect (void)
{ {
int tw=glwidth,th=glheight;
float smax, tmax; float smax, tmax;
if (!gl_glsl_gamma_able) if (!gl_glsl_gamma_able)
@ -200,17 +201,21 @@ void GLSLGamma_GammaCorrect (void)
if (!r_gamma_texture) if (!r_gamma_texture)
{ {
glGenTextures (1, &r_gamma_texture); glGenTextures (1, &r_gamma_texture);
glBindTexture (GL_TEXTURE_2D, r_gamma_texture); r_gamma_texture_width = 0;
r_gamma_texture_height = 0;
}
GL_DisableMultitexture();
glBindTexture (GL_TEXTURE_2D, r_gamma_texture);
r_gamma_texture_width = glwidth; if (!gl_texture_NPOT)
r_gamma_texture_height = glheight; {
tw = TexMgr_Pad(tw);
if (!gl_texture_NPOT) th = TexMgr_Pad(th);
{ }
r_gamma_texture_width = TexMgr_Pad(r_gamma_texture_width); if (r_gamma_texture_width != tw || r_gamma_texture_height != th)
r_gamma_texture_height = TexMgr_Pad(r_gamma_texture_height); {
} r_gamma_texture_width = tw;
r_gamma_texture_height = th;
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); 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);
@ -227,8 +232,6 @@ void GLSLGamma_GammaCorrect (void)
} }
// copy the framebuffer to the texture // copy the framebuffer to the texture
GL_DisableMultitexture();
glBindTexture (GL_TEXTURE_2D, r_gamma_texture);
glCopyTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, glx, gly, glwidth, glheight); glCopyTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, glx, gly, glwidth, glheight);
// draw the texture back to the framebuffer with a fragment shader // draw the texture back to the framebuffer with a fragment shader