commit 360361a40eace62daca842a8d9ea133ab7276ee7
author Nicolas Capens <capn@google.com> Tue Dec 01 15:15:53 2015 -0500
committer Nicolas Capens <capn@google.com> Tue Dec 01 21:29:35 2015 +0000
tree fb1f10e79be4ebd809d4fc3f1ff5209af5de8a79
parent a2d2055e10c1f977ab19789242de67e92e350198

Fix GL and D3D9 compilation.

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

src/D3D9/Direct3DSwapChain9.cpp

diff --git a/src/D3D9/Direct3DSwapChain9.cpp b/src/D3D9/Direct3DSwapChain9.cpp
index 1a5e21e..c8ceaa4 100644
--- a/src/D3D9/Direct3DSwapChain9.cpp
+++ b/src/D3D9/Direct3DSwapChain9.cpp
@@ -148,6 +148,7 @@
 		HWND window = destWindowOverride ? destWindowOverride : presentParameters.hDeviceWindow;
 		void *source = backBuffer[0]->lockInternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC);   // FIXME: External
 		sw::Format format = backBuffer[0]->getInternalFormat();
+		int stride = backBuffer[0]->getInternalPitchB();
 
 		POINT point;
 		GetCursorPos(&point);
@@ -157,7 +158,7 @@
 
 		if(!sourceRect && !destRect)   // FIXME: More cases?
 		{
-			frameBuffer->flip(window, source, format);
+			frameBuffer->flip(window, source, format, stride);
 		}
 		else   // FIXME: Check for SWAPEFFECT_COPY
 		{
@@ -180,7 +181,7 @@
 				dRect.y1 = destRect->bottom;
 			}
 
-			frameBuffer->blit(window, source, sourceRect ? &sRect : 0, destRect ? &dRect : 0, format);
+			frameBuffer->blit(window, source, sourceRect ? &sRect : 0, destRect ? &dRect : 0, format, stride);
 		}
 
 		backBuffer[0]->unlockInternal();   // FIXME: External

src/OpenGL/libGL/Surface.cpp

diff --git a/src/OpenGL/libGL/Surface.cpp b/src/OpenGL/libGL/Surface.cpp
index 1c9470f..f5ccae6 100644
--- a/src/OpenGL/libGL/Surface.cpp
+++ b/src/OpenGL/libGL/Surface.cpp
@@ -158,7 +158,7 @@
 	if(backBuffer)

     {

 		void *source = backBuffer->lockInternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC);

-		frameBuffer->flip(source, backBuffer->getInternalFormat());

+		frameBuffer->flip(source, backBuffer->Surface::getInternalFormat(), backBuffer->getInternalPitchB());

 		backBuffer->unlockInternal();

 

         checkForResize();