upgraded to latest versions

- ImGui / emscripten-glfw

Author: ypujante

CMakeLists.txt

@@ -93,8 +93,8 @@ set(PORTS_OPTIMIZATION_LEVEL "$<IF:$<CONFIG:Debug>,0,2>")
 
 #set(wgpu_shader_toy_options "--use-port=contrib.glfw3" "--use-port=${CMAKE_SOURCE_DIR}/external/emscripten-ports/imgui.py:backend=glfw:renderer=wgpu:disableDemo=$<IF:$<CONFIG:Debug>,false,true>")
 set(wgpu_shader_toy_options
-    "--use-port=${CMAKE_SOURCE_DIR}/external/emscripten-ports/emscripten-glfw3.py:optimizationLevel=${PORTS_OPTIMIZATION_LEVEL}"
-    "--use-port=${CMAKE_SOURCE_DIR}/external/emscripten-ports/imgui.py:backend=glfw:renderer=wgpu:disableDemo=${IMGUI_DISABLE_DEMO}:optimizationLevel=${PORTS_OPTIMIZATION_LEVEL}")
+    "--use-port=${CMAKE_SOURCE_DIR}/external/emscripten-ports/emscripten-glfw3.py:optimizationLevel=${PORTS_OPTIMIZATION_LEVEL}:disableWebGL2=true"
+    "--use-port=${CMAKE_SOURCE_DIR}/external/emscripten-ports/imgui.py:backend=glfw:renderer=wgpu:disableDemo=${IMGUI_DISABLE_DEMO}:optimizationLevel=${PORTS_OPTIMIZATION_LEVEL}:disableDefaultFont=true")
 
 target_compile_options(wgpu_shader_toy PUBLIC
     "${wgpu_shader_toy_options}"

external/emscripten-ports/emscripten-glfw3.py

@@ -17,8 +17,8 @@
 import os
 from typing import Union, Dict
 
-TAG = '3.4.0.20240907'
-HASH = '48aba179ef50b5efd564535cd549528d06f74d18f7028a06212fccc425b784106b0efb3aa7bf72da6fb80c32a31b410f13a87d4599417cad8dc3af15664fa1b2'
+TAG = '3.4.0.20250209'
+HASH = '4acf0fdff680952cd6d6cbf0efaaa9b6347d21049e8c119a2cbd44b2b10d36dd94d3e3b3ef2e8f5c4afe93ff23f9aad5e917d08c52df7ca12d35843a926f1f0c'
 ZIP_URL = f'https://github.com/pongasoft/emscripten-glfw/releases/download/v{TAG}/emscripten-glfw3-{TAG}.zip'
 
 # contrib port information (required)
@@ -27,75 +27,84 @@
 LICENSE = 'Apache 2.0 license'
 
 VALID_OPTION_VALUES = {
-    'disableWarning': ['true', 'false'],
-    'disableJoystick': ['true', 'false'],
-    'disableMultiWindow': ['true', 'false'],
-    'optimizationLevel': ['0', '1', '2', '3', 'g', 's', 'z']  # all -OX possibilities
+  'disableWarning': ['true', 'false'],
+  'disableJoystick': ['true', 'false'],
+  'disableMultiWindow': ['true', 'false'],
+  'disableWebGL2': ['true', 'false'],
+  'optimizationLevel': ['0', '1', '2', '3', 'g', 's', 'z']  # all -OX possibilities
 }
 
 OPTIONS = {
-    'disableWarning': 'Boolean to disable warnings emitted by the library',
-    'disableJoystick': 'Boolean to disable support for joystick entirely',
-    'disableMultiWindow': 'Boolean to disable multi window support which makes the code smaller and faster',
-    'optimizationLevel': f'Optimization level: {VALID_OPTION_VALUES["optimizationLevel"]} (default to 2)',
+  'disableWarning': 'Boolean to disable warnings emitted by the library',
+  'disableJoystick': 'Boolean to disable support for joystick entirely',
+  'disableMultiWindow': 'Boolean to disable multi window support',
+  'disableWebGL2': 'Boolean to disable WebGL2 support',
+  'optimizationLevel': f'Optimization level: {VALID_OPTION_VALUES["optimizationLevel"]} (default to 2)',
 }
 
 # user options (from --use-port)
 opts: Dict[str, Union[str, bool]] = {
-    'disableWarning': False,
-    'disableJoystick': False,
-    'disableMultiWindow': False,
-    'optimizationLevel': '2'
+  'disableWarning': False,
+  'disableJoystick': False,
+  'disableMultiWindow': False,
+  'disableWebGL2': False,
+  'optimizationLevel': '2'
 }
 
 port_name = 'emscripten-glfw3'
 
 
 def get_lib_name(settings):
-    return (f'lib_{port_name}_{TAG}-O{opts["optimizationLevel"]}' +
-            ('-nw' if opts['disableWarning'] else '') +
-            ('-nj' if opts['disableJoystick'] else '') +
-            ('-sw' if opts['disableMultiWindow'] else '') +
-            '.a')
+  return (f'lib_{port_name}_{TAG}-O{opts["optimizationLevel"]}' +
+          ('-nw' if opts['disableWarning'] else '') +
+          ('-nj' if opts['disableJoystick'] else '') +
+          ('-sw' if opts['disableMultiWindow'] else '') +
+          ('-mt' if settings.PTHREADS else '') +
+          '.a')
 
 
 def get(ports, settings, shared):
-    # get the port
-    ports.fetch_project(port_name, ZIP_URL, sha512hash=HASH)
+  # get the port
+  ports.fetch_project(port_name, ZIP_URL, sha512hash=HASH)
 
-    def create(final):
-        root_path = os.path.join(ports.get_dir(), port_name)
-        source_path = os.path.join(root_path, 'src', 'cpp')
-        source_include_paths = [os.path.join(root_path, 'external'), os.path.join(root_path, 'include')]
+  def create(final):
+    root_path = os.path.join(ports.get_dir(), port_name)
+    source_path = os.path.join(root_path, 'src', 'cpp')
+    source_include_paths = [os.path.join(root_path, 'external'), os.path.join(root_path, 'include')]
+
+    flags = [f'-O{opts["optimizationLevel"]}']
 
-        flags = [f'-O{opts["optimizationLevel"]}']
+    if opts['disableWarning']:
+      flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_WARNING']
 
-        if opts['disableWarning']:
-            flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_WARNING']
+    if opts['disableJoystick']:
+      flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_JOYSTICK']
 
-        if opts['disableJoystick']:
-            flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_JOYSTICK']
+    if opts['disableMultiWindow']:
+      flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_MULTI_WINDOW_SUPPORT']
 
-        if opts['disableMultiWindow']:
-            flags += ['-DEMSCRIPTEN_GLFW3_DISABLE_MULTI_WINDOW_SUPPORT']
+    if settings.PTHREADS:
+      flags += ['-pthread']
 
-        ports.build_port(source_path, final, port_name, includes=source_include_paths, flags=flags)
+    ports.build_port(source_path, final, port_name, includes=source_include_paths, flags=flags)
 
+  lib = shared.cache.get_lib(get_lib_name(settings), create, what='port')
+  if os.path.getmtime(lib) < os.path.getmtime(__file__):
+    clear(ports, settings, shared)
     lib = shared.cache.get_lib(get_lib_name(settings), create, what='port')
-    if os.path.getmtime(lib) < os.path.getmtime(__file__):
-        clear(ports, settings, shared)
-        lib = shared.cache.get_lib(get_lib_name(settings), create, what='port')
-    return [lib]
+  return [lib]
 
 
 def clear(ports, settings, shared):
-    shared.cache.erase_lib(get_lib_name(settings))
+  shared.cache.erase_lib(get_lib_name(settings))
 
 
 def linker_setup(ports, settings):
-    root_path = os.path.join(ports.get_dir(), port_name)
-    source_js_path = os.path.join(root_path, 'src', 'js', 'lib_emscripten_glfw3.js')
-    settings.JS_LIBRARIES += [source_js_path]
+  root_path = os.path.join(ports.get_dir(), port_name)
+  source_js_path = os.path.join(root_path, 'src', 'js', 'lib_emscripten_glfw3.js')
+  settings.JS_LIBRARIES += [source_js_path]
+  if not opts['disableWebGL2']:
+    settings.MAX_WEBGL_VERSION = 2
 
 
 # Makes GLFW includes accessible without installing them (ex: #include <GLFW/glfw3.h>)
@@ -110,13 +119,13 @@ def process_args(ports):
 
 
 def check_option(option, value, error_handler):
-    if value not in VALID_OPTION_VALUES[option]:
-        error_handler(f'[{option}] can be {list(VALID_OPTION_VALUES[option])}, got [{value}]')
-    if isinstance(opts[option], bool):
-        value = value == 'true'
-    return value
+  if value not in VALID_OPTION_VALUES[option]:
+    error_handler(f'[{option}] can be {list(VALID_OPTION_VALUES[option])}, got [{value}]')
+  if isinstance(opts[option], bool):
+    value = value == 'true'
+  return value
 
 
 def handle_options(options, error_handler):
-    for option, value in options.items():
-        opts[option] = check_option(option, value.lower(), error_handler)
+  for option, value in options.items():
+    opts[option] = check_option(option, value.lower(), error_handler)

external/emscripten-ports/imgui.py

@@ -1,10 +1,8 @@
 # Copyright (c) 2024 pongasoft
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
+# Licensed under the MIT License. You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://opensource.org/licenses/MIT
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -17,15 +15,15 @@
 import os
 from typing import Union, Dict, Optional
 
-TAG = '1.91.1'
+TAG = '1.91.8'
 
 # Run this file as a script to see which command to run to generate the checksums
 DISTRIBUTIONS = {
     'master': {
-        'hash': 'd810eb37336379b4ed106c7f02eb7a5b5f3603ec07426e23539787b0d3e6602db320aafb908a81041ef4c9bb1a810bb2d845b10fe6d0412a28d90daec7c582cb'
+        'hash': '4f4a95d879b5bbd15bc33a4ac3fd8d32554b521b2c18d7cc71f9d27e19eae7c52559963f572d1693b62cc5eb2fd56f2d58fa0e75f818296cb7e04f7014f43ddd'
     },
     'docking': {
-        'hash': '402ae1c33cbe13312052297a7d8aa657326dff8279460288e8991937c118f7028639cb9801101569472e56964c22e9e1a319ad1a21ecefbeffca8cac1a08488c'
+        'hash': '27441ed64868993fc9d89296081ac6bea9233f66ac1b748ed82491ec7dea3f4160fd072db2b59d3d9876323be380ff9b0617d0a89c2db8ae8a96c91852f158ab'
     }
 }
 
@@ -40,6 +38,7 @@
     'branch': DISTRIBUTIONS.keys(),
     'disableDemo': ['true', 'false'],
     'disableImGuiStdLib': ['true', 'false'],
+    'disableDefaultFont': ['true', 'false'],
     'optimizationLevel': ['0', '1', '2', '3', 'g', 's', 'z']  # all -OX possibilities
 }
 
