webgl: some fixes for WebGL 2 and current emscripten

panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -699,7 +699,10 @@ reset() {
 
 #elif defined(OPENGLES)
   if (gl_support_primitive_restart_index && is_at_least_gles_version(3, 0)) {
+    // In WebGL 2, primitive restart is always enabled.
+#ifndef __EMSCRIPTEN__
     glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
+#endif
     _supported_geom_rendering |= Geom::GR_strip_cut_index;
   }
 
@@ -744,6 +747,8 @@ reset() {
 #ifndef OPENGLES_1
   _glDrawRangeElements = null_glDrawRangeElements;
 
+  // Temporarily disabled in WebGL due to Firefox bug
+#ifndef __EMSCRIPTEN__
 #ifdef OPENGLES
   if (is_at_least_gles_version(3, 0)) {
     _glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)
@@ -764,6 +769,7 @@ reset() {
       << "glDrawRangeElements advertised as supported by OpenGL runtime, but could not get pointers to extension functions.\n";
     _glDrawRangeElements = null_glDrawRangeElements;
   }
+#endif  // !__EMSCRIPTEN__
 #endif  // !OPENGLES_1
 
   _supports_3d_texture = false;
@@ -2887,7 +2893,7 @@ reset() {
   }
 #endif  // !OPENGLES
 
-#ifndef OPENGLES_1
+#if !defined(OPENGLES_1) && !defined(__EMSCRIPTEN__)
   _supports_get_program_binary = false;
   _program_binary_formats.clear();
 
@@ -3113,7 +3119,7 @@ reset() {
 
   report_my_gl_errors();
 
-#ifndef OPENGLES_1
+#if !defined(OPENGLES_1) && !defined(__EMSCRIPTEN__)
   if (GLCAT.is_debug()) {
     if (_supports_get_program_binary) {
       GLCAT.debug()

panda/src/glstuff/glGraphicsStateGuardian_src.h

@@ -703,8 +703,11 @@ protected:
   bool _supports_anisotropy;
   GLint _max_image_units;
   bool _supports_multi_bind;
+
+#if !defined(OPENGLES_1) && !defined(__EMSCRIPTEN__)
   bool _supports_get_program_binary;
   pset<GLenum> _program_binary_formats;
+#endif
 
 #ifdef OPENGLES
   bool _supports_depth24;

panda/src/glstuff/glShaderContext_src.cxx

@@ -3048,6 +3048,7 @@ glsl_compile_and_link() {
 
   // If we requested to retrieve the shader, we should indicate that before
   // linking.
+#ifndef __EMSCRIPTEN__
   bool retrieve_binary = false;
   if (_glgsg->_supports_get_program_binary) {
     retrieve_binary = _shader->get_cache_compiled_shader();
@@ -3060,6 +3061,7 @@ glsl_compile_and_link() {
 
     _glgsg->_glProgramParameteri(_glsl_program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
   }
+#endif  // !__EMSCRIPTEN__
 
   if (GLCAT.is_debug()) {
     GLCAT.debug()
@@ -3080,6 +3082,7 @@ glsl_compile_and_link() {
   // Report any warnings.
   glsl_report_program_errors(_glsl_program, false);
 
+#ifndef __EMSCRIPTEN__
   if (retrieve_binary) {
     GLint length = 0;
     _glgsg->_glGetProgramiv(_glsl_program, GL_PROGRAM_BINARY_LENGTH, &length);
@@ -3110,6 +3113,7 @@ glsl_compile_and_link() {
     }
 #endif  // NDEBUG
   }
+#endif  // !__EMSCRIPTEN__
 
   _glgsg->report_my_gl_errors();
   return true;

panda/src/webgldisplay/webGLGraphicsStateGuardian.h

@@ -18,7 +18,7 @@
 #include "webGLGraphicsPipe.h"
 #include "gles2gsg.h"
 
-#include <html5.h>
+#include <emscripten/html5.h>
 
 /**
  * A specialization on GLES2GraphicsStateGuardian to add emscripten-specific

panda/src/webgldisplay/webGLGraphicsWindow.h

@@ -19,7 +19,7 @@
 #include "webGLGraphicsPipe.h"
 #include "graphicsWindow.h"
 
-#include <html5.h>
+#include <emscripten/html5.h>
 
 /**
  * An interface to Emscripten's WebGL interface that represents an HTML5