From 7420970ec14b741f64f4cef053dd0aaeb9fbc9e5 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Mon, 25 Apr 2022 12:38:06 -0500
Subject: [PATCH] Added directx support

---
 .../Lib/Fast3D/gfx_direct3d_common.cpp            | 15 +++++++++++++++
 .../libultraship/Lib/Fast3D/gfx_opengl.cpp        |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
index f778812d1..659dfefa4 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
@@ -138,6 +138,10 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
         append_line(buf, &len, "    float4 fog : FOG;");
         num_floats += 4;
     }
+    if (cc_features.opt_grayscale) {
+        append_line(buf, &len, "    float4 grayscale : GRAYSCALE;");
+        num_floats += 4;
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, "    float%d input%d : INPUT%d;\r\n", cc_features.opt_alpha ? 4 : 3, i + 1, i);
         num_floats += cc_features.opt_alpha ? 4 : 3;
@@ -208,6 +212,9 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
     if (cc_features.opt_fog) {
         append_str(buf, &len, ", float4 fog : FOG");
     }
+    if (cc_features.opt_grayscale) {
+        append_str(buf, &len, ", float4 grayscale : GRAYSCALE");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, ", float%d input%d : INPUT%d", cc_features.opt_alpha ? 4 : 3, i + 1, i);
     }
@@ -228,6 +235,9 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
     if (cc_features.opt_fog) {
         append_line(buf, &len, "    result.fog = fog;");
     }
+    if (cc_features.opt_grayscale) {
+        append_line(buf, &len, "    result.grayscale = grayscale;");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, "    result.input%d = input%d;\r\n", i + 1, i + 1);
     }
@@ -298,6 +308,11 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
         }
     }
 
+    if(cc_features.opt_grayscale) {
+        append_line(buf, &len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
+        append_line(buf, &len, "texel.rgb = input.grayscale.rgb * intensity;");
+    }
+
     if (cc_features.opt_alpha && cc_features.opt_noise) {
         append_line(buf, &len, "    float2 coords = screenSpace.xy * noise_scale;");
         append_line(buf, &len, "    texel.a *= round(saturate(random(float3(floor(coords), noise_frame)) + texel.a - 0.5));");
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
index 713060ba8..ab72090af 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
@@ -368,7 +368,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         append_line(fs_buf, &fs_len, "texel.a *= floor(clamp(random(vec3(floor(gl_FragCoord.xy * noise_scale), float(frame_count))) + texel.a, 0.0, 1.0));");
     }
 
-     if(cc_features.opt_grayscale) {
+    if(cc_features.opt_grayscale) {
         append_line(fs_buf, &fs_len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
         append_line(fs_buf, &fs_len, "texel.rgb = vGreyscaleColor.rgb * intensity;");
     }