AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 16:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Wii U: WIP on refactoring shaders

Browse Source
This commit is contained in:
UnknownShadow200 2025-04-02 19:36:03 +11:00
parent 1abb1f39f5
commit d14b21dc11
7 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/wiiu/assembler.sh
View File

@ -12,4 +12,6 @@ assemble textured_none.gsh vs_textured.vsh ps_textured_none.psh
assemble textured_lin.gsh vs_textured.vsh ps_textured_lin.psh assemble textured_lin.gsh vs_textured.vsh ps_textured_lin.psh
assemble textured_exp.gsh vs_textured.vsh ps_textured_exp.psh assemble textured_exp.gsh vs_textured.vsh ps_textured_exp.psh
assemble textured_ofst.gsh vs_textured_offset.vsh ps_textured_none.psh assemble offset_none.gsh vs_offset.vsh ps_textured_none.psh
assemble offset_lin.gsh vs_offset.vsh ps_textured_lin.psh
assemble offset_exp.gsh vs_offset.vsh ps_textured_exp.psh

BIN
misc/wiiu/offset_exp.gsh Normal file
View File

Binary file not shown.

BIN
misc/wiiu/offset_lin.gsh Normal file
View File

Binary file not shown.

0
misc/wiiu/textured_ofst.gsh → misc/wiiu/offset_none.gsh
View File

0
misc/wiiu/vs_textured_offset.glsl → misc/wiiu/vs_offset.glsl
View File

0
misc/wiiu/vs_textured_offset.vsh → misc/wiiu/vs_offset.vsh
View File

44
src/Graphics_WiiU.c
View File

@ -73,7 +73,9 @@ extern const uint8_t coloured_none_gsh[];
extern const uint8_t textured_none_gsh[]; extern const uint8_t textured_none_gsh[];
extern const uint8_t textured_lin_gsh[]; extern const uint8_t textured_lin_gsh[];
extern const uint8_t textured_exp_gsh[]; extern const uint8_t textured_exp_gsh[];
extern const uint8_t textured_ofst_gsh[]; extern const uint8_t offset_none_gsh[];
extern const uint8_t offset_lin_gsh[];
extern const uint8_t offset_exp_gsh[];
#define VS_UNI_OFFSET_MVP 0 #define VS_UNI_OFFSET_MVP 0
#define VS_UNI_COUNT_MVP 16 #define VS_UNI_COUNT_MVP 16
@ -85,8 +87,17 @@ extern const uint8_t textured_ofst_gsh[];
#define PS_UNI_OFFSET_FOG 4 #define PS_UNI_OFFSET_FOG 4
#define PS_UNI_COUNT_FOG 4 #define PS_UNI_COUNT_FOG 4
static GX2VertexShader *texture_VS, *colour_VS, *offset_VS; struct ShaderProgram {
static GX2PixelShader *texture_PS[3], *colour_PS[3]; GX2VertexShader* vs;
GX2PixelShader* ps;
};
static struct ShaderProgram colour_PG, texture_PG[3], offset_PG[3];
static void LoadProgram(struct ShaderProgram* prog, const cc_uint8* gsh) {
prog->vs = WHBGfxLoadGFDVertexShader(0, gsh);
prog->ps = WHBGfxLoadGFDPixelShader(0, gsh);
}
static GX2Sampler sampler; static GX2Sampler sampler;
static GfxResourceID white_square; static GfxResourceID white_square;
@ -98,40 +109,39 @@ static void InitGfx(void) {
CompileFetchShaders(); CompileFetchShaders();
GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_WRAP, GX2_TEX_XY_FILTER_MODE_POINT); GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_WRAP, GX2_TEX_XY_FILTER_MODE_POINT);
colour_VS = WHBGfxLoadGFDVertexShader(0, coloured_none_gsh); LoadProgram(&colour_PG, coloured_none_gsh);
colour_PS[0] = WHBGfxLoadGFDPixelShader(0, coloured_none_gsh);
texture_VS = WHBGfxLoadGFDVertexShader(0, textured_none_gsh); LoadProgram(&texture_PG[0], textured_none_gsh);
LoadProgram(&texture_PG[1], textured_lin_gsh);
LoadProgram(&texture_PG[2], textured_exp_gsh);
offset_VS = WHBGfxLoadGFDVertexShader(0, textured_ofst_gsh); LoadProgram(&offset_PG[0], offset_none_gsh);
LoadProgram(&offset_PG[1], offset_lin_gsh);
texture_PS[0] = WHBGfxLoadGFDPixelShader(0, textured_none_gsh); LoadProgram(&offset_PG[2], offset_exp_gsh);
texture_PS[1] = WHBGfxLoadGFDPixelShader(0, textured_lin_gsh);
texture_PS[2] = WHBGfxLoadGFDPixelShader(0, textured_exp_gsh);
} }
static struct Vec4 texOffset; static struct Vec4 texOffset;
static void UpdateVS(void) { static void UpdateVS(void) {
if (gfx_format != VERTEX_FORMAT_TEXTURED) { if (gfx_format != VERTEX_FORMAT_TEXTURED) {
cur_VS = colour_VS; cur_VS = colour_PG.vs;
} else if (texOffset.x || texOffset.y) { } else if (texOffset.x || texOffset.y) {
cur_VS = offset_VS; cur_VS = offset_PG[0].vs;
} else { } else {
cur_VS = texture_VS; cur_VS = texture_PG[0].vs;
} }
GX2SetVertexShader(cur_VS); GX2SetVertexShader(cur_VS);
} }
static void UpdatePS(void) { static void UpdatePS(void) {
if (gfx_format != VERTEX_FORMAT_TEXTURED) { if (gfx_format != VERTEX_FORMAT_TEXTURED) {
cur_PS = colour_PS[0]; cur_PS = colour_PG.ps;
/*} else if (gfx_fogEnabled && fog_func == FOG_EXP) { /*} else if (gfx_fogEnabled && fog_func == FOG_EXP) {
cur_PS = texture_PS[2]; cur_PS = texture_PS[2];
} else if (gfx_fogEnabled && fog_func == FOG_LINEAR) { } else if (gfx_fogEnabled && fog_func == FOG_LINEAR) {
cur_PS = texture_PS[1]; cur_PS = texture_PS[1];
*/} else { */} else {
cur_PS = texture_PS[0]; cur_PS = texture_PG[0].ps;
} }
GX2SetPixelShader(cur_PS); GX2SetPixelShader(cur_PS);
} }
@ -223,7 +233,7 @@ void Gfx_BindTexture(GfxResourceID texId) {
} }
static void BindPendingTexture(void) { static void BindPendingTexture(void) {
if (!pendingTex || cur_VS == colour_VS) return; if (!pendingTex || cur_VS == colour_PG.vs) return;
GX2SetPixelTexture(pendingTex, cur_PS->samplerVars[0].location); GX2SetPixelTexture(pendingTex, cur_PS->samplerVars[0].location);
GX2SetPixelSampler(&sampler, cur_PS->samplerVars[0].location); GX2SetPixelSampler(&sampler, cur_PS->samplerVars[0].location);