From 8b51e47b19603b10128ce19aaa88f53535de7375 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 14 Mar 2025 18:51:21 +1100
Subject: [PATCH] Wii U: More work on fog

---
 misc/wiiu/assembler.sh        |   4 ++
 misc/wiiu/ps_textured_lin.psh |   2 +-
 misc/wiiu/textured_exp.gsh    | Bin 0 -> 1788 bytes
 misc/wiiu/textured_lin.gsh    | Bin 0 -> 1788 bytes
 src/Graphics_WiiU.c           | 102 +++++++++++++++++++++++-----------
 5 files changed, 75 insertions(+), 33 deletions(-)
 create mode 100644 misc/wiiu/textured_exp.gsh
 create mode 100644 misc/wiiu/textured_lin.gsh

diff --git a/misc/wiiu/assembler.sh b/misc/wiiu/assembler.sh
index 7041ca621..abf20d5b9 100755
--- a/misc/wiiu/assembler.sh
+++ b/misc/wiiu/assembler.sh
@@ -7,5 +7,9 @@ assemble()
 } 
 
 assemble coloured_none.gsh vs_coloured.vsh        ps_coloured_none.psh
+
 assemble textured_none.gsh vs_textured.vsh        ps_textured_none.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_ofst.gsh vs_textured_offset.vsh ps_textured_none.psh
diff --git a/misc/wiiu/ps_textured_lin.psh b/misc/wiiu/ps_textured_lin.psh
index cf1ac1a12..7f8c28d1b 100644
--- a/misc/wiiu/ps_textured_lin.psh
+++ b/misc/wiiu/ps_textured_lin.psh
@@ -35,7 +35,7 @@
          y: ADD         R1.y,  PV1.x, -C0.x      
          w: ADD         R0.w,  PV1.y, -C0.z      
          t: RCP_e       ____,  PS1      
-      3  z: MULADD      R127.z, -PS2,  C1.x,  1.0f      CLAMP 
+      3  z: MULADD      R127.z, -PS2,  C1.y,  1.0f      CLAMP 
       4  x: MULADD      R2.x,  R1.y,  PV3.z,  C0.x      
          y: MULADD      R2.y,  R1.x,  PV3.z,  C0.y      
          z: MULADD      R2.z,  R0.w,  PV3.z,  C0.z      
