diff options
author | Mathias Agopian <mathias@google.com> | 2009-10-29 15:54:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 15:54:42 -0700 |
commit | 6f0ebae907f1c8935c04e3d422507dbe6d10eee9 (patch) | |
tree | 5d5fd7c46dec0d0e760bc8c7437e0d064b04c561 /opengl | |
parent | e2c25a2307b80f7e7dc71b350ed25fc668fd6b09 (diff) | |
parent | 5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a (diff) | |
download | frameworks_base-6f0ebae907f1c8935c04e3d422507dbe6d10eee9.zip frameworks_base-6f0ebae907f1c8935c04e3d422507dbe6d10eee9.tar.gz frameworks_base-6f0ebae907f1c8935c04e3d422507dbe6d10eee9.tar.bz2 |
am 5dc7a21c: Merge change I4e036287 into eclair
Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-plus-aosp
* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
update line test to expose some bug on SGX530 ed4
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/tests/linetex/linetex.cpp | 19 |
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); |