opengl support for memory64

emscripten-core · Mar 17, 2023 · 4111e3f · 4111e3f
1 parent fab93a2
commit 4111e3f
Show file tree

Hide file tree

Showing 9 changed files with 440 additions and 3,884 deletions.
diff --git a/emcc.py b/emcc.py
@@ -2847,10 +2847,11 @@ def get_full_import_name(name):
 
   # check if we can address the 2GB mark and higher: either if we start at
   # 2GB, or if we allow growth to either any amount or to 2GB or more.
-  if settings.INITIAL_MEMORY > 2 * 1024 * 1024 * 1024 or \
-     (settings.ALLOW_MEMORY_GROWTH and
+  if settings.MEMORY64 == 0 and \
+      (settings.INITIAL_MEMORY > 2 * 1024 * 1024 * 1024 or
+      (settings.ALLOW_MEMORY_GROWTH and
       (settings.MAXIMUM_MEMORY < 0 or
-       settings.MAXIMUM_MEMORY > 2 * 1024 * 1024 * 1024)):
+      settings.MAXIMUM_MEMORY > 2 * 1024 * 1024 * 1024))):
     settings.CAN_ADDRESS_2GB = 1
 
   settings.EMSCRIPTEN_VERSION = shared.EMSCRIPTEN_VERSION