commit ec6de4ec53fbdc7e993870385d398b2f1efac1b8
author Jamie Madill <jmadill@chromium.org> Mon Oct 20 10:59:56 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Oct 20 15:39:55 2014 +0000
tree bebbe275a12d2901a7325b08ae6cad900b72d568
parent 24e831926313725f5487ed09e8e1027af463f858

Fix TextureD3D::setData for depth-stencil textures.

D3D11 requires us to NULL the update region parameter when updating
depth stencil textures. For these textures, we can't always use the
subdata workaround, so disable it entirely for these textures.

BUG=angle:729
BUG=365078

Change-Id: I44258dd1b8937b1aebcb3a73de835698805537e0
Reviewed-on: https://chromium-review.googlesource.com/222911
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/renderer/d3d/TextureD3D.cpp

diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
index 0299920..f03cbc6 100644
--- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp
+++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp
@@ -90,9 +90,30 @@
     return (baseImage ? baseImage->getInternalFormat() : GL_NONE);
 }
 
+bool TextureD3D::shouldUseSetData(const Image *image) const
+{
+    if (!mRenderer->getWorkarounds().setDataFasterThanImageUpload)
+    {
+        return false;
+    }
+
+    gl::InternalFormat internalFormat = gl::GetInternalFormatInfo(image->getInternalFormat());
+
+    // We can only handle full updates for depth-stencil textures, so to avoid complications
+    // disable them entirely.
+    if (internalFormat.depthBits > 0 || internalFormat.stencilBits > 0)
+    {
+        return false;
+    }
+
+    // TODO(jmadill): Handle compressed internal formats
+    return (mTexStorage && !internalFormat.compressed);
+}
+
 gl::Error TextureD3D::setImage(const gl::PixelUnpackState &unpack, GLenum type, const void *pixels, const gl::ImageIndex &index)
 {
     Image *image = getImage(index);
+    ASSERT(image);
 
     // No-op
     if (image->getWidth() == 0 || image->getHeight() == 0 || image->getDepth() == 0)
@@ -123,13 +144,9 @@
     {
         gl::Error error(GL_NO_ERROR);
 
-        gl::InternalFormat internalFormat = gl::GetInternalFormatInfo(image->getInternalFormat());
-
-        // TODO(jmadill): Handle compressed internal formats
-        if (mTexStorage && mRenderer->getWorkarounds().setDataFasterThanImageUpload && !internalFormat.compressed)
+        if (shouldUseSetData(image))
         {
-            gl::Box sourceBox(0, 0, 0, image->getWidth(), image->getHeight(), image->getDepth());
-            error = mTexStorage->setData(index, sourceBox, image->getInternalFormat(), type, unpack, pixelData);
+            error = mTexStorage->setData(index, image, NULL, type, unpack, pixelData);
         }
         else
         {
@@ -168,14 +185,10 @@
         Image *image = getImage(index);
         ASSERT(image);
 
-        gl::InternalFormat internalFormat = gl::GetInternalFormatInfo(image->getInternalFormat());
         gl::Box region(xoffset, yoffset, zoffset, width, height, depth);
-
-        // TODO(jmadill): Handle compressed internal formats
-        if (mTexStorage && mRenderer->getWorkarounds().setDataFasterThanImageUpload && !internalFormat.compressed)
+        if (shouldUseSetData(image))
         {
-            return mTexStorage->setData(index, region, image->getInternalFormat(),
-                                        type, unpack, pixelData);
+            return mTexStorage->setData(index, image, &region, type, unpack, pixelData);
         }
 
         gl::Error error = image->loadData(xoffset, yoffset, zoffset, width, height, depth, unpack.alignment,