summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-10-30 16:32:52 -0700
committerMathias Agopian <mathias@google.com>2009-10-30 16:32:52 -0700
commite3e80456fb4cc768890a12bdb8ddb9fac28f3f07 (patch)
tree85a6295865c9fe8c21b652b8206e4995205fdaea
parent4d0bf1201edd3dd8da5b9f07379336390bd234fe (diff)
downloadframeworks_base-e3e80456fb4cc768890a12bdb8ddb9fac28f3f07.zip
frameworks_base-e3e80456fb4cc768890a12bdb8ddb9fac28f3f07.tar.gz
frameworks_base-e3e80456fb4cc768890a12bdb8ddb9fac28f3f07.tar.bz2
Turns out the SGX driver is correct and the bug was in this test.
make sure the 565 1-texel wide texture is specified with an alignment of 4 which is the OpenGL ES default.
-rw-r--r--opengl/tests/linetex/linetex.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/opengl/tests/linetex/linetex.cpp b/opengl/tests/linetex/linetex.cpp
index 992a10c..6842940 100644
--- a/opengl/tests/linetex/linetex.cpp
+++ b/opengl/tests/linetex/linetex.cpp
@@ -68,7 +68,7 @@ int main(int argc, char** argv)
glBindTexture(GL_TEXTURE_2D, 0);
glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
@@ -77,7 +77,9 @@ int main(int argc, char** argv)
glEnable(GL_TEXTURE_2D);
glColor4f(1,1,1,1);
- const uint16_t t16[64] = { 0xFFFF, 0xF800, 0x07E0, 0x001F };
+
+ // default pack-alignment is 4
+ const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 };
const GLfloat vertices[4][2] = {
{ w/2, 0 },