diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-30 18:41:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 18:41:00 -0700 |
| commit | 78383abf76e7daf8c1968d2e9a29a1ba354edb2e (patch) | |
| tree | 02868c0ff1e5e811f0614f35d48abbc8a230bf6c | |
| parent | 739dcc562af9bc4506d8cc6ccf837f072ed90d2d (diff) | |
| parent | cbf583d7229aaff65734b4234e81db8ead864761 (diff) | |
| download | frameworks_base-78383abf76e7daf8c1968d2e9a29a1ba354edb2e.zip frameworks_base-78383abf76e7daf8c1968d2e9a29a1ba354edb2e.tar.gz frameworks_base-78383abf76e7daf8c1968d2e9a29a1ba354edb2e.tar.bz2 | |
am cbf583d7: am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit 'cbf583d7229aaff65734b4234e81db8ead864761' into eclair-mr2-plus-aosp
* commit 'cbf583d7229aaff65734b4234e81db8ead864761':
Turns out the SGX driver is correct and the bug was in this test.
| -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 }, |