feat(guildwars2): fix defines

Author: NotVoosh

src/games/guildwars2/Fog_0x0DFA0CA1.ps_5_0.hlsl

@@ -35,6 +35,6 @@ void main(
   r1.xyzw = r0.yyyy * r2.xyzw + r1.xyzw;
   r0.y = v1.x * r1.w;
   o0.xyz = r1.xyz + r1.xyz;
-  o0.w = r0.y * r0.x * shader_injection.fxFog;
+  o0.w = r0.y * r0.x * CUSTOM_FOG;
   return;
 }

src/games/guildwars2/common.hlsl

@@ -282,7 +282,7 @@ float3 applyUserTonemap(float3 untonemapped, Texture2D lutTexture, SamplerState
   config.game_nits = RENODX_DIFFUSE_WHITE_NITS;
   config.gamma_correction = RENODX_GAMMA_CORRECTION;
   config.exposure = RENODX_TONE_MAP_EXPOSURE;
-  config.highlights = shader_injection.colorGradeHighlights;
+  config.highlights = RENODX_TONE_MAP_HIGHLIGHTS;
   config.shadows = RENODX_TONE_MAP_SHADOWS;
   config.contrast = RENODX_TONE_MAP_CONTRAST;
   config.saturation = RENODX_TONE_MAP_SATURATION;
@@ -336,7 +336,7 @@ float3 applyUserTonemap(float3 untonemapped) {
   config.game_nits = RENODX_DIFFUSE_WHITE_NITS;
   config.gamma_correction = RENODX_GAMMA_CORRECTION;
   config.exposure = RENODX_TONE_MAP_EXPOSURE;
-  config.highlights = shader_injection.colorGradeHighlights;
+  config.highlights = RENODX_TONE_MAP_HIGHLIGHTS;
   config.shadows = RENODX_TONE_MAP_SHADOWS;
   config.contrast = RENODX_TONE_MAP_CONTRAST;
   config.saturation = RENODX_TONE_MAP_SATURATION;

src/games/guildwars2/shared.h

@@ -1,10 +1,6 @@
 #ifndef SRC_GUILDWARS2_SHARED_H_
 #define SRC_GUILDWARS2_SHARED_H_
 
-#ifndef __cplusplus
-#include "../../shaders/renodx.hlsl"
-#endif
-
 // Must be 32bit aligned
 // Should be 4x32
 struct ShaderInjectData {
@@ -113,5 +109,8 @@ cbuffer cb13 : register(b13) {
 #define CUSTOM_RANDOM3                                shader_injection.random_3
 #define CUSTOM_STATE_CHECK                            shader_injection.stateCheck
 #endif
+#ifndef __cplusplus
+#include "../../shaders/renodx.hlsl"
+#endif
 
 #endif  // SRC_GUILDWARS2_SHARED_H_

src/games/guildwars2/tonemap/pp_0x7904D64C.ps_5_0.hlsl

@@ -28,7 +28,7 @@ void main(
   r0.w = pow(r0.w, cb0[2].w);
   r0.w = cb0[3].w * r0.w * CUSTOM_COLOR_TINT;
   r1.x = renodx::color::y::from::BT709(r0.xyz);
-  r0.xyz = lerp(r1.xxx, r0.xyz, (1.f, cb0[1].w, CUSTOM_COLOR_TINT));
+  r0.xyz = lerp(r1.xxx, r0.xyz, lerp(1.f, cb0[1].w, CUSTOM_COLOR_TINT));
   r0.xyz = lerp(r0.xyz, cb0[3].xyz * r1.xxx, r0.w);
   r1.xyz = t1.Sample(s1_s, w0.xy).xyz;
   r1.xyz = cb0[0].xyz * r1.xyz * CUSTOM_BLOOM;