cleanup a bit
remove debug prints and vars clean stuff up a bit
This commit is contained in:
1 parent
f9f33aa53a
commit
2553c9e878
3 files changed
+6
-107
No files matched your search
@@ -233,8 +233,6 @@ enum hwdsetspecialstate
|
||||
{
|
||||
HWD_SET_SHADERS,
|
||||
HWD_SET_PALETTE_SHADER_ENABLED,
|
||||
HWD_SET_SVAR1,
|
||||
HWD_SET_SVAR2,
|
||||
|
||||
HWD_SET_TEXTUREFILTERMODE,
|
||||
HWD_SET_TEXTUREANISOTROPICMODE,
|
||||
|
||||
@@ -69,9 +69,6 @@ static void CV_screentextures_ONChange(void);
|
||||
static void CV_useCustomShaders_ONChange(void);
|
||||
static void CV_grpaletteshader_OnChange(void);
|
||||
|
||||
static void CV_shadervar1_OnChange(void);
|
||||
static void CV_shadervar2_OnChange(void);
|
||||
|
||||
static CV_PossibleValue_t grfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
|
||||
{HWD_SET_TEXTUREFILTER_BILINEAR, "Bilinear"}, {HWD_SET_TEXTUREFILTER_TRILINEAR, "Trilinear"},
|
||||
{HWD_SET_TEXTUREFILTER_MIXED1, "Linear_Nearest"},
|
||||
@@ -93,11 +90,6 @@ consvar_t cv_grsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL,
|
||||
consvar_t cv_grbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 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};
|
||||
|
||||
consvar_t cv_shadervar1 = {"svar1", "1000", CV_CALL, CV_Unsigned,
|
||||
CV_shadervar1_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_shadervar2 = {"svar2", "1000", CV_CALL, CV_Unsigned,
|
||||
CV_shadervar2_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t grrenderdistance_cons_t[] = {
|
||||
{0, "Max"}, {1, "1024"}, {2, "2048"}, {3, "4096"}, {4, "6144"}, {5, "8192"},
|
||||
{6, "12288"}, {7, "16384"}, {0, NULL}};
|
||||
@@ -160,18 +152,6 @@ static void CV_grpaletteshader_OnChange(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void CV_shadervar1_OnChange(void)
|
||||
{
|
||||
if (rendermode == render_opengl)
|
||||
HWD.pfnSetSpecialState(HWD_SET_SVAR1, cv_shadervar1.value);
|
||||
}
|
||||
|
||||
static void CV_shadervar2_OnChange(void)
|
||||
{
|
||||
if (rendermode == render_opengl)
|
||||
HWD.pfnSetSpecialState(HWD_SET_SVAR2, cv_shadervar2.value);
|
||||
}
|
||||
|
||||
// ==========================================================================
|
||||
// Globals
|
||||
// ==========================================================================
|
||||
@@ -496,10 +476,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
|
||||
{
|
||||
UINT8 *colormap_pointer;
|
||||
|
||||
CONS_Printf("Dbg: creating hwr lt, id %u, color %X, fadecolor %X\n", colormap->gl_lighttable_id, colormap->rgba, colormap->fadergba);
|
||||
if (default_colormap)
|
||||
{
|
||||
CONS_Printf("Dbg: Watch out! it's the sneaky default colormap!\n");
|
||||
colormap_pointer = colormaps;
|
||||
}
|
||||
else
|
||||
@@ -6023,8 +6001,6 @@ void HWR_AddCommands(void)
|
||||
CV_RegisterVar(&cv_portalonly);
|
||||
CV_RegisterVar(&cv_secbright);
|
||||
CV_RegisterVar(&cv_grpaletteshader);
|
||||
CV_RegisterVar(&cv_shadervar1);
|
||||
CV_RegisterVar(&cv_shadervar2);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
@@ -85,10 +85,6 @@ typedef struct LightTableCacheEntry_s
|
||||
LightTableCacheEntry_t *ltcachehead = NULL;
|
||||
LightTableCacheEntry_t *ltcachetail = NULL;
|
||||
|
||||
// tweakable vars for shader tweaking and testing
|
||||
float shadervar1 = 1.0;
|
||||
float shadervar2 = 1.0;
|
||||
|
||||
RGBA_t myPaletteData[256];
|
||||
GLint screen_width = 0; // used by Draw2DLine()
|
||||
GLint screen_height = 0;
|
||||
@@ -596,20 +592,15 @@ typedef enum
|
||||
gluniform_lighting,
|
||||
gluniform_fade_start,
|
||||
gluniform_fade_end,
|
||||
|
||||
// misc.
|
||||
gluniform_leveltime,
|
||||
|
||||
// palette rendering
|
||||
gluniform_palette,
|
||||
gluniform_color_lookup,
|
||||
gluniform_lighttable_tex,
|
||||
|
||||
// live tweaking
|
||||
gluniform_svar1,
|
||||
gluniform_svar2,
|
||||
|
||||
|
||||
// misc.
|
||||
gluniform_leveltime,
|
||||
|
||||
gluniform_max,
|
||||
} gluniform_t;
|
||||
|
||||
@@ -661,39 +652,6 @@ static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
|
||||
"return startmap * 1.05 - scale * 1.0 * 1.1;\n" \
|
||||
"}\n"
|
||||
|
||||
// 1.05 and 1.1 were chosen when trying to match software lighting in a test map
|
||||
|
||||
#define GLSL_DOOM_COLORMAP_test \
|
||||
"float R_DoomColormap(float light, float z)\n" \
|
||||
"{\n" \
|
||||
"float lightnum = clamp(light / 8.0, 0.0, 31.0);\n" \
|
||||
"float scale = 160.0 / z;\n" \
|
||||
"float pindex = clamp(scale * 4.0, 0.0, 47.0);\n" \
|
||||
"float left = (31.0-lightnum)*2.0;\n" \
|
||||
"float right = 160.0 / floor((pindex+1.0) / 512.0);\n" \
|
||||
"return left - right;\n" \
|
||||
"}\n"
|
||||
|
||||
// this one is adapted from here https://forum.zdoom.org/viewtopic.php?f=4&t=34984
|
||||
// and added -0.016 when trying to match it... doesnt really
|
||||
#define GLSL_DOOM_COLORMAP_test2 \
|
||||
"float R_DoomColormap(float light, float z)\n" \
|
||||
"{\n" \
|
||||
"int L = int((light / 255.0) * 63.0);\n" \
|
||||
"int min_L = 36 - L;\n" \
|
||||
"if (min_L < 0)\n" \
|
||||
"min_L = 0;\n" \
|
||||
"else if (min_L > 31)\n" \
|
||||
"min_L = 31;\n" \
|
||||
"float scale = 1.0 / (gl_FragCoord.z - 0.016);\n" \
|
||||
"int index = (59 - L) - int(scale * 192.0 - 192.0);\n" \
|
||||
"if (index < min_L)\n" \
|
||||
"index = min_L;\n" \
|
||||
"else if (index > 31)\n" \
|
||||
"index = 31;\n" \
|
||||
"return float(index);\n" \
|
||||
"}\n"
|
||||
|
||||
#define GLSL_DOOM_LIGHT_EQUATION \
|
||||
"float R_DoomLightingEquation(float light)\n" \
|
||||
"{\n" \
|
||||
@@ -762,8 +720,6 @@ static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
|
||||
"uniform int palette[768];\n" \
|
||||
"uniform vec4 poly_color;\n" \
|
||||
"uniform float lighting;\n" \
|
||||
"uniform float svar1;\n" \
|
||||
"uniform float svar2;\n"
|
||||
|
||||
#define GLSL_SOFTWARE_PAL_MAIN \
|
||||
"void main(void) {\n" \
|
||||
@@ -849,11 +805,9 @@ static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
|
||||
"}\0"
|
||||
|
||||
//
|
||||
// Palette color quantization shader test.
|
||||
// Palette color quantization shader
|
||||
//
|
||||
|
||||
// Could test putting this to GLSL_SOFTWARE_FRAGMENT_SHADER and seeing what happens to performance.
|
||||
|
||||
#define GLSL_PALETTE_FRAGMENT_SHADER \
|
||||
"uniform sampler2D tex;\n" \
|
||||
"uniform sampler3D lookup_tex;\n" \
|
||||
@@ -864,19 +818,6 @@ static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
|
||||
"gl_FragColor = vec4(float(palette[pal_idx*3])/255.0, float(palette[pal_idx*3+1])/255.0, float(palette[pal_idx*3+2])/255.0, 1.0);\n" \
|
||||
"}\0"
|
||||
|
||||
#define GLSL_PALETTE_FRAGMENT_SHADER_OLD \
|
||||
"uniform sampler2D tex;\n" \
|
||||
"uniform int palette[768];\n" \
|
||||
"void main(void) {\n" \
|
||||
"vec3 texel = vec3(texture2D(tex, gl_TexCoord[0].st));\n" \
|
||||
"vec3 best = vec3(200.0);\n" \
|
||||
"for (int i = 0; i < 256; i++) {\n" \
|
||||
"vec3 pal_color = vec3(palette[i*3] / 255.0, palette[i*3+1] / 255.0, palette[i*3+2] / 255.0);\n" \
|
||||
"best = mix(pal_color, best, step(length(best-texel), length(pal_color-texel)));\n" \
|
||||
"}\n" \
|
||||
"gl_FragColor = vec4(best[0], best[1], best[2] ,1.0);\n" \
|
||||
"}\0"
|
||||
|
||||
//
|
||||
// GLSL generic fragment shader
|
||||
//
|
||||
@@ -1131,16 +1072,13 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
|
||||
shader->uniforms[gluniform_fade_start] = GETUNI("fade_start");
|
||||
shader->uniforms[gluniform_fade_end] = GETUNI("fade_end");
|
||||
|
||||
// misc. (custom shaders)
|
||||
shader->uniforms[gluniform_leveltime] = GETUNI("leveltime");
|
||||
|
||||
// palette rendering
|
||||
shader->uniforms[gluniform_palette] = GETUNI("palette");
|
||||
shader->uniforms[gluniform_color_lookup] = GETUNI("lookup_tex");
|
||||
shader->uniforms[gluniform_lighttable_tex] = GETUNI("lighttable_tex");
|
||||
|
||||
shader->uniforms[gluniform_svar1] = GETUNI("svar1");
|
||||
shader->uniforms[gluniform_svar2] = GETUNI("svar2");
|
||||
// misc. (custom shaders)
|
||||
shader->uniforms[gluniform_leveltime] = GETUNI("leveltime");
|
||||
|
||||
#undef GETUNI
|
||||
|
||||
@@ -1156,9 +1094,6 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
|
||||
UNIFORM_1(shader->uniforms[gluniform_color_lookup], 1, pglUniform1i);
|
||||
UNIFORM_1(shader->uniforms[gluniform_lighttable_tex], 2, pglUniform1i);
|
||||
|
||||
UNIFORM_1(shader->uniforms[gluniform_svar1], shadervar1, pglUniform1f);
|
||||
UNIFORM_1(shader->uniforms[gluniform_svar2], shadervar2, pglUniform1f);
|
||||
|
||||
pglUseProgram(0);
|
||||
|
||||
#undef UNIFORM_1
|
||||
@@ -1532,8 +1467,6 @@ EXPORT void HWRAPI(ClearLightTableCache) (void)
|
||||
ltcachehead = next;
|
||||
}
|
||||
ltcachetail = NULL;
|
||||
|
||||
CONS_Printf("Debug: cleared hwr light tables\n");
|
||||
}
|
||||
|
||||
// -----------------+
|
||||
@@ -3061,14 +2994,6 @@ EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value)
|
||||
case HWD_SET_PALETTE_SHADER_ENABLED:
|
||||
gl_use_palette_shader = Value;
|
||||
break;
|
||||
|
||||
case HWD_SET_SVAR1:
|
||||
shadervar1 = (float)Value / 1000.0f;
|
||||
break;
|
||||
|
||||
case HWD_SET_SVAR2:
|
||||
shadervar2 = (float)Value / 1000.0f;
|
||||
break;
|
||||
|
||||
case HWD_SET_TEXTUREFILTERMODE:
|
||||
switch (Value)
|
||||
|
||||
Reference in new issue
Block a user