From 54e5d9316514cafede769b5e92a3c087c82b774f Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 21 Sep 2024 21:00:40 +1000
Subject: [PATCH] GPU/SW: Enable SIMD path and make default

---
 src/core/core.vcxproj          | 6 ------
 src/core/core.vcxproj.filters  | 1 -
 src/core/gpu_sw_rasterizer.cpp | 9 ++++-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 85cde4ff8..addb7a1a8 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -51,12 +51,6 @@
     <ClCompile Include="gpu_sw.cpp" />
     <ClCompile Include="gpu_sw_backend.cpp" />
     <ClCompile Include="gpu_sw_rasterizer.cpp" />
-    <ClCompile Include="gpu_sw_rasterizer_avx2.cpp">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalOptions Condition="$(Configuration.Contains(Clang))">%(AdditionalOptions) -mavx2</AdditionalOptions>
-      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="gte.cpp" />
     <ClCompile Include="dma.cpp" />
     <ClCompile Include="gpu.cpp" />
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 5bd97eaf4..ec0c37da1 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -67,7 +67,6 @@
     <ClCompile Include="justifier.cpp" />
     <ClCompile Include="gdb_server.cpp" />
     <ClCompile Include="gpu_sw_rasterizer.cpp" />
-    <ClCompile Include="gpu_sw_rasterizer_avx2.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="types.h" />
diff --git a/src/core/gpu_sw_rasterizer.cpp b/src/core/gpu_sw_rasterizer.cpp
index 371766ddb..b7dc3eabc 100644
--- a/src/core/gpu_sw_rasterizer.cpp
+++ b/src/core/gpu_sw_rasterizer.cpp
@@ -47,7 +47,7 @@ namespace GPU_SW_Rasterizer::SIMD {
 #define USE_VECTOR 1
 #include "gpu_sw_rasterizer.inl"
 #undef USE_VECTOR
-}
+} // namespace GPU_SW_Rasterizer::SIMD
 #endif
 
 // Initialize with default implementation.
@@ -78,10 +78,9 @@ void GPU_SW_Rasterizer::SelectImplementation()
 #if defined(CPU_ARCH_SSE) || defined(CPU_ARCH_NEON)
   const char* use_isa = std::getenv("SW_USE_ISA");
 
-  // Default to scalar for now, until vector is finished.
-  use_isa = use_isa ? use_isa : "Scalar";
-
-#if defined(CPU_ARCH_SSE) && defined(_MSC_VER)
+  // AVX2/256-bit path still has issues, and I need to make sure that it's not ODR'ing any shared
+  // symbols on top of the base symbols.
+#if defined(CPU_ARCH_SSE) && defined(_MSC_VER) && 0
   if (cpuinfo_has_x86_avx2() && (!use_isa || StringUtil::Strcasecmp(use_isa, "AVX2") == 0))
   {
     SELECT_ALTERNATIVE_RASTERIZER(AVX2);