Rebase render tests' expected images (#1633)

.gitignore

@@ -45,3 +45,7 @@ node_modules
 CMakeLists.txt.user
 CMakeFiles
 __generated__
+
+/metrics/integration/query-tests/**/actual.json
+/metrics/integration/render-tests/**/actual.png
+/metrics/integration/render-tests/**/diff.png

include/mbgl/gfx/uniform_block.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
+#include <mbgl/util/string_indexer.hpp>
+
 #include <string>
 #include <memory>
 #include <unordered_map>
-#include <mbgl/util/string_indexer.hpp>
-
+#include <functional>
 namespace mbgl {
 namespace gfx {
 

metrics/ignores/platform-all.json

@@ -132,5 +132,7 @@
     "render-tests/feature-state/promote-id-fill-extrusion": "https://github.com/mapbox/mapbox-gl-js/pull/9202",
     "render-tests/line-pattern/with-dasharray":"https://github.com/mapbox/mapbox-gl-js/pull/9189",
     "render-tests/symbol-sort-key/placement-tile-boundary-right-then-left": "https://github.com/mapbox/mapbox-gl-js/pull/9054",
-    "render-tests/tile-mode/streets-v11": "ignored due to flaky metrics results"
+    "render-tests/tile-mode/streets-v11": "ignored due to flaky metrics results",
+    "render-tests/combinations/heatmap-translucent--fill-opaque": "Temporarily disabled until the renderer switch",
+    "render-tests/combinations/heatmap-translucent--background-opaque": "Temporarily disabled until the renderer switch"
 }