Better 32 bit Windows Fix

src/Vulkan/BUILD.gn

@@ -109,8 +109,11 @@ swiftshader_shared_library("swiftshader_libvulkan") {
   output_name = "libvulkan"
   output_dir = "$root_out_dir/swiftshader"
 
-  ldflags = [ "-Wl,--version-script=" +
-              rebase_path("libvk_swiftshader.lds", root_build_dir) ]
+  if (is_linux)
+  {
+    ldflags = [ "-Wl,--version-script=" +
+                rebase_path("libvk_swiftshader.lds", root_build_dir) ]
+  }
 
   deps = [
     "../Device",

src/Vulkan/VkGetProcAddress.cpp

@@ -428,37 +428,4 @@ extern "C" hwvulkan_module_t HAL_MODULE_INFO_SYM =
 	}
 };
 
-#endif
-
-#if defined(_MSC_VER) && !defined(_WIN64)
-namespace
-{
-	// The following function is a hack to allow compilation in Visual Studio using the 32 bit compiler"
-	// "fatal error C1001: An internal error has occurred in the compiler.
-	//  (compiler file 'd:\agent\_work\1\s\src\vctools\compiler\utc\src\p2\main.c', line 187)"
-	void Dummy()
-	{
-		{ VkSemaphore handle; }
-		{ VkFence handle; }
-		{ VkDeviceMemory handle; }
-		{ VkBuffer handle; }
-		{ VkImage handle; }
-		{ VkEvent handle; }
-		{ VkQueryPool handle; }
-		{ VkBufferView handle; }
-		{ VkImageView handle; }
-		{ VkShaderModule handle; }
-		{ VkPipelineCache handle; }
-		{ VkPipelineLayout handle; }
-		{ VkRenderPass handle; }
-		{ VkPipeline handle; }
-		{ VkDescriptorSetLayout handle; }
-		{ VkSampler handle; }
-		{ VkDescriptorPool handle; }
-		{ VkFramebuffer handle; }
-		{ VkCommandPool handle; }
-		{ VkSamplerYcbcrConversion handle; }
-		{ VkDescriptorUpdateTemplate handle; }
-	}
-}
 #endif
\ No newline at end of file

src/Vulkan/VulkanPlatform.h

@@ -18,10 +18,10 @@
 #include <cstddef>
 #include <cstdint>
 
-template<typename HandleType> class VkNonDispatchableHandleBase
+template<typename HandleType> class VkHandle
 {
 public:
-	VkNonDispatchableHandleBase(HandleType handle)
+	VkHandle(HandleType handle)
 	{
 		u.dummy = 0;
 		u.handle = handle;
@@ -52,18 +52,13 @@ private:
 	PointerHandleUnion u;
 };
 
-template<typename T> class VkNonDispatchableHandle : public VkNonDispatchableHandleBase<T>
+template<typename T> class VkNonDispatchableHandleBase : public VkHandle<T>
 {
 public:
 	using HandleType = T;
 
-	VkNonDispatchableHandle() : VkNonDispatchableHandleBase<T>(nullptr)
-	{
-	}
-
-	VkNonDispatchableHandle(HandleType handle) : VkNonDispatchableHandleBase<T>(handle)
+	VkNonDispatchableHandleBase(HandleType handle) : VkHandle<T>(handle)
 	{
-		static_assert(sizeof(VkNonDispatchableHandle) == sizeof(uint64_t), "Size is not 64 bits!");
 	}
 
 	void operator=(HandleType handle)
@@ -75,14 +70,13 @@ public:
 // VkDescriptorSet objects are really just memory in the VkDescriptorPool
 // object, so define different/more convenient operators for this object.
 struct VkDescriptorSet_T;
-template<> class VkNonDispatchableHandle<VkDescriptorSet_T*> : public VkNonDispatchableHandleBase<uint8_t*>
+template<> class VkNonDispatchableHandleBase<VkDescriptorSet_T*> : public VkHandle<uint8_t*>
 {
 public:
 	using HandleType = uint8_t*;
 
-	VkNonDispatchableHandle(HandleType handle) : VkNonDispatchableHandleBase<uint8_t*>(handle)
+	VkNonDispatchableHandleBase(HandleType handle) : VkHandle<uint8_t*>(handle)
 	{
-		static_assert(sizeof(VkNonDispatchableHandle) == sizeof(uint64_t), "Size is not 64 bits!");
 	}
 
 	HandleType operator+(ptrdiff_t rhs) const
@@ -101,9 +95,23 @@ public:
 	}
 };
 
+template<typename T> class VkNonDispatchableHandle : public VkNonDispatchableHandleBase<T>
+{
+public:
+	VkNonDispatchableHandle() : VkNonDispatchableHandleBase<T>(nullptr)
+	{
+	}
+
+	VkNonDispatchableHandle(typename VkNonDispatchableHandleBase<T>::HandleType handle) : VkNonDispatchableHandleBase<T>(handle)
+	{
+		static_assert(sizeof(VkNonDispatchableHandle) == sizeof(uint64_t), "Size is not 64 bits!");
+	}
+};
+
 #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) \
 	typedef struct object##_T *object##Ptr; \
-	typedef VkNonDispatchableHandle<object##Ptr> object;
+	typedef VkNonDispatchableHandle<object##Ptr> object; \
+    template class VkNonDispatchableHandle<object##Ptr>;
 
 #include <vulkan/vulkan.h>
 

src/WSI/BUILD.gn

@@ -20,12 +20,17 @@ swiftshader_source_set("WSI") {
     "VkSurfaceKHR.hpp",
     "VkSwapchainKHR.cpp",
     "VkSwapchainKHR.hpp",
-    "XlibSurfaceKHR.cpp",
-    "XlibSurfaceKHR.hpp",
-    "libX11.cpp",
-    "libX11.hpp",
   ]
 
+  if (is_linux) {
+    sources += [
+      "XlibSurfaceKHR.cpp",
+      "XlibSurfaceKHR.hpp",
+      "libX11.cpp",
+      "libX11.hpp",
+    ]
+  }
+
   include_dirs = [
     "..",
     "../../include",