diff --git a/misc/wiiu/textured_exp.gsh b/misc/wiiu/textured_exp.gsh
new file mode 100644
index 0000000000000000000000000000000000000000..4d31c65c5016e6e37fca42946720e29c3304686f
GIT binary patch
literal 1788
zcmd^<y>1gh5XWck&Q1&ou>@t1R+bA2BoIpJ;sik)A`&efhad?^NzURUvIIzHi6R9>
z3O~R-2u12tDe?raQc_YNo8PSOz_BbuLkbvacIH2`dpkQH_h74cM?@UF04p58Kk4qq
zqxS#@o6jgjJ)NkwYE<fWPRC=F@gI<#VcRzZ-}6-6JqBGgTL4$!CQnEW%#fa>x;A5*
zh9UlB+VDI5xT`(<*I}PiOBc2e;7ipx@F(=kC06if^hSw;-Tkh-+I!l~-iXQP*^Za*
z_StZf${F!2a%K%q;3x3Qj}#O4jmbB3z&@i@_F6nfb@aiUn%By_R6W4fyy5JG+$=hU
z$U$8O5-T#lsz=DkUGwgLaM8p`sKXUa3JGh&TVM?v!^hx$xIE0X?PMhQ+l7oG{B5VB
zMf~leKU%^s=5L9L`CAT*zZHY=x6(QJuakePQ8k-3GXV*%Fw#n+Q}wy<#IINYFf(MN
zhZA{j4XiiMSth{dt33D1OV6%?YzF+h$~m$AwK*_bRN8J=d$zLed)ZF*8Z7Ad_g;v+
z-RwQweYU-6HtzodpB{JR4F1j?&6&CAlyl*T$?i9*p?Bugg@2}hr~ijp5F$sp^Kz-M
z5D)5Z;NgF;=z1<W@6?#TgV5B8C^FWKyniThDu0=pj6={|{>tsXm*&*V_Yq-47RnDM
C$IV9o

literal 0
HcmV?d00001

diff --git a/misc/wiiu/textured_lin.gsh b/misc/wiiu/textured_lin.gsh
new file mode 100644
index 0000000000000000000000000000000000000000..f9ce2bc555fc766893eebee013db283499211120
GIT binary patch
literal 1788
zcmd^<zityj5XNWj&Q1&ou>@t1R+bA2BoIpJ;uL~#L?l`|4nY!-lAOh#$Pz?4OB5+6
zQuqPxK~khnl_F2zDkUWaviZ&W4jjuuG^Bu$=4QV6c5i2QcJ}dB_koBwbPiQCK!3{W
z#*>c#hZ<)R;+~IP`)XA9Hcv+*mC+xF&0*L#4FB^|t~~->wORr<&^lX43`~ihCAu;d
zn}i{Jdou7l|FolB_}i#IQ#&qVpTO73dEn3Z*9)xRFZi_r2fO<nd9(MtlfDzPFVh`w
zKkPH$ERhTHnP<)l+D4zDuMa3D^quiPw9hz`WyV@QCRP0YjG9-9b1CltL$jK*8FDvo
z<syew=}WBG?53VzBX`Tw|KLa4PC^|lX*-v&GPnoUur_!K?uCnkRGUtQ0^iJK7{NE4
z4(H*Ud2hG?FUB`S#rTE;!#83ud?T50{#DN3YE<^7^-RD4ml$iM(TVz8`N1z)0w_IX
zqDNzU=^NPHyc8J&>#t(oFP1yI46+{Z`zrdx?yvQM#iAm1zZ|obZa++S(zjs2f3){X
z<o#xMefP!oro~wQ7(GAj$OZbHHR@A+(JK1Fk&~@&Qo(P{s0(kV-=}}WED4d5%z3+z
zTZ)HO*Z1&0_-M?lz&?2i73*{@GaTzi);p3ok-sc;+99YfekBWkmuA$<-y_n9ER`P~
C&&@{w

literal 0
HcmV?d00001

diff --git a/src/Graphics_WiiU.c b/src/Graphics_WiiU.c
index 28df5ac69..ff40e8f54 100644
--- a/src/Graphics_WiiU.c
+++ b/src/Graphics_WiiU.c
@@ -67,33 +67,79 @@ static void CompileFetchShaders(void) {
 
 
 /*########################################################################################################################*
-*---------------------------------------------------------General---------------------------------------------------------*
+*---------------------------------------------------------Shaders---------------------------------------------------------*
 *#########################################################################################################################*/
 extern const uint8_t coloured_none_gsh[];
 extern const uint8_t textured_none_gsh[];
+extern const uint8_t textured_lin_gsh[];
+extern const uint8_t textured_exp_gsh[];
 extern const uint8_t textured_ofst_gsh[];
 
+#define VS_UNI_OFFSET_MVP   0
+#define VS_UNI_COUNT_MVP   16
+#define VS_UNI_OFFSET_OFST 16
+#define VS_UNI_COUNT_OFST   4
+
+#define PS_UNI_OFFSET_COLOR 0
+#define PS_UNI_COUNT_COLOR  4
+#define PS_UNI_OFFSET_FOG   4
+#define PS_UNI_COUNT_FOG    4
+
 static GX2VertexShader *texture_VS, *colour_VS, *offset_VS;
-static GX2PixelShader  *texture_PS, *colour_PS;
+static GX2PixelShader  *texture_PS[3], *colour_PS[3];
 
 static GX2Sampler sampler;
 static GfxResourceID white_square;
 static GX2VertexShader* cur_VS;
 static GX2PixelShader*  cur_PS;
+static int fog_func;
 
 static void InitGfx(void) {
 	CompileFetchShaders();
    	GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_WRAP, GX2_TEX_XY_FILTER_MODE_POINT);
 	
 	colour_VS = WHBGfxLoadGFDVertexShader(0, coloured_none_gsh);
-	colour_PS = WHBGfxLoadGFDPixelShader(0,  coloured_none_gsh);
+	colour_PS[0] = WHBGfxLoadGFDPixelShader(0,  coloured_none_gsh);
 
 	texture_VS = WHBGfxLoadGFDVertexShader(0, textured_none_gsh);
-	texture_PS = WHBGfxLoadGFDPixelShader(0,  textured_none_gsh);
 
 	offset_VS = WHBGfxLoadGFDVertexShader(0, textured_ofst_gsh);
+
+	texture_PS[0] = WHBGfxLoadGFDPixelShader(0, textured_none_gsh);
+	texture_PS[1] = WHBGfxLoadGFDPixelShader(0, textured_lin_gsh);
+	texture_PS[2] = WHBGfxLoadGFDPixelShader(0, textured_exp_gsh);
 }
 
+static struct Vec4 texOffset;
+
+static void UpdateVS(void) {
+	if (gfx_format != VERTEX_FORMAT_TEXTURED) {
+		cur_VS = colour_VS;
+	} else if (texOffset.x || texOffset.y) {
+		cur_VS = offset_VS;
+	} else {
+		cur_VS = texture_VS;
+	}
+	GX2SetVertexShader(cur_VS);
+}
+
+static void UpdatePS(void) {
+	if (gfx_format != VERTEX_FORMAT_TEXTURED) {
+		cur_PS = colour_PS[0];
+	/*} else if (gfx_fogEnabled && fog_func == FOG_EXP) {
+		cur_PS = texture_PS[2];
+	} else if (gfx_fogEnabled && fog_func == FOG_LINEAR) {
+		cur_PS = texture_PS[1];
+	} */else {
+		cur_PS = texture_PS[0];
+	}
+	GX2SetPixelShader(cur_PS);
+}
+
+
+/*########################################################################################################################*
+*---------------------------------------------------------General---------------------------------------------------------*
+*#########################################################################################################################*/
 void Gfx_Create(void) {
 	if (!Gfx.Created) InitGfx();
 	
@@ -211,23 +257,36 @@ void Gfx_SetFaceCulling(cc_bool enabled) {
 }
 
 void Gfx_SetFog(cc_bool enabled) {
-	// TODO
+	gfx_fogEnabled = enabled;
+	UpdatePS();
 }
 
 void Gfx_SetFogCol(PackedCol color) {
-	// TODO
+	struct Vec4 c = {
+		PackedCol_R(color) / 255.0f,
+		PackedCol_G(color) / 255.0f,
+		PackedCol_B(color) / 255.0f,
+		1.0f
+	};
+	GX2SetPixelUniformReg(PS_UNI_OFFSET_COLOR, PS_UNI_COUNT_COLOR, &c);
 }
 
+static struct Vec4 fogValue;
+
 void Gfx_SetFogDensity(float value) {
-	// TODO
+	fogValue.x = value;
+	GX2SetPixelUniformReg(PS_UNI_OFFSET_FOG, PS_UNI_COUNT_FOG, &fogValue);
 }
 
 void Gfx_SetFogEnd(float value) {
+	fogValue.y = 1.0f / value;
+	GX2SetPixelUniformReg(PS_UNI_OFFSET_FOG, PS_UNI_COUNT_FOG, &fogValue);
 	// TODO
 }
 
 void Gfx_SetFogMode(FogFunc func) {
-	// TODO
+	fog_func = func;
+	UpdatePS();
 }
 
 static void SetAlphaTest(cc_bool enabled) {
@@ -357,27 +416,6 @@ void Gfx_UnlockDynamicVb(GfxResourceID vb)  { Gfx_UnlockVb(vb); Gfx_BindVb(vb);
 /*########################################################################################################################*
 *-----------------------------------------------------Vertex rendering----------------------------------------------------*
 *#########################################################################################################################*/
-static struct Vec4 texOffset;
-
-static void UpdateVS(void) {
-	if (gfx_format != VERTEX_FORMAT_TEXTURED) {
-		cur_VS = colour_VS;
-	} else if (texOffset.x || texOffset.y) {
-		cur_VS = offset_VS;
-	} else {
-		cur_VS = texture_VS;
-	}
-	GX2SetVertexShader(cur_VS);
-
-	if (cur_VS != offset_VS) return;
-	GX2SetVertexUniformReg(cur_VS->uniformVars[1].offset, 4, &texOffset);
-}
-
-static void UpdatePS(void) {
-	cur_PS = gfx_format == VERTEX_FORMAT_TEXTURED ? texture_PS : colour_PS;
-	GX2SetPixelShader(cur_PS);
-}
-
 void Gfx_SetVertexFormat(VertexFormat fmt) {
 	if (fmt == gfx_format) return;
 	gfx_format = fmt;
@@ -419,10 +457,8 @@ void Gfx_LoadMatrix(MatrixType type, const struct Matrix* matrix) {
 	if (type == MATRIX_VIEW) _view = *matrix;
 	if (type == MATRIX_PROJ) _proj = *matrix;
 	
-	// TODO dirty uniform
 	Matrix_Mul(&_mvp, &_view, &_proj);
-	if (!cur_VS) return;
-	GX2SetVertexUniformReg(cur_VS->uniformVars[0].offset, 16, &_mvp);
+	GX2SetVertexUniformReg(VS_UNI_OFFSET_MVP, VS_UNI_COUNT_MVP, &_mvp);
 }
 
 void Gfx_LoadMVP(const struct Matrix* view, const struct Matrix* proj, struct Matrix* mvp) {
@@ -434,7 +470,9 @@ void Gfx_LoadMVP(const struct Matrix* view, const struct Matrix* proj, struct Ma
 void Gfx_EnableTextureOffset(float x, float y) {
 	texOffset.x = x;
 	texOffset.y = y;
+
 	UpdateVS();
+	GX2SetVertexUniformReg(VS_UNI_OFFSET_OFST, VS_UNI_COUNT_OFST, &texOffset);
 }
 
 void Gfx_DisableTextureOffset(void) {