summaryrefslogtreecommitdiff
path: root/libs/hwui/Texture.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2016-01-20 11:09:53 -0800
committer John Reck <jreck@google.com> 2016-01-20 13:16:24 -0800
commit2de7771740ee08fcaff638ec6b2e460bb72fff04 (patch)
treef175efd66cc7f81481bb61f398c3ef2041f72919 /libs/hwui/Texture.cpp
parent8020313d05f22dc1f8a7a182e6da134db17761ec (diff)
Normalize GL_UNPACK_ALIGNMENT
Several places were setting GL_UNPACK_ALIGNMENT unneccessarily, whereas other places were assuming an unpack alignment of 1. Since we never actually do explicit row-alignment, set GL_UNPACK_ALIGNMENT to 1 at context creation time and never change it Bug: 26584230 Also turns on aggressive glGetError checking to better catch potential problem zones Change-Id: I190c8f0f0494a7f046d5ed769405c75d363be59a
Diffstat (limited to 'libs/hwui/Texture.cpp')
-rw-r--r--libs/hwui/Texture.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp
index 771d004cb91d..9fc0c199815d 100644
--- a/libs/hwui/Texture.cpp
+++ b/libs/hwui/Texture.cpp
@@ -122,7 +122,6 @@ void Texture::upload(GLint internalformat, uint32_t width, uint32_t height,
static void uploadToTexture(bool resize, GLenum format, GLenum type, GLsizei stride, GLsizei bpp,
GLsizei width, GLsizei height, const GLvoid * data) {
- glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
const bool useStride = stride != width
&& Caches::getInstance().extensions().hasUnpackRowLength();
if ((stride == width) || useStride) {