aboutsummaryrefslogtreecommitdiff
path: root/tests/s3tc.c
diff options
context:
space:
mode:
authorJeff Gilbert <jgilbert@mozilla.com>2013-04-25 17:42:53 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-05-20 10:48:40 -0700
commit6210052164cc0f255b45050e08df56e57819a093 (patch)
tree3c314dbb9e9949cb595e8bd3df180c75b1ba2b6c /tests/s3tc.c
parent6346adec3b5f59415d9eb9650eeefd4120f32763 (diff)
Adding texEnv emulation to Immediate mode.
Diffstat (limited to 'tests/s3tc.c')
-rw-r--r--tests/s3tc.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/s3tc.c b/tests/s3tc.c
index c2736feb..16ee783f 100644
--- a/tests/s3tc.c
+++ b/tests/s3tc.c
@@ -63,14 +63,12 @@ int main(int argc, char *argv[])
const char *exts = (const char *)glGetString(GL_EXTENSIONS);
assert(hasext(exts, "GL_ARB_texture_compression"));
assert(hasext(exts, "GL_EXT_texture_compression_s3tc"));
-
+
// Set the OpenGL state after creating the context with SDL_SetVideoMode
glClearColor( 0, 0, 0, 0 );
-
-#if !EMSCRIPTEN
- glEnable( GL_TEXTURE_2D ); // Need this to display a texture XXX unnecessary in OpenGL ES 2.0/WebGL
-#endif
+
+ glEnable( GL_TEXTURE_2D ); // Needed when we're using the fixed-function pipeline.
glViewport( 0, 0, 640, 480 );
@@ -110,7 +108,7 @@ int main(int argc, char *argv[])
// Clear the screen before drawing
glClear( GL_COLOR_BUFFER_BIT );
-
+
// Bind the texture to which subsequent calls refer to
glBindTexture( GL_TEXTURE_2D, texture );
@@ -143,7 +141,7 @@ int main(int argc, char *argv[])
glEnd();
SDL_GL_SwapBuffers();
-
+
#if !EMSCRIPTEN
// Wait for 3 seconds to give us a chance to see the image
SDL_Delay(1500);
@@ -151,8 +149,8 @@ int main(int argc, char *argv[])
// Now we can delete the OpenGL texture and close down SDL
glDeleteTextures( 1, &texture );
-
+
SDL_Quit();
-
+
return 0;
}