commit f16c91afcdd321df62cb97db07b664751f164c91
author Nicolas Capens <capn@google.com> Mon May 11 17:03:19 2015 -0400
committer Nicolas Capens <capn@google.com> Tue May 12 17:54:08 2015 +0000
tree aaf2b014be6c36c99c8fd1a66a9ccd8762eccbdd
parent 8aaf67125ce8423fac4d6a3358d5e694b2d7189c

Use the correct internal format for swaps.

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

src/OpenGL/libEGL/Surface.cpp

diff --git a/src/OpenGL/libEGL/Surface.cpp b/src/OpenGL/libEGL/Surface.cpp
index 333ba4f..2acfdb3 100644
--- a/src/OpenGL/libEGL/Surface.cpp
+++ b/src/OpenGL/libEGL/Surface.cpp
@@ -137,14 +137,14 @@
     deleteResources();

 

     if(mWindow)

-    {
-		if(libGLES_CM)
+    {

+		if(libGLES_CM)

 		{

-			frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
-		}
-		else if(libGLESv2)
+			frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);

+		}

+		else if(libGLESv2)

 		{

-			frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
+			frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);

 		}

 

 		if(!frameBuffer)

@@ -154,14 +154,14 @@
 			return error(EGL_BAD_ALLOC, false);

 		}

     }

-
-	if(libGLES_CM)
+

+	if(libGLES_CM)

 	{

-		backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
-	}
-	else if(libGLESv2)
-	{
-		backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
+		backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);

+	}

+	else if(libGLESv2)

+	{

+		backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);

 	}

 

     if(!backBuffer)

@@ -172,15 +172,15 @@
     }

 

     if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL)

-    {
-
-		if(libGLES_CM)
+    {

+

+		if(libGLES_CM)

 		{

-			mDepthStencil = libGLES_CM->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
-		}
-		else if(libGLESv2)
-		{
-			mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
+			mDepthStencil = libGLES_CM->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);

+		}

+		else if(libGLESv2)

+		{

+			mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);

 		}

 

 		if(!mDepthStencil)

@@ -207,7 +207,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->unlockInternal();

 

         checkForResize();