hackiest shit to make custom shaders not kill palette shader

this is so super dumb its unreal
but it works
This commit is contained in:
alufolie91 committed 2023-09-14 03:43:11 +02:00
1 parent 9044a46b31
commit 13fd825bcf
4 files changed
+22 -11

No files matched your search

+5 -4
View File
@@ -67,7 +67,7 @@ int gr_use_palette_shader = 0;
static void CV_filtermode_ONChange(void);
static void CV_anisotropic_ONChange(void);
static void CV_screentextures_ONChange(void);
//static void CV_useCustomShaders_ONChange(void);
static void CV_useCustomShaders_ONChange(void);
static void CV_grpaletteshader_OnChange(void);
static CV_PossibleValue_t grfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
@@ -120,7 +120,7 @@ static INT32 current_bsp_culling_distance = 0;
consvar_t cv_grscreentextures = {"gr_screentextures", "On", CV_CALL, CV_OnOff,
CV_screentextures_ONChange, 0, NULL, NULL, 0, 0, NULL};
//consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE, CV_OnOff, CV_useCustomShaders_ONChange, 0, NULL, NULL, 0, 0, NULL}; // rip in peace sweet prince
consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE, CV_OnOff, CV_useCustomShaders_ONChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_grpaletteshader = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletteshader_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -139,11 +139,11 @@ static void CV_screentextures_ONChange(void)
HWD.pfnSetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_grscreentextures.value);
}
/*static void CV_useCustomShaders_ONChange(void)
static void CV_useCustomShaders_ONChange(void)
{
if (rendermode == render_opengl)
HWD.pfnInitCustomShaders();
}*/
}
static void CV_grpaletteshader_OnChange(void)
{
@@ -152,6 +152,7 @@ static void CV_grpaletteshader_OnChange(void)
HWD.pfnSetSpecialState(HWD_SET_PALETTE_SHADER_ENABLED, cv_grpaletteshader.value);
gr_use_palette_shader = cv_grpaletteshader.value;
R_ClearColormaps();
InitPalette();
}
}
+1 -1
View File
@@ -180,7 +180,7 @@ extern consvar_t cv_grfakecontrast;
extern consvar_t cv_grfallbackplayermodel;
extern consvar_t cv_grbatching;
extern consvar_t cv_grrenderdistance;
//extern consvar_t cv_grusecustomshaders;
extern consvar_t cv_grusecustomshaders;
extern consvar_t cv_grpaletteshader;
extern consvar_t cv_grportals;
extern consvar_t cv_nostencil;
+15 -6
View File
@@ -35,7 +35,7 @@
#include "../hw_main.h"
// Eeeeh not sure is this right way, but it works < sry :c
//extern consvar_t cv_grusecustomshaders;
extern consvar_t cv_grusecustomshaders;
extern fixed_t fovtan; // also extremely bad, I'm just too lazy!!!
@@ -987,13 +987,14 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
gl_shaderprogram_t *shader;
const GLchar* vert_shader = vertex_shaders[i];
const GLchar* frag_shader = fragment_shaders[i];
boolean custom = ((gl_customvertexshaders[i] || gl_customfragmentshaders[i]) && (i > 0));
boolean custom = cv_grusecustomshaders.value && ((gl_customvertexshaders[i] || gl_customfragmentshaders[i]) && (i > 0));
// 18032019
if (gl_customvertexshaders[i])
if (cv_grusecustomshaders.value && gl_customvertexshaders[i])
vert_shader = gl_customvertexshaders[i];
if (gl_customfragmentshaders[i])
if (cv_grusecustomshaders.value && gl_customfragmentshaders[i])
frag_shader = gl_customfragmentshaders[i];
if (i >= MAXSHADERS)
break;
@@ -1114,7 +1115,9 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boolean fragment)
{
#ifdef GL_SHADERS
if (!pglUseProgram) return;
if (!pglUseProgram)
return;
if (number < 1 || number > MAXSHADERS)
I_Error("LoadCustomShader(): cannot load shader %d (max %d)", number, MAXSHADERS);
@@ -1136,8 +1139,14 @@ EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boo
EXPORT void HWRAPI(InitCustomShaders) (void)
{
#ifdef GL_SHADERS
KillShaders();
LoadShaders();
if (gl_use_palette_shader)
{
InitPalette();
}
#endif
}
+1
View File
@@ -1954,6 +1954,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_grfakecontrast);
CV_RegisterVar(&cv_grshearing);
CV_RegisterVar(&cv_grshaders);
CV_RegisterVar(&cv_grusecustomshaders);
CV_RegisterVar(&cv_grpaletteshader);
#endif