diff --git a/src/mbgl/shaders/vulkan/shader_program.cpp b/src/mbgl/shaders/vulkan/shader_program.cpp index a45e9fbc00f..bfa7aee53e8 100644 --- a/src/mbgl/shaders/vulkan/shader_program.cpp +++ b/src/mbgl/shaders/vulkan/shader_program.cpp @@ -106,7 +106,7 @@ ShaderProgram::ShaderProgram(shaders::BuiltIn shaderID, backend.setDebugName(vertexShader.get(), shaderName + ".vert"); backend.setDebugName(fragmentShader.get(), shaderName + ".frag"); - observer->onPostCompileShader(shaderID, gfx::Backend::Type::Metal, defineStr); + observer.onPostCompileShader(shaderID, gfx::Backend::Type::Metal, defineStr); } ShaderProgram::~ShaderProgram() noexcept = default; diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 87f82eb13f3..adaef7d9555 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -1709,7 +1709,7 @@ TEST(Map, ObserveTileLifecycle) { std::string defines; bool isPostCompile; }; - std::vector shaderOps = {}; + std::vector shaderOps; StubMapObserver observer; observer.onTileActionCallback = [&](TileOperation op, const OverscaledTileID& id, const std::string& sourceID) { @@ -1739,23 +1739,8 @@ TEST(Map, ObserveTileLifecycle) { layer->setSourceLayer("landcover"); layer->setFillColor(Color{0.0, 1.0, 0.0, 1.0}); map.getStyle().addLayer(std::move(layer)); - - map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json")); map.jumpTo(CameraOptions().withCenter(LatLng{37.8, -122.5}).withZoom(10.0)); - - auto img = frontend.render(map).image; - test::checkImage("test/fixtures/map/tile_lifecycle", img, 0.0002, 0.1); - - std::unordered_map seen; - for (auto& shader : shaderOps) { - auto shaderStr = std::to_string(static_cast(shader.id)) + shader.defines; - auto it = seen.find(shaderStr); - if (it != seen.end()) continue; - seen.insert({shaderStr, true}); - Log::Info(Event::General, - std::to_string(static_cast(shader.id)) + " " + - std::to_string(std::hash()(shader.defines))); - } + (void)frontend.render(map); // We expect to see a valid shader lifecycle for every entry in this list. const std::vector> expectedShaders = {