Commit 0c3c6f1b by Nicolas Capens Committed by Nicolas Capens

Check against sRGB formats for eglBindTexImage().

We currently don't support EGL configs/surfaces with sRGB formats. Change-Id: Ie23a5121bec784fe807c03feae19442fece3f1d7 Reviewed-on: https://swiftshader-review.googlesource.com/11268Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 20de2e45
...@@ -476,19 +476,12 @@ void Texture2D::setImage(egl::Context *context, GLint level, GLsizei width, GLsi ...@@ -476,19 +476,12 @@ void Texture2D::setImage(egl::Context *context, GLint level, GLsizei width, GLsi
void Texture2D::bindTexImage(gl::Surface *surface) void Texture2D::bindTexImage(gl::Surface *surface)
{ {
GLenum format;
switch(surface->getInternalFormat()) switch(surface->getInternalFormat())
{ {
case sw::FORMAT_A8R8G8B8: case sw::FORMAT_A8R8G8B8:
format = GL_BGRA_EXT;
break;
case sw::FORMAT_A8B8G8R8: case sw::FORMAT_A8B8G8R8:
format = GL_RGBA;
break;
case sw::FORMAT_X8B8G8R8: case sw::FORMAT_X8B8G8R8:
case sw::FORMAT_X8R8G8B8: case sw::FORMAT_X8R8G8B8:
format = GL_RGB;
break; break;
default: default:
UNIMPLEMENTED(); UNIMPLEMENTED();
......
...@@ -652,21 +652,12 @@ void Texture2D::setImage(egl::Context *context, GLint level, GLsizei width, GLsi ...@@ -652,21 +652,12 @@ void Texture2D::setImage(egl::Context *context, GLint level, GLsizei width, GLsi
void Texture2D::bindTexImage(gl::Surface *surface) void Texture2D::bindTexImage(gl::Surface *surface)
{ {
GLenum format;
switch(surface->getInternalFormat()) switch(surface->getInternalFormat())
{ {
case sw::FORMAT_A8R8G8B8: case sw::FORMAT_A8R8G8B8:
case sw::FORMAT_SRGB8_A8:
format = GL_BGRA_EXT;
break;
case sw::FORMAT_A8B8G8R8: case sw::FORMAT_A8B8G8R8:
format = GL_RGBA;
break;
case sw::FORMAT_X8B8G8R8: case sw::FORMAT_X8B8G8R8:
case sw::FORMAT_X8R8G8B8: case sw::FORMAT_X8R8G8B8:
case sw::FORMAT_SRGB8_X8:
format = GL_RGB;
break; break;
default: default:
UNIMPLEMENTED(); UNIMPLEMENTED();
......
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