@@ -52,9 +51,10 @@
 OPTIONS = {
     'renderer': f'Which renderer to use: {VALID_OPTION_VALUES["renderer"]} (required)',
     'backend': f'Which backend to use: {VALID_OPTION_VALUES["backend"]} (required)',
-    'branch': 'Which branch to use: master (default) or docking',
+    'branch': 'Which branch to use: master or docking (default to master)',
     'disableDemo': 'A boolean to disable ImGui demo (enabled by default)',
     'disableImGuiStdLib': 'A boolean to disable misc/cpp/imgui_stdlib.cpp (enabled by default)',
+    'disableDefaultFont': 'A boolean to disable the default font (enabled by default)',
     'optimizationLevel': f'Optimization level: {VALID_OPTION_VALUES["optimizationLevel"]} (default to 2)',
 }
 
@@ -65,6 +65,7 @@
     'branch': 'master',
     'disableDemo': False,
     'disableImGuiStdLib': False,
+    'disableDefaultFont': False,
     'optimizationLevel': '2'
 }
 
@@ -87,6 +88,7 @@ def get_lib_name(settings):
     return (f'lib_{port_name}_{get_tag()}-{opts["backend"]}-{opts["renderer"]}-O{opts["optimizationLevel"]}' +
             ('-nd' if opts['disableDemo'] else '') +
             ('-nl' if opts['disableImGuiStdLib'] else '') +
+            ('-nf' if opts['disableDefaultFont'] else '') +
             '.a')
 
 
