Add spherical shader

Author: dnblank123

Shaderbool.h

@@ -10,4 +10,5 @@ bool ShadowPlayerB = false;
 bool ShadowPropB = false;
 bool FragmentShadowB = false;
 bool TerrainB = false;
-bool DefaultB = false;
+bool DefaultB = false;
+bool SphericalB = false;

Shaders/Default.h

@@ -38,7 +38,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLowSettings|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>ClangCL</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <LLVMToolsVersion>17</LLVMToolsVersion>
@@ -89,6 +89,9 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -104,7 +107,9 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <ExpandAttributedSource>false</ExpandAttributedSource>
       <AssemblerOutput>AssemblyCode</AssemblerOutput>
-      <AdditionalOptions>-Ofast -mavx %(AdditionalOptions)</AdditionalOptions>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -120,6 +125,7 @@
     <ClInclude Include="Shaders\Particle1.h" />
     <ClInclude Include="Shaders\RadialBlur.h" />
     <ClInclude Include="Shaders\Shadow.h" />
+    <ClInclude Include="Shaders\Spherical.h" />
     <ClInclude Include="Shaders\Terrain.h" />
     <ClInclude Include="Shaders\Tex.h" />
     <ClInclude Include="Shaders\VolumeFog.h" />

Shaders/Spherical.h

@@ -45,6 +45,9 @@
     <ClInclude Include="Shaders\Terrain.h">
       <Filter>Shaders</Filter>
     </ClInclude>
+    <ClInclude Include="Shaders\Spherical.h">
+      <Filter>Shaders</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitignore" />

atelier-sync-fix.vcxproj

@@ -9,16 +9,15 @@
 #include "Shaders/Particle1.h"
 #include "Shaders/RadialBlur.h"
 #include "Shaders/Shadow.h"
+#include "Shaders/Spherical.h"
 #include "Shaders/Terrain.h"
 #include "Shaders/Tex.h"
 #include "Shaders/VolumeFog.h"
 #include "util.h"
 
-
 namespace atfix {
 
 extern "C" bool IsAMD();
-
 /** Hooking-related stuff */
 using PFN_ID3D11Device_CreateVertexShader = HRESULT(STDMETHODCALLTYPE*) (ID3D11Device*, const void*, SIZE_T, ID3D11ClassLinkage*, ID3D11VertexShader**);
 using PFN_ID3D11Device_CreatePixelShader = HRESULT(STDMETHODCALLTYPE*) (ID3D11Device*, const void*, SIZE_T, ID3D11ClassLinkage*, ID3D11PixelShader**);
@@ -41,6 +40,10 @@ const DeviceProcs* getDeviceProcs(ID3D11Device* pDevice) {
   return &g_deviceProcs;
 }
 
+// This game hates and crashes when other shaders 
+// don't have a vertex shader when doing 
+// pixel shader changes, but it's fine the other way around.
+
 HRESULT STDMETHODCALLTYPE ID3D11Device_CreateVertexShader(
         ID3D11Device*           pDevice,
         const void*             pShaderBytecode,
@@ -155,6 +158,7 @@ HRESULT STDMETHODCALLTYPE ID3D11Device_CreatePixelShader(
     static constexpr std::array<uint32_t, 4> ShadowShader = { 0xbb5a2d0a, 0x29d139b7, 0x40992005, 0xf3b46588 };
     static constexpr std::array<uint32_t, 4> TerrainShader = { 0x74a9f538, 0x75cb0ce6, 0x3da09498, 0x7bc641bd };
     static constexpr std::array<uint32_t, 4> DefaultShader = { 0x5cbbb737, 0x265384da, 0x36d6d037, 0x1b052f54 };
+    static constexpr std::array<uint32_t, 4> SphericalShader = { 0xba0db34b, 0xd2bc2581, 0x36622cd8, 0xacd2a10c };
 
     const uint32_t* hash = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(pShaderBytecode) + 4);
 
@@ -190,6 +194,13 @@ HRESULT STDMETHODCALLTYPE ID3D11Device_CreatePixelShader(
         return procs->CreatePixelShader(pDevice, SIMPLIFIED_FS_SHADOW_SHADER, sizeof(SIMPLIFIED_FS_SHADOW_SHADER), pClassLinkage, ppPixelShader);
 
     }
+    else if (std::equal(SphericalShader.begin(), SphericalShader.end(), hash)) {
+        if (!SphericalB) {
+            SphericalB = true;
+            log("Spherical Map found");
+        }
+        return procs->CreatePixelShader(pDevice, SIMPLIFIED_FS_HIGH_SPHERICAL_SHADER, sizeof(SIMPLIFIED_FS_HIGH_SPHERICAL_SHADER), pClassLinkage, ppPixelShader);
+    }
 #else
     else if (std::equal(TerrainShader.begin(), TerrainShader.end(), hash)) {
 
@@ -198,6 +209,13 @@ HRESULT STDMETHODCALLTYPE ID3D11Device_CreatePixelShader(
     else if (std::equal(DefaultShader.begin(), DefaultShader.end(), hash)) {
 
         return procs->CreatePixelShader(pDevice, SIMPLIFIED_FS_DEFAULT_SHADER, sizeof(SIMPLIFIED_FS_DEFAULT_SHADER), pClassLinkage, ppPixelShader);
+    }    
+    else if (std::equal(SphericalShader.begin(), SphericalShader.end(), hash)) {
+        if (!SphericalB) {
+            SphericalB = true;
+            log("Spherical Map found");
+        }
+        return procs->CreatePixelShader(pDevice, SIMPLIFIED_FS_LOW_SPHERICAL_SHADER, sizeof(SIMPLIFIED_FS_LOW_SPHERICAL_SHADER), pClassLinkage, ppPixelShader);
     }
 #endif
     return procs->CreatePixelShader(pDevice, pShaderBytecode, BytecodeLength, pClassLinkage, ppPixelShader);