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>

diff --git a/src/OpenGL/libEGL/Surface.cpp b/src/OpenGL/libEGL/Surface.cpp
index 333ba4f..2acfdb3 100644 (file)
--- a/src/OpenGL/libEGL/Surface.cpp
+++ b/src/OpenGL/libEGL/Surface.cpp
@@ -137,14 +137,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
     deleteResources();\r
 \r
     if(mWindow)\r
-    {
-               if(libGLES_CM)
+    {\r
+               if(libGLES_CM)\r
                {\r
-                       frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
-               }
-               else if(libGLESv2)
+                       frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);\r
+               }\r
+               else if(libGLESv2)\r
                {\r
-                       frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
+                       frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);\r
                }\r
 \r
                if(!frameBuffer)\r
@@ -154,14 +154,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
                        return error(EGL_BAD_ALLOC, false);\r
                }\r
     }\r
-
-       if(libGLES_CM)
+\r
+       if(libGLES_CM)\r
+       {\r
+               backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);\r
+       }\r
+       else if(libGLESv2)\r
        {\r
-               backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
-       }
-       else if(libGLESv2)
-       {
-               backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
+               backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);\r
        }\r
 \r
     if(!backBuffer)\r
@@ -172,15 +172,15 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
     }\r
 \r
     if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL)\r
-    {
-
-               if(libGLES_CM)
+    {\r
+\r
+               if(libGLES_CM)\r
+               {\r
+                       mDepthStencil = libGLES_CM->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);\r
+               }\r
+               else if(libGLESv2)\r
                {\r
-                       mDepthStencil = libGLES_CM->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
-               }
-               else if(libGLESv2)
-               {
-                       mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
+                       mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);\r
                }\r
 \r
                if(!mDepthStencil)\r
@@ -207,7 +207,7 @@ void Surface::swap()
        if(backBuffer)\r
     {\r
                void *source = backBuffer->lockInternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC);\r
-               frameBuffer->flip(source, backBuffer->getInternalFormat());\r
+               frameBuffer->flip(source, backBuffer->Surface::getInternalFormat());\r
                backBuffer->unlockInternal();\r
 \r
         checkForResize();\r