commit a0aa5fdeee12bc42616fe13ef3ea62edb1b9f166
author Nicolas Capens <capn@google.com> Fri Dec 01 13:12:32 2017 -0500
committer Nicolas Capens <nicolascapens@google.com> Fri Dec 01 18:30:43 2017 +0000
tree dd2c12824fb8ece79e52aeda9ff88789b2db075a
parent ff5e6f609de42ea1a7b27b529b83cdd9ed7b886c

Fix Ozone compilation.

Change-Id: I03a369139b733a75a7790e65afc514b929e32090
Reviewed-on: https://swiftshader-review.googlesource.com/14468
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Main/FrameBufferOzone.cpp

diff --git a/src/Main/FrameBufferOzone.cpp b/src/Main/FrameBufferOzone.cpp
index c551a46..95e0729 100644
--- a/src/Main/FrameBufferOzone.cpp
+++ b/src/Main/FrameBufferOzone.cpp
@@ -19,8 +19,8 @@
 	FrameBufferOzone::FrameBufferOzone(intptr_t display, intptr_t window, int width, int height) : FrameBuffer(width, height, false, false)
 	{
 		buffer = sw::Surface::create(width, height, 1, format, nullptr,
-		                             sw::Surface::pitchB(width, format, true),
-		                             sw::Surface::sliceB(width, height, format, true));
+		                             sw::Surface::pitchB(width, 0, format, true),
+		                             sw::Surface::sliceB(width, height, 0, format, true));
 	}
 
 	FrameBufferOzone::~FrameBufferOzone()

src/SwiftShader/SwiftShader.vcxproj

diff --git a/src/SwiftShader/SwiftShader.vcxproj b/src/SwiftShader/SwiftShader.vcxproj
index ec9c467..513fb5b 100644
--- a/src/SwiftShader/SwiftShader.vcxproj
+++ b/src/SwiftShader/SwiftShader.vcxproj
@@ -324,6 +324,7 @@
     <ClCompile Include="..\Common\Socket.cpp" />

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

     <ClCompile Include="..\Main\Config.cpp" />

+    <ClCompile Include="..\Main\FrameBufferOzone.cpp" />

     <ClCompile Include="..\Main\FrameBufferWin.cpp" />

     <ClCompile Include="..\Renderer\ETC_Decoder.cpp" />

     <ClCompile Include="..\Shader\Constants.cpp" />

src/SwiftShader/SwiftShader.vcxproj.filters

diff --git a/src/SwiftShader/SwiftShader.vcxproj.filters b/src/SwiftShader/SwiftShader.vcxproj.filters
index b7618d0..64569cd 100644
--- a/src/SwiftShader/SwiftShader.vcxproj.filters
+++ b/src/SwiftShader/SwiftShader.vcxproj.filters
@@ -173,6 +173,9 @@
     <ClCompile Include="..\Renderer\ETC_Decoder.cpp">

       <Filter>Source Files\Renderer</Filter>

     </ClCompile>

+    <ClCompile Include="..\Main\FrameBufferOzone.cpp">

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

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\Shader\Constants.hpp">