cpu check

Author: dnblank123

atelier-sync-fix.vcxproj

@@ -38,12 +38,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLowSettings|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <LLVMToolsVersion>17</LLVMToolsVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
@@ -100,6 +102,9 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;RELEASELOW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExpandAttributedSource>false</ExpandAttributedSource>
+      <AssemblerOutput>AssemblyCode</AssemblerOutput>
+      <AdditionalOptions>-Ofast -mavx %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -130,8 +135,12 @@
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitignore" />
+    <MASM Include="cpuid.asm">
+      <FileType>Document</FileType>
+    </MASM>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>

atelier-sync-fix.vcxproj.filters

@@ -56,5 +56,13 @@
     <Filter Include="minhook">
       <UniqueIdentifier>{5c578b33-ea9f-4546-ac1b-108deee375d3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="assembly">
+      <UniqueIdentifier>{22c862f7-39da-4332-9f47-841eef843de3}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="cpuid.asm">
+      <Filter>assembly</Filter>
+    </MASM>
   </ItemGroup>
 </Project>

cpuid.asm

@@ -0,0 +1,11 @@
+
+.code
+IsAMD PROC
+    xor eax, eax
+    cpuid                                    
+    cmp ecx, 444d4163h         
+    setz al      
+    ret
+
+IsAMD ENDP
+end

impl.cpp

@@ -14,8 +14,11 @@
 #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**);
@@ -56,23 +59,30 @@ HRESULT STDMETHODCALLTYPE ID3D11Device_CreateVertexShader(
     static constexpr std::array<uint32_t, 4> DefaultShader = { 0x49d8396e, 0x5b9dfd57, 0xb4f45dba, 0xe6d8b741 };
 
     const uint32_t* hash = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(pShaderBytecode) + 4);
-
+    bool AMD = IsAMD();
     if (std::equal(ParticleShader1.begin(), ParticleShader1.end(), hash)) {
 
         if (!Particle1B) {
             Particle1B = true;
             log("Particle found");
         }
-        return procs->CreateVertexShader(pDevice, FIXED_PARTICLE_SHADER1, sizeof(FIXED_PARTICLE_SHADER1), pClassLinkage, ppVertexShader);
+        if (AMD) {
+            return procs->CreateVertexShader(pDevice, FIXED_PARTICLE_SHADER1, sizeof(FIXED_PARTICLE_SHADER1), pClassLinkage, ppVertexShader);
+        } else {
+            return procs->CreateVertexShader(pDevice, pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader);
+        }
 
     } else if (std::equal(ParticleShader2.begin(), ParticleShader2.end(), hash)) {
 
         if (!Particle2B) {
             Particle2B = true;
             log("Particle Iterate found");
         }
-        return procs->CreateVertexShader(pDevice, FIXED_PARTICLE_SHADER2, sizeof(FIXED_PARTICLE_SHADER2), pClassLinkage, ppVertexShader);
-
+        if (AMD) {
+            return procs->CreateVertexShader(pDevice, FIXED_PARTICLE_SHADER2, sizeof(FIXED_PARTICLE_SHADER2), pClassLinkage, ppVertexShader);
+        } else {
+            return procs->CreateVertexShader(pDevice, pShaderBytecode, BytecodeLength, pClassLinkage, ppVertexShader);
+        }
     }
 #ifndef RELEASELOW
     else if (std::equal(VolumeFogShader.begin(), VolumeFogShader.end(), hash)) {