commit 88f18f458dec5c2aff302db93c57e51d89fbffa2
author Jamie Madill <jmadill@chromium.org> Wed Sep 18 14:36:19 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Sep 20 14:52:33 2013 -0400
tree 85d98b743547d8e0d50f7af86be95d1fd1a01ce3
parent 950a775ecc8d7352a5d2f76b719416acdc4706a0

Use the context's PixelUnpackState as an argument to Texture's implementation of setImage and subImage.

We need to access the current unpack buffer for our implementation of PBOs.

TRAC #23840

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 34dc3a1..cce6c36 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -5152,43 +5152,43 @@
               case GL_TEXTURE_2D:
                 {
                     gl::Texture2D *texture = context->getTexture2D();
-                    texture->setImage(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImage(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImagePosX(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImagePosX(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImageNegX(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImageNegX(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImagePosY(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImagePosY(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImageNegY(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImageNegY(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImagePosZ(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImagePosZ(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->setImageNegZ(level, width, height, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImageNegZ(level, width, height, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
               default: UNREACHABLE();
@@ -5409,7 +5409,7 @@
               case GL_TEXTURE_2D:
                 {
                     gl::Texture2D *texture = context->getTexture2D();
-                    texture->subImage(level, xoffset, yoffset, width, height, format, type, context->getUnpackAlignment(), pixels);
+                    texture->subImage(level, xoffset, yoffset, width, height, format, type, context->getUnpackState(), pixels);
                 }
                 break;
 
@@ -5421,7 +5421,7 @@
               case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
                 {
                     gl::TextureCubeMap *texture = context->getTextureCubeMap();
-                    texture->subImage(target, level, xoffset, yoffset, width, height, format, type, context->getUnpackAlignment(), pixels);
+                    texture->subImage(target, level, xoffset, yoffset, width, height, format, type, context->getUnpackState(), pixels);
                 }
                 break;
 
@@ -6402,14 +6402,14 @@
               case GL_TEXTURE_3D:
                 {
                     gl::Texture3D *texture = context->getTexture3D();
-                    texture->setImage(level, width, height, depth, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImage(level, width, height, depth, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
 
               case GL_TEXTURE_2D_ARRAY:
                 {
                     gl::Texture2DArray *texture = context->getTexture2DArray();
-                    texture->setImage(level, width, height, depth, internalformat, format, type, context->getUnpackAlignment(), pixels);
+                    texture->setImage(level, width, height, depth, internalformat, format, type, context->getUnpackState(), pixels);
                 }
                 break;
 
@@ -6460,14 +6460,14 @@
               case GL_TEXTURE_3D:
                 {
                     gl::Texture3D *texture = context->getTexture3D();
-                    texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackAlignment(), pixels);
+                    texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackState(), pixels);
                 }
                 break;
 
               case GL_TEXTURE_2D_ARRAY:
                 {
                     gl::Texture2DArray *texture = context->getTexture2DArray();
-                    texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackAlignment(), pixels);
+                    texture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, context->getUnpackState(), pixels);
                 }
                 break;