From 79edf22a345079dc6cf5d8c6ad38ee22e9edab3c Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 1 May 2020 13:43:28 -0700 Subject: [PATCH] r116.1 --- build/three.js | 7 ++++--- build/three.min.js | 4 ++-- build/three.module.js | 7 ++++--- package.json | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/three.js b/build/three.js index a90b0d9332..241428a24a 100644 --- a/build/three.js +++ b/build/three.js @@ -18476,10 +18476,11 @@ } - // clean up + // Clean up - gl.detachShader( program, glVertexShader ); - gl.detachShader( program, glFragmentShader ); + // Crashes in iOS9 and iOS10. #18402 + // gl.detachShader( program, glVertexShader ); + // gl.detachShader( program, glFragmentShader ); gl.deleteShader( glVertexShader ); gl.deleteShader( glFragmentShader ); diff --git a/build/three.min.js b/build/three.min.js index 76d0c75acb..53c77f3193 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -80,8 +80,8 @@ c.doubleSided?"#define DOUBLE_SIDED":"",c.flipSided?"#define FLIP_SIDED":"",c.sh c.matcapEncoding):"",c.envMapEncoding?Gd("envMapTexelToLinear",c.envMapEncoding):"",c.emissiveMapEncoding?Gd("emissiveMapTexelToLinear",c.emissiveMapEncoding):"",c.lightMapEncoding?Gd("lightMapTexelToLinear",c.lightMapEncoding):"",c.outputEncoding?gk("linearToOutputTexel",c.outputEncoding):"",c.depthPacking?"#define DEPTH_PACKING "+c.depthPacking:"","\n"].filter(Hd).join("\n"));f=f.replace(gg,fg);f=Lh(f,c);f=Mh(f,c);g=g.replace(gg,fg);g=Lh(g,c);g=Mh(g,c);f=f.replace(Ph,hg).replace(Qh,Nh);g=g.replace(Ph, hg).replace(Qh,Nh);c.isWebGL2&&!c.isRawShaderMaterial&&(k=!1,m=/^\s*#version\s+300\s+es\s*\n/,c.isShaderMaterial&&null!==f.match(m)&&null!==g.match(m)&&(k=!0,f=f.replace(m,""),g=g.replace(m,"")),e="#version 300 es\n\n#define attribute in\n#define varying out\n#define texture2D texture\n"+e,h=["#version 300 es\n\n#define varying in",k?"":"out highp vec4 pc_fragColor;",k?"":"#define gl_FragColor pc_fragColor","#define gl_FragDepthEXT gl_FragDepth\n#define texture2D texture\n#define textureCube texture\n#define texture2DProj textureProj\n#define texture2DLodEXT textureLod\n#define texture2DProjLodEXT textureProjLod\n#define textureCubeLodEXT textureLod\n#define texture2DGradEXT textureGrad\n#define texture2DProjGradEXT textureProjGrad\n#define textureCubeGradEXT textureGrad"].join("\n")+ "\n"+h);g=h+g;f=Ih(d,35633,e+f);g=Ih(d,35632,g);d.attachShader(q,f);d.attachShader(q,g);void 0!==c.index0AttributeName?d.bindAttribLocation(q,0,c.index0AttributeName):!0===c.morphTargets&&d.bindAttribLocation(q,0,"position");d.linkProgram(q);if(a.debug.checkShaderErrors){a=d.getProgramInfoLog(q).trim();k=d.getShaderInfoLog(f).trim();m=d.getShaderInfoLog(g).trim();p=z=!0;if(!1===d.getProgramParameter(q,35714))z=!1,l=Kh(d,f,"vertex"),r=Kh(d,g,"fragment"),console.error("THREE.WebGLProgram: shader error: ", -d.getError(),"35715",d.getProgramParameter(q,35715),"gl.getProgramInfoLog",a,l,r);else if(""!==a)console.warn("THREE.WebGLProgram: gl.getProgramInfoLog()",a);else if(""===k||""===m)p=!1;p&&(this.diagnostics={runnable:z,programLog:a,vertexShader:{log:k,prefix:e},fragmentShader:{log:m,prefix:h}})}d.detachShader(q,f);d.detachShader(q,g);d.deleteShader(f);d.deleteShader(g);var t;this.getUniforms=function(){void 0===t&&(t=new Gb(d,q));return t};var n;this.getAttributes=function(){if(void 0===n){for(var a= -{},b=d.getProgramParameter(q,35721),c=0;c