Make FULL_ES3 turn on FULL_ES2 automatically (emscripten-core#9856)

Which has been a point of confusion otherwise.

Fixes emscripten-core#9650

Author: kripken

emcc.py

@@ -1288,6 +1288,9 @@ def is_supported_link_flag(f):
       shared.Settings.EXPORTED_FUNCTIONS += ['___cxa_demangle']
       forced_stdlibs.append('libc++abi')
 
+    if shared.Settings.FULL_ES3:
+      shared.Settings.FULL_ES2 = 1
+
     if shared.Settings.EMBIND:
       forced_stdlibs.append('libembind')
 

src/settings.js

@@ -441,6 +441,7 @@ var USE_WEBGL2 = 0;
 var WEBGL2_BACKWARDS_COMPATIBILITY_EMULATION = 0;
 
 // Forces support for all GLES3 features, not just the WebGL2-friendly subset.
+// This automatically turns out FULL_ES2.
 var FULL_ES3 = 0;
 
 // Includes code to emulate various desktop GL features. Incomplete but useful

tests/test_browser.py

@@ -1795,7 +1795,13 @@ def book_path(*pathelems):
                  args=args)
 
   @requires_graphics_hardware
-  def test_gles2_emulation(self):
+  @parameterized({
+    'normal': (['-s', 'FULL_ES2=1'],),
+    # Enabling FULL_ES3 also enables ES2 automatically
+    'full_es3': (['-s', 'FULL_ES3=1'],)
+  })
+  def test_gles2_emulation(self, args):
+    print(args)
     shutil.copyfile(path_from_root('tests', 'glbook', 'Chapter_10', 'MultiTexture', 'basemap.tga'), 'basemap.tga')
     shutil.copyfile(path_from_root('tests', 'glbook', 'Chapter_10', 'MultiTexture', 'lightmap.tga'), 'lightmap.tga')
     shutil.copyfile(path_from_root('tests', 'glbook', 'Chapter_13', 'ParticleSystem', 'smoke.tga'), 'smoke.tga')
@@ -1817,13 +1823,12 @@ def test_gles2_emulation(self):
                        path_from_root('tests', 'glbook', 'Common', 'esShader.c'),
                        path_from_root('tests', 'glbook', 'Common', 'esShapes.c'),
                        path_from_root('tests', 'glbook', 'Common', 'esTransform.c'),
-                       '-s', 'FULL_ES2=1', '-lGL', '-lEGL', '-lX11',
-                       '--preload-file', 'basemap.tga', '--preload-file', 'lightmap.tga', '--preload-file', 'smoke.tga'])
+                       '-lGL', '-lEGL', '-lX11',
+                       '--preload-file', 'basemap.tga', '--preload-file', 'lightmap.tga', '--preload-file', 'smoke.tga'] + args)
 
   @requires_graphics_hardware
   def test_clientside_vertex_arrays_es3(self):
-    # NOTE: Should FULL_ES3=1 imply client-side vertex arrays? The emulation needs FULL_ES2=1 for now.
-    self.btest('clientside_vertex_arrays_es3.c', reference='gl_triangle.png', args=['-s', 'USE_WEBGL2=1', '-s', 'FULL_ES2=1', '-s', 'FULL_ES3=1', '-s', 'USE_GLFW=3', '-lglfw', '-lGLESv2'])
+    self.btest('clientside_vertex_arrays_es3.c', reference='gl_triangle.png', args=['-s', 'USE_WEBGL2=1', '-s', 'FULL_ES3=1', '-s', 'USE_GLFW=3', '-lglfw', '-lGLESv2'])
 
   def test_emscripten_api(self):
     self.btest('emscripten_api_browser.cpp', '1', args=['-s', '''EXPORTED_FUNCTIONS=['_main', '_third']''', '-lSDL'])