Merge pull request #3725 from juj/glgetstringi

glGetStringi

src/library_gl.js

@@ -56,6 +56,9 @@ var LibraryGL = {
        } */
 
     stringCache: {},
+#if USE_WEBGL2
+    stringiCache: {},
+#endif
 
     packAlignment: 4,   // default alignment is 4 bytes
     unpackAlignment: 4, // default alignment is 4 bytes
@@ -343,6 +346,16 @@ var LibraryGL = {
         case 0x8B9B: // GL_IMPLEMENTATION_COLOR_READ_FORMAT
           ret = 0x1908; // GL_RGBA
           break;
+#if USE_WEBGL2
+        case 0x821D: // GL_NUM_EXTENSIONS
+          if (GLctx.canvas.GLctxObject.version < 2) {
+            GL.recordError(0x0502 /* GL_INVALID_OPERATION */); // Calling GLES3/WebGL2 function with a GLES2/WebGL1 context
+            return;
+          }
+          var exts = GLctx.getSupportedExtensions();
+          ret = 2*exts.length; // each extension is duplicated, first in unprefixed WebGL form, and then a second time with "GL_" prefix.
+          break;
+#endif
       }
 
       if (ret === undefined) {
@@ -963,6 +976,51 @@ var LibraryGL = {
     return ret;
   },
 
+#if USE_WEBGL2
+  glGetStringi: function(name, index) {
+    if (GLctx.canvas.GLctxObject.version < 2) {
+      GL.recordError(0x0502 /* GL_INVALID_OPERATION */); // Calling GLES3/WebGL2 function with a GLES2/WebGL1 context
+      return 0;
+    }
+    var stringiCache = GL.stringiCache[name];
+    if (stringiCache) {
+      if (index < 0 || index >= stringiCache.length) {
+        GL.recordError(0x0501/*GL_INVALID_VALUE*/);
+#if GL_ASSERTIONS
+        Module.printErr('GL_INVALID_VALUE in glGetStringi: index out of range (' + index + ')!');
+#endif
+        return 0;
+      }
+      return stringiCache[index];
+    }
+    switch(name) {
+      case 0x1F03 /* GL_EXTENSIONS */:
+        var exts = GLctx.getSupportedExtensions();
+        var gl_exts = [];
+        // each extension is duplicated, first in unprefixed WebGL form, and then a second time with "GL_" prefix.
+        for (var i in exts) {
+          gl_exts.push(allocate(intArrayFromString(exts[i]), 'i8', ALLOC_NORMAL));
+          gl_exts.push(allocate(intArrayFromString("GL_" + exts[i]), 'i8', ALLOC_NORMAL));
+        }
+        stringiCache = GL.stringiCache[name] = gl_exts;
+        if (index < 0 || index >= stringiCache.length) {
+          GL.recordError(0x0501/*GL_INVALID_VALUE*/);
+#if GL_ASSERTIONS
+          Module.printErr('GL_INVALID_VALUE in glGetStringi: index out of range (' + index + ') in a call to GL_EXTENSIONS!');
+#endif
+          return 0;
+        }
+        return stringiCache[index];
+      default:
+        GL.recordError(0x0500/*GL_INVALID_ENUM*/);
+#if GL_ASSERTIONS
+        Module.printErr('GL_INVALID_ENUM in glGetStringi: Unknown parameter ' + name + '!');
+#endif
+        return 0;
+    }
+  },
+#endif
+
   glGetIntegerv__sig: 'vii',
   glGetIntegerv: function(name_, p) {
     return GL.get(name_, p, 'Integer');

tests/test_browser.py

@@ -1930,6 +1930,11 @@ Module["preRun"].push(function () {
       print opts
       self.btest(path_from_root('tests', 'webgl_destroy_context.cpp'), args=opts + ['--shell-file', path_from_root('tests/webgl_destroy_context_shell.html'), '-s', 'NO_EXIT_RUNTIME=1'], expected='0')
 
+  def test_webgl2(self):
+    for opts in [[], ['-O2', '-g1', '--closure', '1'], ['-s', 'FULL_ES2=1']]:
+      print opts
+      self.btest(path_from_root('tests', 'webgl2.cpp'), args=['-s', 'USE_WEBGL2=1'] + opts, expected='0')
+
   def test_sdl_touch(self):
     for opts in [[], ['-O2', '-g1', '--closure', '1']]:
       print opts

tests/webgl2.cpp

@@ -0,0 +1,45 @@
+#include <GLES3/gl3.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <emscripten.h>
+#include <html5.h>
+
+EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context;
+
+int main()
+{
+  EmscriptenWebGLContextAttributes attrs;
+  emscripten_webgl_init_context_attributes(&attrs);
+  attrs.majorVersion = 2;
+  attrs.minorVersion = 0;
+
+  int result = 0;
+
+  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context(0, &attrs);
+  if (context)
+  {
+    EMSCRIPTEN_RESULT res = emscripten_webgl_make_context_current(context);
+    assert(res == EMSCRIPTEN_RESULT_SUCCESS);
+    assert(emscripten_webgl_get_current_context() == context);
+
+    int numExtensions = 0;
+    glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+    bool hasGLExtension = false;
+    for(int i = 0; i < numExtensions; ++i)
+    {
+      const char *ext = (const char *)glGetStringi(GL_EXTENSIONS, i);
+      printf("extension %d: %s\n", i, ext);
+      if (strstr(ext, "GL_") == 0)
+        hasGLExtension = true;
+    }
+    if (!hasGLExtension)
+      result = 1;
+  }
+
+#ifdef REPORT_RESULT
+  REPORT_RESULT();
+#endif
+  return 0;
+}