Invalidate all WebGLUniformLocation values on program relink

1 files changed, 10 insertions, 2 deletions

diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 45923d1b27c..5e2f26748ac 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -436,7 +436,10 @@ impl WebGLRenderingContext {
             None => return,
         };
         match self.current_program.get() {
-            Some(ref program) if program.id() == location.program_id() => {}
+            Some(ref program) if
+                program.id() == location.program_id() &&
+                program.link_generation() == location.link_generation()
+            => {}
             _ => return self.webgl_error(InvalidOperation),
         }
         handle_potential_webgl_error!(self, f(location));
@@ -3612,7 +3615,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     ) -> JSVal {
         // FIXME(nox): https://github.com/servo/servo/issues/21133
 
-        if program.is_deleted() || !program.is_linked() || program.id() != location.program_id() {
+        if
+            program.is_deleted() ||
+            !program.is_linked() ||
+            program.id() != location.program_id() ||
+            program.link_generation() != location.link_generation()
+        {
             self.webgl_error(InvalidOperation);
             return NullValue();
         }