@@ -116,6 +118,10 @@ def create(final):
 
         flags = [f'--use-port={value}' for value in build_deps.values()]
         flags.append(f'-O{opts["optimizationLevel"]}')
+        flags.append('-Wno-nontrivial-memaccess')
+
+        if opts['disableDefaultFont']:
+            flags.append('-DIMGUI_DISABLE_DEFAULT_FONT')
 
         ports.build_port(source_path, final, port_name, srcs=srcs, flags=flags)
 
@@ -176,8 +182,11 @@ def handle_options(options, error_handler):
     if opts['backend'] == 'glfw':
         deps.append('emscripten-glfw3')
         patch_src_directory = os.path.join(os.path.dirname(os.path.abspath(__file__)))
-        build_deps['emscripten-glfw3'] = \
-            f"{os.path.join(patch_src_directory, 'emscripten-glfw3.py')}:optimizationLevel={opts['optimizationLevel']}"
+        glfw3_options = {'optimizationLevel': opts['optimizationLevel']}
+        if opts['renderer'] == 'wgpu':
+          glfw3_options['disableWebGL2'] = 'true'
+        glfw3_options = ':'.join(f"{key}={value}" for key, value in glfw3_options.items())
+        build_deps['emscripten-glfw3'] = f"{os.path.join(patch_src_directory, 'emscripten-glfw3.py')}:{glfw3_options}"
     else:
         deps.append('sdl2')
         build_deps['sdl2'] = 'sdl2'

src/cpp/Application.cpp

@@ -19,6 +19,7 @@
 #include <GLFW/glfw3.h>
 #include "Application.h"
 #include "Errors.h"
+#include <emscripten/version.h>
 
 namespace shader_toy {
 
@@ -39,7 +40,8 @@ Application::Application()
   glfwSetErrorCallback(consoleErrorHandler);
 
   // print the version on the console
-  printf("%s\n", glfwGetVersionString());
+  printf("GLFW: %s\n", glfwGetVersionString());
+  printf("Emscripten: %d.%d.%d\n", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
 
   // initialize the library
   WST_INTERNAL_ASSERT(glfwInit() == GLFW_TRUE);