Fix zero-size textures and unpack buffers.

We would sometimes attempt to use a NULL staging texture when initializing a zero size texture when using unpack buffers. Change-Id: I2e03141c19d9c47eeffb0d56c03bcfe476a9e48d Reviewed-on: https://chromium-review.googlesource.com/181781Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Nicolas Capens <nicolascapens@chromium.org> Commit-Queue: Nicolas Capens <nicolascapens@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix zero-size textures and unpack buffers.
c30003d6 · Jamie Madill · 4b8c3eba · c30003d6
Commit c30003d6 authored Jan 10, 2014 by Jamie Madill
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Texture.cpp src/libGLESv2/Texture.cpp +6 -0

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -263,6 +263,12 @@ GLenum Texture::getBaseLevelInternalFormat() const
 void Texture::setImage(const PixelUnpackState &unpack, GLenum type, const void *pixels, rx::Image *image)
 {
+    // No-op
+    if (image->getWidth() == 0 || image->getHeight() == 0 || image->getDepth() == 0)
+    {
+        return;
+    }
    // We no longer need the "GLenum format" parameter to TexImage to determine what data format "pixels" contains.
    // From our image internal format we know how many channels to expect, and "type" gives the format of pixel's components.
    const void *pixelData = pixels;