From d7fe3272e2e86096611bc7c233f576f9bc482b96 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 15 Jan 2024 16:29:01 +0100 Subject: [PATCH] Light table support for HWR_FadeScreenMenuBack --- src/hardware/hw_defs.h | 2 +- src/hardware/hw_draw.c | 18 +++++++++++++++-- src/hardware/hw_drv.h | 2 +- src/hardware/hw_main.c | 2 +- src/hardware/r_opengl/r_opengl.c | 34 +++++++++++++++++++++++++------- src/sdl/i_video.c | 2 +- src/sdl/ogl_sdl.c | 2 +- 7 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 2625a0ea6..09d7b89a1 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -294,7 +294,7 @@ enum hwdscreentexture HWD_SCREENTEXTURE_WIPE_START, // source image for the wipe/fade effect HWD_SCREENTEXTURE_WIPE_END, // destination image for the wipe/fade effect HWD_SCREENTEXTURE_GENERIC1, // underwater/heat effect, intermission background - HWD_SCREENTEXTURE_GENERIC2, // screen before palette rendering's postprocessing + HWD_SCREENTEXTURE_GENERIC2, // palette-based colormap fade, screen before palette rendering's postprocessing HWD_SCREENTEXTURE_GENERIC3, // screen after palette rendering's postprocessing NUMSCREENTEXTURES, // (generic3 is unused if palette rendering is disabled) }; diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 28f12c5c6..2f0c13773 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -562,6 +562,20 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength) if (color & 0xFF00) // Do COLORMAP fade. { + if (HWR_ShouldUsePaletteRendering()) + { + const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2; + + Surf.LightTableId = HWR_GetLightTableID(NULL); + Surf.LightInfo.light_level = strength; + HWD.pfnMakeScreenTexture(scr_tex); + HWD.pfnSetShader(12); + HWD.pfnDrawScreenTexture(scr_tex, &Surf, PF_ColorMapped|PF_NoDepthTest); + HWD.pfnUnSetShader(); + + return; + } + Surf.PolyColor.rgba = UINT2RGBA(0x01010160); Surf.PolyColor.s.alpha = (strength*8); } @@ -1158,7 +1172,7 @@ static inline boolean saveTGA(const char *file_name, void *buffer, UINT8 *HWR_GetScreenshot(void) { static UINT8 *buf = NULL; - int tex = ((HWR_ShouldUsePaletteRendering() && !cv_groldpal.value) ? HWD_SCREENTEXTURE_GENERIC3 : HWD_SCREENTEXTURE_GENERIC2); + int tex = (HWR_ShouldUsePaletteRendering() ? HWD_SCREENTEXTURE_GENERIC3 : HWD_SCREENTEXTURE_GENERIC2); buf = realloc(buf, vid.width * vid.height * 3); @@ -1174,7 +1188,7 @@ boolean HWR_Screenshot(const char *pathname) { boolean ret; UINT8 *buf = malloc(vid.width * vid.height * 3 * sizeof (*buf)); - int tex = ((HWR_ShouldUsePaletteRendering() && !cv_groldpal.value) ? HWD_SCREENTEXTURE_GENERIC3 : HWD_SCREENTEXTURE_GENERIC2); + int tex = (HWR_ShouldUsePaletteRendering() ? HWD_SCREENTEXTURE_GENERIC3 : HWD_SCREENTEXTURE_GENERIC2); if (!buf) { diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h index b022afe01..a8d588e7c 100644 --- a/src/hardware/hw_drv.h +++ b/src/hardware/hw_drv.h @@ -57,7 +57,7 @@ EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture EXPORT void HWRAPI(FlushScreenTextures) (void); EXPORT void HWRAPI(DoScreenWipe) (int wipeStart, int wipeEnd); -EXPORT void HWRAPI(DrawScreenTexture) (int tex); +EXPORT void HWRAPI(DrawScreenTexture) (int tex, FSurfaceInfo *surf, FBITFIELD polyflags); EXPORT void HWRAPI(MakeScreenTexture) (int tex); EXPORT void HWRAPI(DrawScreenFinalTexture) (int tex, int width, int height); diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index f3196a5db..5bbc07d94 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6615,7 +6615,7 @@ void HWR_EndScreenWipe(void) void HWR_DrawIntermissionBG(void) { - HWD.pfnDrawScreenTexture(HWD_SCREENTEXTURE_GENERIC1); + HWD.pfnDrawScreenTexture(HWD_SCREENTEXTURE_GENERIC1, NULL, 0); } void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index ebdfe06f5..702b3ca77 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -921,6 +921,19 @@ static float shader_leveltime = 0; "vec4 final_color = texture1D(palette_tex, palette_coord);\n" \ "gl_FragColor = final_color;\n" \ "}\0" + + +#define GLSL_UI_COLORMAP_FADE_SHADER \ + "uniform sampler2D tex;\n" \ + "uniform float lighting;\n" \ + "uniform sampler3D palette_lookup_tex;\n" \ + "uniform sampler2D lighttable_tex;\n" \ + "void main(void) {\n" \ + "vec4 texel = texture2D(tex, gl_TexCoord[0].st);\n" \ + "float tex_pal_idx = texture3D(palette_lookup_tex, vec3((texel * 63.0 + 0.5) / 64.0))[0] * 255.0;\n" \ + "vec2 lighttable_coord = vec2((tex_pal_idx + 0.5) / 256.0, (lighting + 0.5) / 32.0);\n" \ + "gl_FragColor = texture2D(lighttable_tex, lighttable_coord);\n" \ + "}\0" \ // // Sky fragment shader @@ -969,6 +982,9 @@ static const char *fragment_shaders[] = { // Palette water shader GLSL_PALETTE_WATER_FRAGMENT_SHADER, + + // UI colormap fade shader + GLSL_UI_COLORMAP_FADE_SHADER, NULL, }; @@ -1026,6 +1042,9 @@ static const char *vertex_shaders[] = { // Palette water vertex shader GLSL_DEFAULT_VERTEX_SHADER, + + // UI colormap fade shader + GLSL_DEFAULT_VERTEX_SHADER, NULL, }; @@ -1542,11 +1561,11 @@ EXPORT void HWRAPI(ReadScreenTexture) (int tex, UINT16 *dst_data) // and draw generic2 back after reading the framebuffer. // this hack is for some reason **much** faster than the simple solution of using glGetTexImage. if (tex != HWD_SCREENTEXTURE_GENERIC2) - DrawScreenTexture(tex); + DrawScreenTexture(tex, NULL, 0); pglPixelStorei(GL_PACK_ALIGNMENT, 1); pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, dst_data); if (tex != HWD_SCREENTEXTURE_GENERIC2) - DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2); + DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0); // Flip image upside down. // In other words, convert OpenGL's "bottom->top" row order into "top->bottom". for(i = 0; i < screen_height/2; i++) @@ -2156,6 +2175,7 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF } // code that is common between DrawPolygon and DrawIndexedTriangles +// DrawScreenTexture also can use this function for fancier screen texture drawing // the corona thing is there too, i have no idea if that stuff works with DrawIndexedTriangles and batching static void PreparePolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FBITFIELD PolyFlags) { @@ -3347,7 +3367,7 @@ EXPORT void HWRAPI(FlushScreenTextures) (void) screenTextures[i] = 0; } -EXPORT void HWRAPI(DrawScreenTexture)(int tex) +EXPORT void HWRAPI(DrawScreenTexture)(int tex, FSurfaceInfo *surf, FBITFIELD polyflags) { float xfix, yfix; INT32 texsize = 512; @@ -3387,7 +3407,10 @@ EXPORT void HWRAPI(DrawScreenTexture)(int tex) pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]); - Shader_SetUniforms(NULL, NULL, NULL, NULL); // prepare shader, if it is enabled + if (surf) + PreparePolygon(surf, NULL, polyflags); + else + Shader_SetUniforms(NULL, NULL, NULL, NULL); // prepare shader, if it is enabled pglColor4ubv(white); @@ -3683,9 +3706,6 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int tex, int width, int height) clearColour.alpha = 1; ClearBuffer(true, false, false, &clearColour); - if (HWR_ShouldUsePaletteRendering()) - SetBlend(PF_NoDepthTest); - pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]); //if ((HWR_ShouldUsePaletteRendering()) && cv_groldpal.value) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index fadce02f7..0a427be58 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -1489,7 +1489,7 @@ void I_FinishUpdate(void) HWD.pfnMakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2); HWD.pfnSetSpecialState(HWD_SET_SHADERS, 1); HWD.pfnSetShader(8); - HWD.pfnDrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2); + HWD.pfnDrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0); HWD.pfnUnSetShader(); HWD.pfnSetSpecialState(HWD_SET_SHADERS, 0); } diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index aa53df384..25d21bff5 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -235,7 +235,7 @@ void OglSdlFinishUpdate(boolean waitvbl) // effects that want to take the old screen can do so after this // Generic2 has the screen image without palette rendering brightness adjustments. // Using that here will prevent brightness adjustments being applied twice. - DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2); + DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0); } EXPORT void HWRAPI(OglSdlSetPalette) (RGBA_t *palette)