expo-gl 58.0.2 → 58.0.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 58.0.4
+
+### Patch Changes
+
+- Fix WebGL 2 contexts being `instanceof WebGLRenderingContext`, which made three.js r163 and later reject them as WebGL 1. ([#51572](https://github.com/expo/expo/pull/51572) by [@expo-bot](https://github.com/expo-bot))
+
+## 58.0.3
+
+### Patch Changes
+
+- Bump precompiled artifacts due to ABI breakage in expo-modules-jsi@58.0.6. ([#50881](https://github.com/expo/expo/pull/50881) by [@kitten](https://github.com/kitten))
+
 ## 58.0.2
 
 ### Patch Changes

package/android/CMakeLists.txt

@@ -10,6 +10,39 @@ set(PACKAGE_NAME "expo-gl")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set(COMMON_DIR ${CMAKE_SOURCE_DIR}/../common)
 
+include("${EXPO_MODULES_CORE_CMAKE_DIR}/pch-ccache.cmake" OPTIONAL RESULT_VARIABLE PCH_CCACHE)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+
+find_library(LOG_LIB log)
+find_library(GLES_LIB GLESv3)
+
+add_library(${PACKAGE_NAME}-common INTERFACE)
+target_include_directories(${PACKAGE_NAME}-common INTERFACE "${COMMON_DIR}")
+target_compile_options(
+    ${PACKAGE_NAME}-common
+    INTERFACE -O2
+              -fexceptions
+              -frtti
+              -Wall
+              -Wextra
+              -Wno-unused-parameter
+              -Wshorten-64-to-32
+              -Wstrict-prototypes
+              # Stop clang from writing a timestamp into the .pch, so that ccache can reuse it.
+              "$<$<COMPILE_LANGUAGE:CXX>:-Xclang;-fno-pch-timestamp>")
+target_link_libraries(${PACKAGE_NAME}-common INTERFACE ReactAndroid::jsi)
+
+# Builds the PCH that expo-gl reuses. Nothing links this library.
+add_library(${PACKAGE_NAME}-pch STATIC EXCLUDE_FROM_ALL ./src/main/cpp/EXGLPchOwner.cpp)
+target_link_libraries(${PACKAGE_NAME}-pch PRIVATE ${PACKAGE_NAME}-common)
+
+if (PCH_CCACHE)
+  target_precompile_headers(${PACKAGE_NAME}-pch PRIVATE "<pch.h>")
+else ()
+  target_precompile_headers(${PACKAGE_NAME}-pch PRIVATE "${COMMON_DIR}/pch.h")
+endif ()
+
 add_library(
     ${PACKAGE_NAME} SHARED
     ${COMMON_DIR}/EXGLNativeApi.cpp
@@ -30,23 +63,10 @@ add_library(
     ${COMMON_DIR}/EXTypedArrayApi.h
     ./src/main/cpp/EXGLJniApi.cpp)
 
-target_include_directories(
-    ${PACKAGE_NAME} PRIVATE "${COMMON_DIR}")
-
-find_package(ReactAndroid REQUIRED CONFIG)
-
-find_library(LOG_LIB log)
-find_library(GLES_LIB GLESv3)
+target_link_libraries(${PACKAGE_NAME} ${PACKAGE_NAME}-common ${LOG_LIB} ${GLES_LIB} android)
+target_precompile_headers(${PACKAGE_NAME} REUSE_FROM ${PACKAGE_NAME}-pch)
 
-target_compile_options(
-    ${PACKAGE_NAME}
-    PRIVATE -O2
-            -fexceptions
-            -frtti
-            -Wall
-            -Wextra
-            -Wno-unused-parameter
-            -Wshorten-64-to-32
-            -Wstrict-prototypes)
-target_precompile_headers(${PACKAGE_NAME} PRIVATE ${COMMON_DIR}/pch.h)
-target_link_libraries(${PACKAGE_NAME} ReactAndroid::jsi ${LOG_LIB} ${GLES_LIB} android)
+if (PCH_CCACHE)
+  pch_ccache_owner(${PACKAGE_NAME}-pch)
+  pch_ccache_consumer(${PACKAGE_NAME} ${PACKAGE_NAME}-pch)
+endif ()

package/android/build.gradle

@@ -10,8 +10,11 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+// expo-modules-core has pch-ccache.cmake, which CMakeLists.txt uses when it can find it.
+def expoModulesCoreProject = rootProject.findProject(":expo-modules-core")
+
 group = 'host.exp.exponent'
-version = '58.0.2'
+version = '58.0.4'
 
 android {
   if (rootProject.hasProperty("ndkPath")) {
@@ -24,13 +27,21 @@ android {
   namespace "expo.modules.gl"
   defaultConfig {
     versionCode 31
-    versionName "58.0.2"
+    versionName "58.0.4"
 
     externalNativeBuild {
       cmake {
-        abiFilters (*reactNativeArchitectures())
-        arguments "-DANDROID_STL=c++_shared",
+        def cppArguments = [
+          "-DANDROID_STL=c++_shared",
           "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+        ]
+
+        if (expoModulesCoreProject != null) {
+          cppArguments += "-DEXPO_MODULES_CORE_CMAKE_DIR=${expoModulesCoreProject.projectDir}/cmake"
+        }
+
+        abiFilters (*reactNativeArchitectures())
+        arguments(*cppArguments)
       }
     }
   }

package/android/src/main/cpp/EXGLPchOwner.cpp

@@ -0,0 +1 @@
+// This translation unit exists only so that the `expo-gl-pch` target can compile the precompiled header.

package/common/EXWebGLRenderer.cpp

@@ -200,24 +200,20 @@ void installWebGLConstructorsAndConstants(jsi::Runtime &runtime) {
     installConstants(runtime, constructor);
   };
 
+  // In the WebGL 2 IDL, WebGL2RenderingContext does not inherit from WebGLRenderingContext.
+  // three.js r163+ rejects a WebGL 2 context that is `instanceof WebGLRenderingContext`.
   inheritFromJsObject(EXWebGLClass::WebGLRenderingContext);
+  inheritFromJsObject(EXWebGLClass::WebGL2RenderingContext);
   installConstantsOnConstructor(EXWebGLClass::WebGLRenderingContext);
 
-  // Make WebGL2RenderingContext extend WebGLRenderingContext on both sides,
-  // matching the WebGL spec and what `class WebGL2RenderingContext extends
-  // WebGLRenderingContext {}` would produce. Saves duplicating constants and
-  // WebGL1 methods on the WebGL2 prototype, and gives `instanceof
-  // WebGLRenderingContext` the right answer for WebGL2 instances.
+  // Static constants on WebGL2RenderingContext fall through to WebGLRenderingContext.
+  // This does not affect `instanceof`.
   auto webglRenderingContext =
     runtime.global()
       .getProperty(
         runtime,
         jsi::PropNameID::forUtf8(runtime, getConstructorName(EXWebGLClass::WebGLRenderingContext)))
       .asObject(runtime);
-  jsClassExtend(
-    runtime,
-    webglRenderingContext,
-    jsi::PropNameID::forUtf8(runtime, getConstructorName(EXWebGLClass::WebGL2RenderingContext)));
   jsi::Object webgl2RenderingContext =
     runtime.global()
       .getProperty(
@@ -268,9 +264,14 @@ void installWebGLInstanceMethods(jsi::Runtime &runtime) {
   installConstants(runtime, webglPrototype);
   installWebGLMethods(runtime, webglPrototype);
 
-  // Constants and WebGL1 methods reach the WebGL2 prototype via inheritance;
-  // only the WebGL2-exclusive methods need installing here.
+  // Copy instead of a second install, so the host functions are created only once.
   auto webgl2Prototype = getRenderingContextPrototype(runtime, EXWebGLClass::WebGL2RenderingContext);
+  jsi::Object objectClass = runtime.global().getPropertyAsObject(runtime, "Object");
+  objectClass.getPropertyAsFunction(runtime, "assign")
+    .callWithThis(
+      runtime,
+      objectClass,
+      {jsi::Value(runtime, webgl2Prototype), jsi::Value(runtime, webglPrototype)});
   installWebGL2Methods(runtime, webgl2Prototype);
 }
 
@@ -293,9 +294,8 @@ void installWebGLMethods(jsi::Runtime &runtime, jsi::Object &gl) {
 #undef NATIVE_METHOD
 }
 
-// Installs only WebGL2-exclusive methods. WebGL1 methods reach WebGL2
-// instances via the prototype chain (WebGL2RenderingContext.prototype
-// inherits from WebGLRenderingContext.prototype).
+// Installs only WebGL2-exclusive methods. WebGL1 methods are copied from
+// WebGLRenderingContext.prototype in `installWebGLInstanceMethods`.
 void installWebGL2Methods(jsi::Runtime &runtime, jsi::Object &gl) {
 #define NATIVE_METHOD(name) ;
 #define NATIVE_WEBGL2_METHOD(name) setFunctionOnObject(runtime, gl, #name, method::glNativeMethod_##name);

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.aar.md5

@@ -0,0 +1 @@
+cf9293ff3e5516fd707d18f27acbfea9

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.aar.sha1

@@ -0,0 +1 @@
+306014add1823086c57a82c581525c380ee7aadd

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.aar.sha256

@@ -0,0 +1 @@
+c9c7ba58b063e22803bc22701dd5e2832fae267c2dc8d0c0f8622d684911dbbc

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.aar.sha512

@@ -0,0 +1 @@
+6b2593fc68cb5ab26d82e26fdb6b6ba8c272ffe413e88d53ea2b7b5287256ffe5f585cd681cdee5213c7d9cbd2241bcab76a81f34ec8106754207ebbd7564c45

package/local-maven-repo/host/exp/exponent/expo.modules.gl/{58.0.2/expo.modules.gl-58.0.2.module → 58.0.4/expo.modules.gl-58.0.4.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.gl",
-    "version": "58.0.2",
+    "version": "58.0.4",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.gl-58.0.2.aar",
-          "url": "expo.modules.gl-58.0.2.aar",
-          "size": 972039,
-          "sha512": "e18f5890017c795f92c009340502607350295155d775050b117435b22fa186ff2a426cb34dd5461326a72006bccb843282914e9bc8f286cb1ec2d09a4aebbb84",
-          "sha256": "0e294336d4fd2ae7741e94310ad862ee1c0ebf00087378c8593cd2c308eb5e12",
-          "sha1": "572dcc2bf503c6f5ceaf2ab578b763918b9ddb55",
-          "md5": "4f9489223afbf38a5e310eb83dc16380"
+          "name": "expo.modules.gl-58.0.4.aar",
+          "url": "expo.modules.gl-58.0.4.aar",
+          "size": 972794,
+          "sha512": "6b2593fc68cb5ab26d82e26fdb6b6ba8c272ffe413e88d53ea2b7b5287256ffe5f585cd681cdee5213c7d9cbd2241bcab76a81f34ec8106754207ebbd7564c45",
+          "sha256": "c9c7ba58b063e22803bc22701dd5e2832fae267c2dc8d0c0f8622d684911dbbc",
+          "sha1": "306014add1823086c57a82c581525c380ee7aadd",
+          "md5": "cf9293ff3e5516fd707d18f27acbfea9"
         }
       ]
     },
@@ -67,13 +67,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.gl-58.0.2.aar",
-          "url": "expo.modules.gl-58.0.2.aar",
-          "size": 972039,
-          "sha512": "e18f5890017c795f92c009340502607350295155d775050b117435b22fa186ff2a426cb34dd5461326a72006bccb843282914e9bc8f286cb1ec2d09a4aebbb84",
-          "sha256": "0e294336d4fd2ae7741e94310ad862ee1c0ebf00087378c8593cd2c308eb5e12",
-          "sha1": "572dcc2bf503c6f5ceaf2ab578b763918b9ddb55",
-          "md5": "4f9489223afbf38a5e310eb83dc16380"
+          "name": "expo.modules.gl-58.0.4.aar",
+          "url": "expo.modules.gl-58.0.4.aar",
+          "size": 972794,
+          "sha512": "6b2593fc68cb5ab26d82e26fdb6b6ba8c272ffe413e88d53ea2b7b5287256ffe5f585cd681cdee5213c7d9cbd2241bcab76a81f34ec8106754207ebbd7564c45",
+          "sha256": "c9c7ba58b063e22803bc22701dd5e2832fae267c2dc8d0c0f8622d684911dbbc",
+          "sha1": "306014add1823086c57a82c581525c380ee7aadd",
+          "md5": "cf9293ff3e5516fd707d18f27acbfea9"
         }
       ]
     },
@@ -87,8 +87,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.gl-58.0.2-sources.jar",
-          "url": "expo.modules.gl-58.0.2-sources.jar",
+          "name": "expo.modules.gl-58.0.4-sources.jar",
+          "url": "expo.modules.gl-58.0.4-sources.jar",
           "size": 11894,
           "sha512": "736ee2db4caf331a97ad5cf50598d72a21c42d0f752a518df0d261a0fb46a37325a67839b24f449793e5c469f563588b87ad4d27ac7603f11fb4dcc04175e514",
           "sha256": "ecb0469a228bdf08f30af7eace98fd5f3be31cd451e2113c9e38f0c4fef5aae3",

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.module.md5

@@ -0,0 +1 @@
+ffdb2fee1385657f082088856d61a89e

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.module.sha1

@@ -0,0 +1 @@
+15fb600b110efbaf7f9d7987435b69868daebe99

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.module.sha256

@@ -0,0 +1 @@
+49123149549e4e879701f88fc3a39e05b198c8241066a6df580895c8893877c4

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.module.sha512

@@ -0,0 +1 @@
+9c808378bb669dd309f899d7325b652ec41fc3db68798f3320938ddc51ce6132e32a7983dd1e48e91d0ffc42215df8ee48e9fcb6a5691c045653d6d9ffc06cd0

package/local-maven-repo/host/exp/exponent/expo.modules.gl/{58.0.2/expo.modules.gl-58.0.2.pom → 58.0.4/expo.modules.gl-58.0.4.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.gl</artifactId>
-  <version>58.0.2</version>
+  <version>58.0.4</version>
   <packaging>aar</packaging>
   <name>expo.modules.gl</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.pom.md5

@@ -0,0 +1 @@
+c2f704332e5c9fa865ba211854ac0f2f

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.pom.sha1

@@ -0,0 +1 @@
+4b2eab9ee62de3cea712e814289850841af19a91

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.pom.sha256

@@ -0,0 +1 @@
+582992fa3d4513025fe28e390893809045e388baa47346b56545647cd66ad281

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.4/expo.modules.gl-58.0.4.pom.sha512

@@ -0,0 +1 @@
+88c31b18c26c8e1b6ff295789308af4571a0522c9cccf2125a56043b78073ce5aaa9c2c0211e28e5e2d580c3ad6cd1817bf07afa682c025b503fad4c484892b3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "58.0.2",
+  "version": "58.0.4",
   "description": "Provides GLView that acts as OpenGL ES render target and gives GL context object implementing WebGL 2.0 specification.",
   "keywords": [
     "expo",
@@ -27,13 +27,13 @@
     "invariant": "^2.2.4"
   },
   "devDependencies": {
+    "@expo/internal-scripts": "58.0.5",
     "@types/invariant": "^2.2.33",
     "@types/offscreencanvas": "2019.6.4",
     "@types/react": "~19.3.0",
     "@types/react-test-renderer": "^19.1.0",
     "@types/webgl2": "^0.0.6",
-    "expo": "58.0.0",
-    "expo-module-scripts": "56.0.4",
+    "expo": "58.0.22",
     "react-test-renderer": "19.3.0"
   },
   "peerDependencies": {
@@ -56,7 +56,7 @@
     }
   },
   "jest": {
-    "preset": "expo-module-scripts"
+    "preset": "@expo/internal-scripts"
   },
   "scripts": {
     "precompile-android": "et prebuild-android-package-for-publish",

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.aar.md5

@@ -1 +0,0 @@
-4f9489223afbf38a5e310eb83dc16380

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.aar.sha1

@@ -1 +0,0 @@
-572dcc2bf503c6f5ceaf2ab578b763918b9ddb55

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.aar.sha256

@@ -1 +0,0 @@
-0e294336d4fd2ae7741e94310ad862ee1c0ebf00087378c8593cd2c308eb5e12

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.aar.sha512

@@ -1 +0,0 @@
-e18f5890017c795f92c009340502607350295155d775050b117435b22fa186ff2a426cb34dd5461326a72006bccb843282914e9bc8f286cb1ec2d09a4aebbb84

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.module.md5

@@ -1 +0,0 @@
-4a55bd20599f0b477ad8242225fbb391

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.module.sha1

@@ -1 +0,0 @@
-ff81bcf432bb1a7216ad1daf984c83d5cc1cfb41

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.module.sha256

@@ -1 +0,0 @@
-2dd1a0fe5ffb40abd283da31c732f92e4259954825a9a6c22fda49e4d0ec29f2

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.module.sha512

@@ -1 +0,0 @@
-06a4391635dc31eeb4096512dcc14bf7c6f35ea20e8c8b7da3413acbbe40ab715c8e650bfd6a6ff75dc4b077b8e99675d065eda30320656664f1ba8c14f0141a

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.pom.md5

@@ -1 +0,0 @@
-4eac9552e6e936cde85bd2f90d91a5d3

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.pom.sha1

@@ -1 +0,0 @@
-b0c8526c9722f968eb14561f59dd2c6230e54e84

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.pom.sha256

@@ -1 +0,0 @@
-b1976c00f49940cc8087f30b5eb7854d7ea3a88ac1cda6962141137d5d21a59d

package/local-maven-repo/host/exp/exponent/expo.modules.gl/58.0.2/expo.modules.gl-58.0.2.pom.sha512

@@ -1 +0,0 @@
-a1ecfc9f232d32a0108d79bf5823f971099c459de6fafe2a6b8a6719d118e198f9ac086bd749138969806f7bf4978272b191b7e66ac2147667fcdf8da7c0a682