summaryrefslogtreecommitdiff
path: root/libs/hwui/Dither.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/Dither.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/Dither.cpp')
-rw-r--r--libs/hwui/Dither.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/hwui/Dither.cpp b/libs/hwui/Dither.cpp
index 1ba651174c8a..ec2013e27401 100644
--- a/libs/hwui/Dither.cpp
+++ b/libs/hwui/Dither.cpp
@@ -54,7 +54,6 @@ void Dither::bindDitherTexture() {
15 * dither, 7 * dither, 13 * dither, 5 * dither
};
- glPixelStorei(GL_UNPACK_ALIGNMENT, sizeof(GLfloat));
glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, DITHER_KERNEL_SIZE, DITHER_KERNEL_SIZE, 0,
GL_RED, GL_FLOAT, &pattern);
} else {
@@ -65,7 +64,6 @@ void Dither::bindDitherTexture() {
15, 7, 13, 5
};
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, DITHER_KERNEL_SIZE, DITHER_KERNEL_SIZE, 0,
GL_ALPHA, GL_UNSIGNED_BYTE, &pattern);
}