Make sure ensureCompiledOnContext is called for internal shader() calls

Author: davepagurek

src/webgl/material.js

@@ -864,9 +864,6 @@ function material(p5, fn){
     this._assert3d('shader');
     p5._validateParameters('shader', arguments);
 
-    // NOTE: make generic or remove need for
-    s.ensureCompiledOnContext(this);
-
     this._renderer.shader(s);
 
     return this;
@@ -1040,9 +1037,6 @@ function material(p5, fn){
     this._assert3d('strokeShader');
     p5._validateParameters('strokeShader', arguments);
 
-    // NOTE: make generic or remove need for
-    s.ensureCompiledOnContext(this);
-
     this._renderer.strokeShader(s);
 
     return this;
@@ -1200,9 +1194,6 @@ function material(p5, fn){
     this._assert3d('imageShader');
     p5._validateParameters('imageShader', arguments);
 
-    // NOTE: make generic or remove need for
-    s.ensureCompiledOnContext(this);
-
     this._renderer.imageShader(s);
 
     return this;
@@ -3633,16 +3624,19 @@ function material(p5, fn){
     // Always set the shader as a fill shader
     this.states.userFillShader = s;
     this.states._useNormalMaterial = false;
+    s.ensureCompiledOnContext(this);
     s.setDefaultUniforms();
   }
 
   RendererGL.prototype.strokeShader = function(s) {
     this.states.userStrokeShader = s;
+    s.ensureCompiledOnContext(this);
     s.setDefaultUniforms();
   }
 
   RendererGL.prototype.imageShader = function(s) {
     this.states.userImageShader = s;
+    s.ensureCompiledOnContext(this);
     s.setDefaultUniforms();
   }
 

src/webgl/p5.Shader.js

@@ -612,20 +612,20 @@ class Shader {
       this._vertSrc,
       this._fragSrc
     );
-    shader.ensureCompiledOnContext(context);
+    shader.ensureCompiledOnContext(context._renderer);
     return shader;
   }
 
   /**
    * @private
    */
   ensureCompiledOnContext(context) {
-    if (this._glProgram !== 0 && this._renderer !== context._renderer) {
+    if (this._glProgram !== 0 && this._renderer !== context) {
       throw new Error(
         'The shader being run is attached to a different context. Do you need to copy it to this context first with .copyToContext()?'
       );
     } else if (this._glProgram === 0) {
-      this._renderer = context._renderer;
+      this._renderer = context;
       this.init();
     }
   }