Handle 'NullOp' in jni layer, fix vulkan observer call

mwilsnd · Aug 28, 2024 · 6023a8b · 6023a8b
1 parent 9c9a338
commit 6023a8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp b/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp
@@ -22,6 +22,8 @@ jni::Local<jni::Object<TileOperation>> TileOperation::Create(jni::JNIEnv& env, m
             return _class.Get(env, _class.GetStaticField<jni::Object<TileOperation>>(env, "Error"));
         case mbgl::TileOperation::Cancelled:
             return _class.Get(env, _class.GetStaticField<jni::Object<TileOperation>>(env, "Cancelled"));
+        case mbgl::TileOperation::NullOp:
+            return _class.Get(env, _class.GetStaticField<jni::Object<TileOperation>>(env, "NullOp"));
     }
 }
 

diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/tile/TileOperation.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/tile/TileOperation.java
@@ -8,5 +8,6 @@ public enum TileOperation {
     StartParse,
     EndParse,
     Error,
-    Cancelled
+    Cancelled,
+    NullOp,
 }
diff --git a/src/mbgl/shaders/vulkan/shader_program.cpp b/src/mbgl/shaders/vulkan/shader_program.cpp
@@ -41,7 +41,7 @@ ShaderProgram::ShaderProgram(shaders::BuiltIn shaderID,
     for (const auto& define : additionalDefines) {
         defineStr += "#define " + define.first + " " + define.second + "\n";
     }
-    observer->onPreCompileShader(shaderID, gfx::Backend::Type::Metal, defineStr);
+    observer.onPreCompileShader(shaderID, gfx::Backend::Type::Metal, defineStr);
 
     constexpr auto targetClientVersion = glslang::EShTargetVulkan_1_0;
     constexpr auto targetLanguageVersion = glslang::EShTargetSpv_1_0;