Fix clearing the geometry shader state in copytexture, and errors generated by a…

Fix clearing the geometry shader state in copytexture, and errors generated by a BGRA backbuffer format. TRAC #22545 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1893 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix clearing the geometry shader state in copytexture, and errors generated by a…
28e7ba01 · shannon.woods@transgaming.com · 8d2f086a · 28e7ba01 · 28e7ba01
Commit 28e7ba01 authored Feb 28, 2013 by shannon.woods@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +3 -0

Renderer11.cpp src/libGLESv2/renderer/Renderer11.cpp +1 -0

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1331,6 +1331,7 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
                if (colorbufferFormat != GL_ALPHA8_EXT &&
                    colorbufferFormat != GL_RGBA4 &&
                    colorbufferFormat != GL_RGB5_A1 &&
+                    colorbufferFormat != GL_BGRA8_EXT &&
                    colorbufferFormat != GL_RGBA8_OES)
                {
                    return gl::error(GL_INVALID_OPERATION);
@@ -1342,6 +1343,7 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
                    colorbufferFormat != GL_RGB8_OES &&
                    colorbufferFormat != GL_RGBA4 &&
                    colorbufferFormat != GL_RGB5_A1 &&
+                    colorbufferFormat != GL_BGRA8_EXT &&
                    colorbufferFormat != GL_RGBA8_OES)
                {
                    return gl::error(GL_INVALID_OPERATION);
@@ -1351,6 +1353,7 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
              case GL_RGBA:
                if (colorbufferFormat != GL_RGBA4 &&
                    colorbufferFormat != GL_RGB5_A1 &&
+                    colorbufferFormat != GL_BGRA8_EXT &&
                    colorbufferFormat != GL_RGBA8_OES)
                 {
                     return gl::error(GL_INVALID_OPERATION);

--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2648,6 +2648,7 @@ bool Renderer11::copyTexture(ID3D11ShaderResourceView *source, const gl::Rectang
    }

    mDeviceContext->PSSetShader(ps, NULL, 0);
+    mDeviceContext->GSSetShader(NULL, NULL, 0);

    // Unset the currently bound shader resource to avoid conflicts
    static ID3D11ShaderResourceView *const nullSRV = NULL;