diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-30 17:07:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 17:07:14 -0700 |
| commit | 0fc2131aa2a164288adcc6f3ec9e0fe88494fd93 (patch) | |
| tree | 61394d5c9f6f769965c150d19390b786aa885f10 /opengl | |
| parent | 8e4bdf6d3aa5007fbaf9d7b715aec0877af083e6 (diff) | |
| parent | 77bd91f8af44867935ea2df22f69fb244b009b94 (diff) | |
| download | frameworks_base-0fc2131aa2a164288adcc6f3ec9e0fe88494fd93.zip frameworks_base-0fc2131aa2a164288adcc6f3ec9e0fe88494fd93.tar.gz frameworks_base-0fc2131aa2a164288adcc6f3ec9e0fe88494fd93.tar.bz2 | |
am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-plus-aosp
* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
Diffstat (limited to 'opengl')
| -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 }, |