saturn/SRB2Kart-Saturn
2
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 23 Wiki Activity

P_FlashPal support in palette renderering #68

Merged
hayaunderscore merged 2 commits from paletteshader into paletteshader 2023-09-17 01:52:12 +02:00
Conversation 1 Commits 2 Files Changed 6
+88 -51
6 changed files with 88 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/hardware/hw_cache.c
-1
View File
@@ -576,7 +576,6 @@ void HWR_SetPalette(RGBA_t *palette)
Z_FreeTags(PU_HWRCACHE_UNLOCKED, PU_HWRCACHE_UNLOCKED);
}
}
// --------------------------------------------------------------------------
// Make sure texture is downloaded and set it as the source
// --------------------------------------------------------------------------
src/hardware/hw_main.c
+6 -5
View File
@@ -151,8 +151,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();
V_SetPalette(0);
}
}
@@ -6156,8 +6155,6 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend,
pSurf->PolyColor.s.alpha = alpha; // put the alpha back after lighting
HWD.pfnSetShader(gr_use_palette_shader ? 10 : 2); // wall shader
if (blend & PF_Environment)
blendmode |= PF_Occlude; // PF_Occlude must be used for solid objects
@@ -6169,6 +6166,8 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend,
blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency
if (!fogwall)
HWD.pfnSetShader(gr_use_palette_shader ? 10 : 2); // wall shader
HWD.pfnDrawPolygon(pSurf, wallVerts, 4, blendmode, false);
#ifdef WALLSPLATS
@@ -6200,7 +6199,7 @@ void HWR_DoPostProcessor(player_t *player)
// Armageddon Blast Flash!
// Could this even be considered postprocessor?
if (player->flashcount)
if (player->flashcount && !cv_grpaletteshader.value)
{
FOutVector v[4];
FSurfaceInfo Surf;
@@ -6329,6 +6328,8 @@ void HWR_MakeScreenFinalTexture(void)
void HWR_DrawScreenFinalTexture(int width, int height)
{
if (gr_use_palette_shader)
HWD.pfnSetShader(11); //post processing
HWD.pfnDrawScreenFinalTexture(width, height);
}
src/hardware/r_opengl/r_opengl.c
+55 -22
View File
@@ -751,6 +751,11 @@ static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
GLSL_SOFTWARE_PAL_MAIN \
"\0"
#define GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_POSTPROCESS \
GLSL_SOFTWARE_PAL_UNIFORMS \
GLSL_SOFTWARE_PAL_MAIN \
"\0"
//
// Water surface shader
//
@@ -869,6 +874,8 @@ static const char *fragment_shaders[] = {
GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_WALLS,
GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_POSTPROCESS,
NULL,
};
@@ -1093,16 +1100,21 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
if (uniform != -1) \
function (uniform, a);
#define UNIFORM_2(uniform, a, b, function) \
if (uniform != -1) \
function (uniform, a, b);
pglUseProgram(shader->program);
// texture unit numbers for the samplers used for palette rendering
UNIFORM_1(shader->uniforms[gluniform_palette], 2, pglUniform1i);
UNIFORM_2(shader->uniforms[gluniform_palette], 768, gl_palette, pglUniform1iv);
UNIFORM_1(shader->uniforms[gluniform_color_lookup], 1, pglUniform1i);
UNIFORM_1(shader->uniforms[gluniform_lighttable_tex], 2, pglUniform1i);
pglUseProgram(0);
#undef UNIFORM_1
#undef UNIFORM_2
}
#endif
@@ -1143,9 +1155,9 @@ EXPORT void HWRAPI(InitCustomShaders) (void)
KillShaders();
LoadShaders();
if (gl_use_palette_shader)
if (gl_use_palette_shader)
{
InitPalette();
InitPalette(0, false);
}
#endif
}
@@ -1193,22 +1205,42 @@ GLuint palette_tex_num;
// the +2 in the NearestColor call also needs to be adjusted if LUT_SIZE is changed!
// the hardcoded values in the shader also need to be adjusted if LUT_SIZE is changed!
void InitPalette(void)
void InitPalette(int flashnum, boolean skiplut)
{
int i, r, g, b;
//Hudler: 16/10/99: added for OpenGL gamma correction
RGBA_t gamma_correction = {0x7F7F7F7F};
//Hurdler 16/10/99: added for OpenGL gamma correction
gamma_correction.s.red = (UINT8)cv_grgammared.value;
gamma_correction.s.green = (UINT8)cv_grgammagreen.value;
gamma_correction.s.blue = (UINT8)cv_grgammablue.value;
// init the palette
for (i = 0; i < 256; i++)
int flashoffset = flashnum*256;
for (i = 0+flashoffset; i < 256+flashoffset; i++)
{
int fi = i-flashoffset;
// gamma correction
int pr, pg, pb;
pr = (UINT8)MIN((pLocalPalette[i].s.red*gamma_correction.s.red)/127, 255);
pg = (UINT8)MIN((pLocalPalette[i].s.green*gamma_correction.s.green)/127, 255);
pb = (UINT8)MIN((pLocalPalette[i].s.blue*gamma_correction.s.blue)/127, 255);
// crush to 16-bit rgb565, like software currently does
float fred = (float)(pLocalPalette[i].s.red >> 3);
float fgreen = (float)(pLocalPalette[i].s.green >> 2);
float fblue = (float)(pLocalPalette[i].s.blue >> 3);
float fred = (float)(pr >> 3);
float fgreen = (float)(pg >> 2);
float fblue = (float)(pb >> 3);
// restore to rgb888
gl_palette[i*3] = (GLint)(fred / 31.0f * 255.0f);
gl_palette[i*3+1] = (GLint)(fgreen / 63.0f * 255.0f);
gl_palette[i*3+2] = (GLint)(fblue / 31.0f * 255.0f);
gl_palette[fi*3] = (GLint)(fred / 31.0f * 255.0f);
gl_palette[fi*3+1] = (GLint)(fgreen / 63.0f * 255.0f);
gl_palette[fi*3+2] = (GLint)(fblue / 31.0f * 255.0f);
}
if (!skiplut)
{
// init the palette conversion lookup texture
GLubyte *pal_lookup_tex = malloc(LUT_SIZE*LUT_SIZE*LUT_SIZE*sizeof(GLubyte));
@@ -1225,17 +1257,18 @@ void InitPalette(void)
}
}
}
#undef STEP_SIZE
pglGenTextures(1, &palette_tex_num);
pglBindTexture(GL_TEXTURE_3D, palette_tex_num);
pglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
pglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
if (!pglTexImage3D)
I_Error("pglTexImage3D is NULL!");
pglTexImage3D(GL_TEXTURE_3D, 0, GL_R8, LUT_SIZE, LUT_SIZE, LUT_SIZE, 0, GL_RED, GL_UNSIGNED_BYTE, pal_lookup_tex);
free(pal_lookup_tex);
pglGenTextures(1, &palette_tex_num);
pglBindTexture(GL_TEXTURE_3D, palette_tex_num);
pglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
pglTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
if (!pglTexImage3D)
I_Error("pglTexImage3D is NULL!");
pglTexImage3D(GL_TEXTURE_3D, 0, GL_R8, LUT_SIZE, LUT_SIZE, LUT_SIZE, 0, GL_RED, GL_UNSIGNED_BYTE, pal_lookup_tex);
free(pal_lookup_tex);
}
#undef STEP_SIZE
pglUseProgram(gl_shaderprograms[8].program);
pglUniform1i(gl_shaderprograms[8].uniforms[gluniform_color_lookup], 1); // bind sampler to second texture unit
pglUniform1iv(gl_shaderprograms[8].uniforms[gluniform_palette], 768, gl_palette);
@@ -1593,7 +1626,7 @@ EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask,
pglEnableClientState(GL_TEXTURE_COORD_ARRAY); // And mostly this one, too
if (!gl_palette_initialized)
InitPalette(); // just gonna put this here for now
InitPalette(0, false); // just gonna put this here for now
}
src/hardware/r_opengl/r_opengl.h
+1 -1
View File
@@ -135,6 +135,6 @@ typedef enum
// in order for custom playpals n shit to work properly
extern boolean gl_palette_initialized;
void InitPalette(void);
void InitPalette(int flashnum, boolean skiplut);
#endif
src/st_stuff.c
+9 -11
View File
@@ -232,18 +232,22 @@ void ST_doPaletteStuff(void)
else
palette = 0;
palette = min(max(palette, 0), 13);
#ifdef HWRENDER
if (rendermode == render_opengl)
if (rendermode == render_opengl && !cv_grpaletteshader.value)
palette = 0; // No flashpals here in OpenGL
#endif
palette = min(max(palette, 0), 13);
if (palette != st_palette)
{
st_palette = palette;
if (rendermode == render_soft)
#ifdef HWRENDER
if (rendermode != render_none && cv_grpaletteshader.value)
#else
if (rendermode != render_none)
#endif
{
//V_SetPaletteLump(GetPalette()); // Reset the palette -- is this needed?
if (!splitscreen)
@@ -2163,13 +2167,7 @@ void ST_Drawer(void)
st_palette = -1;
// Do red-/gold-shifts from damage/items
#ifdef HWRENDER
//25/08/99: Hurdler: palette changes is done for all players,
// not only player1! That's why this part
// of code is moved somewhere else.
if (rendermode == render_soft)
#endif
if (rendermode != render_none) ST_doPaletteStuff();
if (rendermode != render_none) ST_doPaletteStuff();
if (st_overlay)
{
src/v_video.c
+17 -11
View File
@@ -226,12 +226,15 @@ void V_SetPalette(INT32 palettenum)
#ifdef HWRENDER
if (rendermode != render_soft && rendermode != render_none) {
if (cv_grpaletteshader.value == 1){
// reset our palette lookups n shit
gl_palette_initialized = false;
InitPalette();}
HWR_SetPalette(&pLocalPalette[palettenum*256]);
// in palette rendering mode, we already manage our palette ourselves
if (cv_grpaletteshader.value == 1)
{
// reset our palette lookups n shit
gl_palette_initialized = false;
InitPalette(palettenum, true);
}
else
HWR_SetPalette(pLocalPalette);
}
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else
@@ -246,11 +249,14 @@ void V_SetPaletteLump(const char *pal)
LoadPalette(pal);
#ifdef HWRENDER
if (rendermode != render_soft && rendermode != render_none) {
if (cv_grpaletteshader.value == 1){
// reset our palette lookups n shit
gl_palette_initialized = false;
InitPalette();}
HWR_SetPalette(pLocalPalette);
if (cv_grpaletteshader.value == 1)
{
// reset our palette lookups n shit
gl_palette_initialized = false;
InitPalette(0, false);
}
else
HWR_SetPalette(pLocalPalette);
}
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else