Convert webgl2 tests to C. NFC

Author: sbc100

test/browser/webgl2.cpp renamed to test/browser/webgl2.c

@@ -10,17 +10,15 @@
 #include <emscripten/html5.h>
 #include <GLES2/gl2.h>
 
-GLuint CompileShader(GLenum type, const char *src)
-{
+GLuint CompileShader(GLenum type, const char *src) {
   GLuint shader = glCreateShader(type);
   glShaderSource(shader, 1, &src, NULL);
   glCompileShader(shader);
   assert(glGetError() == GL_NO_ERROR && "Shader compilation failed!");
   return shader;
 }
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   emscripten_set_canvas_element_size("#canvas", 256, 256);
   EmscriptenWebGLContextAttributes attr;
   emscripten_webgl_init_context_attributes(&attr);

test/browser/webgl2_backwards_compatibility_emulation.cpp renamed to test/browser/webgl2_backwards_compatibility_emulation.c

@@ -5,8 +5,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-int main()
-{
+int main() {
   EmscriptenWebGLContextAttributes attr;
   emscripten_webgl_init_context_attributes(&attr);
   attr.majorVersion = 2;

test/browser/webgl2_garbage_free_entrypoints.cpp renamed to test/browser/webgl2_garbage_free_entrypoints.c

@@ -15,8 +15,7 @@
 // WebGL 2 core does not support GL_UNSIGNED_SHORT_5_6_5_REV extension.
 #define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
 
-int main()
-{
+int main() {
   EmscriptenWebGLContextAttributes attrs;
   emscripten_webgl_init_context_attributes(&attrs);
   attrs.majorVersion = 2;
@@ -30,7 +29,7 @@ int main()
   GLuint tex;
   glGenTextures(1, &tex);
   glBindTexture(GL_TEXTURE_2D, tex);
-  void* data = new char[512];
+  char data[512];
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV, data);
   assert(glGetError() != 0); // We should be getting an error
   return 0;

test/browser/webgl2_get_buffer_sub_data.cpp renamed to test/browser/webgl2_get_buffer_sub_data.c

@@ -16,16 +16,15 @@
     { \
         x; \
         GLenum error = glGetError(); \
-        if( error != GL_NO_ERROR ) { \
-            printf( "GL ERROR: %d,  %s\n", (int)error, #x ); \
+        if (error != GL_NO_ERROR) { \
+            printf("GL ERROR: %d,  %s\n", (int)error, #x); \
             assert(false); \
         } \
     } \
 
 
-int main()
-{
-  emscripten_set_canvas_element_size( "#canvas", 100, 100 );
+int main() {
+  emscripten_set_canvas_element_size("#canvas", 100, 100);
 
   EmscriptenWebGLContextAttributes attrs;
   emscripten_webgl_init_context_attributes(&attrs);
@@ -34,9 +33,8 @@ int main()
   attrs.majorVersion = 2;
   attrs.minorVersion = 0;
 
-  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context( "#canvas", &attrs );
-  if (!context)
-  {
+  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context("#canvas", &attrs);
+  if (!context) {
     printf("Skipped: WebGL 2 is not supported.\n");
     return 0;
   }
@@ -45,27 +43,27 @@ int main()
   // Anisotropy
   //
   GLfloat maxAnisotropy;
-  GL_CALL( glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy) );
+  GL_CALL(glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy));
   printf("max anisotropy: %f\n", maxAnisotropy);
   assert(maxAnisotropy > 1.f);
 
   // Vertex Arrays
   //
   GLuint vao1;
-  GL_CALL( glGenVertexArrays( 1, &vao1 ) );
-  GL_CALL( glBindVertexArray( vao1 ) );
-  printf( "vao1: %d\n", vao1 );
+  GL_CALL(glGenVertexArrays(1, &vao1));
+  GL_CALL(glBindVertexArray(vao1));
+  printf("vao1: %d\n", vao1);
   assert(vao1 > 0);
 
   GLint vao2;
-  GL_CALL( glGetIntegerv( GL_VERTEX_ARRAY_BINDING, &vao2 ) );
-  printf( "vao2: %d\n", vao2 );
+  GL_CALL(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &vao2));
+  printf("vao2: %d\n", vao2);
   assert(vao2 == vao1);
 
   // Sampler Objects
   //
   GLuint sampler;
-  GL_CALL( glGenSamplers( 1, &sampler ) );
+  GL_CALL(glGenSamplers(1, &sampler));
   assert(sampler > 0);
 
 #if 0 // TODO: Disabled due to https://github.com/KhronosGroup/WebGL/issues/2006
@@ -77,11 +75,11 @@ int main()
   assert(maxAnisotropy2 == maxAnisotropy);
 #endif
 
-  GL_CALL( glBindSampler( 0, sampler ) );
+  GL_CALL(glBindSampler(0, sampler));
 
   GLint sampler2;
-  GL_CALL( glGetIntegerv( GL_SAMPLER_BINDING, &sampler2 ) );
-  printf( "sampler2: %d\n", sampler2 );
+  GL_CALL(glGetIntegerv(GL_SAMPLER_BINDING, &sampler2));
+  printf("sampler2: %d\n", sampler2);
   assert(sampler2 == sampler);
 
   return 0;

test/browser/webgl2_invalid_teximage2d_type.cpp renamed to test/browser/webgl2_invalid_teximage2d_type.c

@@ -9,12 +9,11 @@
 #include <GLES3/gl3.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <emscripten.h>
 #include <emscripten/html5.h>
 #include <assert.h>
 
-#include <string>
-
 #define GL_CALL( x ) \
     { \
         x; \
@@ -58,7 +57,7 @@ int main()
     glBufferData(GL_PIXEL_UNPACK_BUFFER, 4*4, pixels, GL_STATIC_DRAW);
 
     /* This should use the unpack buffer */
-    GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr));
+    GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL));
 
     glDeleteBuffers(1, &buffer);
 
@@ -67,9 +66,8 @@ int main()
   }
 
   /* Verify that unpack buffer is used for compressed image upload as well */
-  const std::string exts = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
-  if(exts.find("WEBGL_compressed_texture_s3tc") != std::string::npos)
-  {
+  const char* exts = (const char*)glGetString(GL_EXTENSIONS);
+  if (strstr(exts, "WEBGL_compressed_texture_s3tc") != NULL) {
     printf("WEBGL_compressed_texture_s3tc is supported, testing ...\n");
 
     glBindTexture(GL_TEXTURE_2D, tex[1]);
@@ -81,17 +79,18 @@ int main()
     glBufferData(GL_PIXEL_UNPACK_BUFFER, 8, pixels, GL_STATIC_DRAW);
 
     /* This should all use the unpack buffer */
-    GL_CALL(glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 4, 4, 0, 8, nullptr));
-    GL_CALL(glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 8, nullptr));
+    GL_CALL(glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 4, 4, 0, 8, NULL));
+    GL_CALL(glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 8, NULL));
 
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 
     /* This not anymore */
     GL_CALL(glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 8, pixels));
 
     glDeleteBuffers(1, &buffer);
+  } else {
+    printf("WEBGL_compressed_texture_s3tc is NOT supported\n");
   }
-  else printf("WEBGL_compressed_texture_s3tc is NOT supported\n");
 
   glDeleteTextures(2, tex);