Add option for wipes only in screentex toggle

since the toggle was changed to actually disable ALL screentex functions
This commit is contained in:
Alug committed 2024-04-02 22:14:10 +02:00
1 parent bd2fe5b9be
commit fc27ed0443
2 files changed
+15 -8

No files matched your search

+2 -1
View File
@@ -136,7 +136,8 @@ static INT32 current_bsp_culling_distance = 0;
// - water and heat wave effects
// - intermission background
// - full screen scaling (use native resolution or windowed mode to avoid this)
consvar_t cv_grscreentextures = {"gr_screentextures", "On", CV_CALL|CV_SAVE, CV_OnOff,
static CV_PossibleValue_t grscreentextures_cons_t[] = {{0, "Off"}, {1, "Wipes Only"}, {2, "All"}, {0, NULL}};
consvar_t cv_grscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, grscreentextures_cons_t,
CV_screentextures_ONChange, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t grshaders_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Ignore custom shaders"}, {0, NULL}};
+13 -7
View File
@@ -612,7 +612,7 @@ static PFNglGetUniformLocation pglGetUniformLocation;
static boolean gl_shadersenabled = false;
static INT32 gl_allowshaders = 0;
static INT32 gl_enable_screen_textures = 1;
static INT32 gl_enable_screen_textures = 2;
static GLint gl_portal_stencil_level = 0;
@@ -2838,7 +2838,8 @@ EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
16.0f, -16.0f, 6.0f
};
if (!gl_enable_screen_textures) return;
if (gl_enable_screen_textures != 2)
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)
@@ -2933,7 +2934,8 @@ EXPORT void HWRAPI(DrawScreenTexture)(int tex, FSurfaceInfo *surf, FBITFIELD pol
float fix[8];
if (!gl_enable_screen_textures) return;
if (gl_enable_screen_textures != 2)
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)
@@ -2996,7 +2998,8 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
1.0f, 1.0f
};
if (!gl_enable_screen_textures) return;
if (!gl_enable_screen_textures)
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)
@@ -3077,7 +3080,8 @@ EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 upd
1.0f, -1.0f, 1.0f
};
if (!gl_enable_screen_textures) return;
if (gl_enable_screen_textures != 2)
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)
@@ -3170,7 +3174,8 @@ EXPORT void HWRAPI(MakeScreenTexture) (int tex)
INT32 texsize = 512;
boolean firstTime = (screenTextures[tex] == 0);
if (!gl_enable_screen_textures) return;
if (!gl_enable_screen_textures || (gl_enable_screen_textures == 1 && tex != (HWD_SCREENTEXTURE_WIPE_START || HWD_SCREENTEXTURE_WIPE_END)))
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)
@@ -3206,7 +3211,8 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int tex, INT32 width, INT32 height)
float off[12];
float fix[8];
if (!gl_enable_screen_textures) return;
if (gl_enable_screen_textures != 2)
return;
// look for power of two that is large enough for the screen
while (texsize < screen_width || texsize < screen_height)