summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-10-29 15:47:12 -0700
committerMathias Agopian <mathias@google.com>2009-10-29 15:47:12 -0700
commit4e036287fd64d936478f7168454ed5b8816e157f (patch)
tree92fb55d7cbab1794dc534950854604fe5ba0b08a
parentec1f1e3df1ca5e73e262df479bf91a92f3ccafde (diff)
downloadframeworks_base-4e036287fd64d936478f7168454ed5b8816e157f.zip
frameworks_base-4e036287fd64d936478f7168454ed5b8816e157f.tar.gz
frameworks_base-4e036287fd64d936478f7168454ed5b8816e157f.tar.bz2
update line test to expose some bug on SGX530 ed4
-rw-r--r--opengl/tests/linetex/linetex.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/opengl/tests/linetex/linetex.cpp b/opengl/tests/linetex/linetex.cpp
index e62fe03..992a10c 100644
--- a/opengl/tests/linetex/linetex.cpp
+++ b/opengl/tests/linetex/linetex.cpp
@@ -68,31 +68,28 @@ 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_NEAREST);
- glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ 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);
glDisable(GL_DITHER);
glDisable(GL_BLEND);
glEnable(GL_TEXTURE_2D);
glColor4f(1,1,1,1);
- const uint32_t t32[] = {
- 0xFFFFFFFF, 0xFF0000FF, 0xFF00FF00, 0xFFFF0000,
- 0xFFFFFF00, 0xFFFF00FF, 0xFF00FFFF, 0xFF000000
- };
+ const uint16_t t16[64] = { 0xFFFF, 0xF800, 0x07E0, 0x001F };
const GLfloat vertices[4][2] = {
- { 0, 0 },
- { w, h }
+ { w/2, 0 },
+ { w/2, h }
};
const GLfloat texCoords[4][2] = {
{ 0, 0 },
- { 1, 0 }
+ { 1, 1 }
};
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 8, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, t32);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1, 4, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, t16);
glViewport(0, 0, w, h);
glMatrixMode(GL_PROJECTION);