commit a2f5fd82603145c6e770e284cf23fc2e495e2a21
author Alexis Hetu <sugoi@google.com> Fri Mar 01 15:31:31 2019 -0500
committer Alexis Hétu <sugoi@google.com> Fri Mar 01 20:38:57 2019 +0000
tree 5415de2184756133a1f1bd6dbeffb5a63a2d6007
parent 048974f36ecc9647a8c33fb6fadeaffbd31b1e12

Windows build fix

Bug swiftshader:124

Change-Id: Ied13e859cc8984e59af393de6ca1a93428a0e30e
Reviewed-on: https://swiftshader-review.googlesource.com/c/25949
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>

src/Vulkan/vulkan.vcxproj

diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index d466e52..ec6a1ae 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -147,6 +147,7 @@
     <ClCompile Include="..\Pipeline\SetupRoutine.cpp" />

     <ClCompile Include="..\Pipeline\ShaderCore.cpp" />

     <ClCompile Include="..\Pipeline\SpirvShader.cpp" />

+    <ClCompile Include="..\Pipeline\SpirvShader_dbg.cpp" />

     <ClCompile Include="..\Pipeline\VertexProgram.cpp" />

     <ClCompile Include="..\Pipeline\VertexRoutine.cpp" />

     <ClCompile Include="..\System\Configurator.cpp" />

@@ -167,6 +168,7 @@
     <ClCompile Include="..\System\Socket.cpp" />

     <ClCompile Include="..\System\Thread.cpp" />

     <ClCompile Include="..\System\Timer.cpp" />

+    <ClCompile Include="..\WSI\VkSurfaceKHR.cpp" />

     <ClCompile Include="..\WSI\FrameBuffer.cpp" />

     <ClCompile Include="..\WSI\FrameBufferAndroid.cpp">

       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

@@ -278,6 +280,7 @@
     <ClInclude Include="..\System\Thread.hpp" />

     <ClInclude Include="..\System\Timer.hpp" />

     <ClInclude Include="..\System\Types.hpp" />

+    <ClInclude Include="..\WSI\VkSurfaceKHR.hpp" />

     <ClInclude Include="..\WSI\FrameBuffer.hpp" />

     <ClInclude Include="..\WSI\FrameBufferAndroid.hpp">

       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

src/Vulkan/vulkan.vcxproj.filters

diff --git a/src/Vulkan/vulkan.vcxproj.filters b/src/Vulkan/vulkan.vcxproj.filters
index 66a1b5c..522de29 100644
--- a/src/Vulkan/vulkan.vcxproj.filters
+++ b/src/Vulkan/vulkan.vcxproj.filters
@@ -147,6 +147,9 @@
     <ClCompile Include="..\WSI\libX11.cpp">

       <Filter>Source Files\WSI</Filter>

     </ClCompile>

+    <ClCompile Include="..\WSI\VkSurfaceKHR.cpp">

+      <Filter>Source Files\WSI</Filter>

+    </ClCompile>

     <ClCompile Include="..\System\Configurator.cpp">

       <Filter>Source Files\System</Filter>

     </ClCompile>

@@ -258,6 +261,9 @@
     <ClCompile Include="..\Pipeline\SpirvShader.cpp">

       <Filter>Source Files\Pipeline</Filter>

     </ClCompile>

+    <ClCompile Include="..\Pipeline\SpirvShader_dbg.cpp">

+      <Filter>Source Files\Pipeline</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="resource.h">

@@ -452,6 +458,9 @@
     <ClInclude Include="..\WSI\libX11.hpp">

       <Filter>Header Files\WSI</Filter>

     </ClInclude>

+    <ClInclude Include="..\WSI\VkSurfaceKHR.hpp">

+      <Filter>Header Files\WSI</Filter>

+    </ClInclude>

     <ClInclude Include="..\Pipeline\VertexRoutine.hpp">

       <Filter>Header Files\Pipeline</Filter>

     </ClInclude>

src/WSI/VkSurfaceKHR.cpp

diff --git a/src/WSI/VkSurfaceKHR.cpp b/src/WSI/VkSurfaceKHR.cpp
index 5734db7..0fd3468 100644
--- a/src/WSI/VkSurfaceKHR.cpp
+++ b/src/WSI/VkSurfaceKHR.cpp
@@ -59,7 +59,7 @@
 
 uint32_t SurfaceKHR::getPresentModeCount() const
 {
-	return presentModes.size();
+	return static_cast<uint32_t>(presentModes.size());
 }