[core] re-bind uniform locations after re-linking programupstream/ivd-fix-android-emulator

- On some gl implementations the uniform locations are shifted after linking the program a second time, resulting in errors when using any uniform. On some implementations they are actually doubled. Re-binding the uniforms after selectively binding the vertex attributes prevents this.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp
index 3b54ec194a..af02ad3d54 100644
--- a/src/mbgl/gl/program.hpp
+++ b/src/mbgl/gl/program.hpp
@@ -36,8 +36,13 @@ public:
                                     context.createShader(ShaderType::Fragment, fragmentSource))),
           uniformsState((context.linkProgram(program), Uniforms::bindLocations(program))),
           attributeLocations(Attributes::bindLocations(program)) {
+
         // Re-link program after manually binding only active attributes in Attributes::bindLocations
         context.linkProgram(program);
+
+        // We have to re-initialize the uniforms state from the bindings as the uniform locations
+        // get shifted on some implementations
+        uniformsState = Uniforms::bindLocations(program);
     }
 
     template <class BinaryProgram>