Skip to content

S
swiftshader
Commit f16c91af by Nicolas Capens
Options

Use the correct internal format for swaps.

Change-Id: If0aedc86a1f6492eb8174744f9ca6c3eea24e729 Reviewed-on: https://swiftshader-review.googlesource.com/3090Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 8aaf6712
Showing with 22 additions and 22 deletions
src/OpenGL/libEGL/Surface.cpp
...@@ -137,14 +137,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -137,14 +137,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
deleteResources(); deleteResources();
if(mWindow) if(mWindow)
{ {
if(libGLES_CM) if(libGLES_CM)
{ {
frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight); frameBuffer = libGLES_CM->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
} }
else if(libGLESv2) else if(libGLESv2)
{ {
frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight); frameBuffer = libGLESv2->createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
} }
if(!frameBuffer) if(!frameBuffer)
...@@ -154,14 +154,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -154,14 +154,14 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
return error(EGL_BAD_ALLOC, false); return error(EGL_BAD_ALLOC, false);
} }
} }
if(libGLES_CM) if(libGLES_CM)
{
backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
}
else if(libGLESv2)
{ {
backBuffer = libGLES_CM->createBackBuffer(backBufferWidth, backBufferHeight, mConfig); backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
}
else if(libGLESv2)
{
backBuffer = libGLESv2->createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
} }
if(!backBuffer) if(!backBuffer)
...@@ -172,15 +172,15 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -172,15 +172,15 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
} }
if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL) 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 = libGLES_CM->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false); mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
}
else if(libGLESv2)
{
mDepthStencil = libGLESv2->createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
} }
if(!mDepthStencil) if(!mDepthStencil)
...@@ -207,7 +207,7 @@ void Surface::swap() ...@@ -207,7 +207,7 @@ void Surface::swap()
if(backBuffer) if(backBuffer)
{ {
void *source = backBuffer->lockInternal(0, 0, 0, sw::LOCK_READONLY, sw::PUBLIC); 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(); backBuffer->unlockInternal();
checkForResize(); checkForResize();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment