diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-30 17:07:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 17:07:49 -0700 |
| commit | 39e0df03554810e28a537e93760dc2521ce3e763 (patch) | |
| tree | 0886c701b066e3953e075f0b427119e2b66e9232 /opengl/tests | |
| parent | 53c0d4aa2eb37c25c9148b2c2a15fd9113967e65 (diff) | |
| parent | 964d94306b72d9f3f52bdad6fc8d65a191c82ee7 (diff) | |
| download | frameworks_native-39e0df03554810e28a537e93760dc2521ce3e763.zip frameworks_native-39e0df03554810e28a537e93760dc2521ce3e763.tar.gz frameworks_native-39e0df03554810e28a537e93760dc2521ce3e763.tar.bz2 | |
am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2
* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/linetex/linetex.cpp | 6 |
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 }, |