Windows build fix

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

Windows build fix
a2f5fd82 · Alexis Hetu · Alexis Hétu · 048974f3 · a2f5fd82 · a2f5fd82
Commit a2f5fd82 authored Mar 01, 2019 by Alexis Hetu Committed by Alexis Hétu Mar 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

vulkan.vcxproj src/Vulkan/vulkan.vcxproj +3 -0

vulkan.vcxproj.filters src/Vulkan/vulkan.vcxproj.filters +9 -0

VkSurfaceKHR.cpp src/WSI/VkSurfaceKHR.cpp +1 -1

No files found.
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -147,6 +147,7 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
    <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 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
    <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 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
    <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>

--- 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>

--- a/src/WSI/VkSurfaceKHR.cpp
+++ b/src/WSI/VkSurfaceKHR.cpp
@@ -59,7 +59,7 @@ VkResult SurfaceKHR::getSurfaceFormats(uint32_t *pSurfaceFormatCount, VkSurfaceF
 uint32_t SurfaceKHR::getPresentModeCount() const
 {
-	return presentModes.size();
+	return static_cast<uint32_t>(presentModes.size());
 }