Merge pull request mrdoob#34 from greggman/remove-desktop-gl-cruft

Remove Desktop GL cruft
ouyangpeng · Apr 10, 2015 · 1438407 · 1438407
2 parents 534799b + a026979
commit 1438407
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/static/index.html b/static/index.html
@@ -63,9 +63,7 @@
 		<script src="js/codemirror.js"></script>
 		<script src="js/glsl.js"></script>
 
-		<script id="example" type="x-shader/x-fragment">#ifdef GL_ES
-precision mediump float;
-#endif
+		<script id="example" type="x-shader/x-fragment">precision mediump float;
 
 uniform float time;
 uniform vec2 mouse;
@@ -87,9 +85,7 @@
 
 		<script id="fragmentShader" type="x-shader/x-fragment">
 
-			#ifdef GL_ES
 			precision mediump float;
-			#endif
 
 			uniform vec2 resolution;
 			uniform sampler2D texture;

diff --git a/static/js/helpers.js b/static/js/helpers.js
@@ -29,7 +29,7 @@ function load_url_code() {
 
 	} else {
 
-		readURL( '5d000001009a0200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6aa581b342b344db4e71099beb79352b3c442c8dee970ffb4d054491e356b4f55882c2f3554393fe6662cf2c348a3f51dcce7b5760290bbc5c1b937d382ba6cdd0a9b35cf7fd57cebd800501c16f80f61ad4501d00a2ca4e63c8dc38b7b03703cba8d68914c6f2c6598f2f7008faee0e4b4cf4276eea6d0fb93df9188dae5b7f6db2579246363efaf9145f13206ee5b908e90eb4f6e19254a0f4fda81b31c2d3fd00e78e5b5fb5d5e51df87412a667211e121d77f3becd58d5960f9b77d8b826d4c6bce27a589f7158944441ae8fa5a297f23f0e7707f84fcbe0557976aaca9c97b99d3252a8b85b2a4ecb10d9b3cb65f6a5d75240f8bde39ed692b559c61276fe260578' );
+		readURL( '5d00000100860200000000000000381c88cdaf8125d4569ed1e6e6c09c2fe72b7d489ad9d27ce026c849f505dd720ff335d10a9aae020d6c5ae383c1b48113253ebdf2f3ce134f3820f3c0c51fbc05ad011e6760c37538ef2510e11f33cb7080000de4c452d3fc136ece677b67088acbd792a9b5ce5df0c751f3b4524f01d0d87382a85e78d7c74a94532bf2216c7659751c13f005aa3d330478c93ec81671986980aa7fe7a7b9972d62db986e6a7786ea36ae9d56eb16d980a18602322ed6531c3174e62dc3d3ada99b0b48be05ce9e0b5dc31c6d8baf62ed660490bf621322abf89d13028ed7794077b5a072711d7aed1cb7d89d92a1a81866aad6582ae8930795aa5c0a31646d43343ed71bb6fce5230efd39c66e' );
 
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ function load_url_code() { @@
     	} else {
-    		readURL( '5d000001009a0200000000000000119a48c65ab5aec1f910f780dfdfe473e599a211a90304ab6aa581b342b344db4e71099beb79352b3c442c8dee970ffb4d054491e356b4f55882c2f3554393fe6662cf2c348a3f51dcce7b5760290bbc5c1b937d382ba6cdd0a9b35cf7fd57cebd800501c16f80f61ad4501d00a2ca4e63c8dc38b7b03703cba8d68914c6f2c6598f2f7008faee0e4b4cf4276eea6d0fb93df9188dae5b7f6db2579246363efaf9145f13206ee5b908e90eb4f6e19254a0f4fda81b31c2d3fd00e78e5b5fb5d5e51df87412a667211e121d77f3becd58d5960f9b77d8b826d4c6bce27a589f7158944441ae8fa5a297f23f0e7707f84fcbe0557976aaca9c97b99d3252a8b85b2a4ecb10d9b3cb65f6a5d75240f8bde39ed692b559c61276fe260578' );
+    		readURL( '5d00000100860200000000000000381c88cdaf8125d4569ed1e6e6c09c2fe72b7d489ad9d27ce026c849f505dd720ff335d10a9aae020d6c5ae383c1b48113253ebdf2f3ce134f3820f3c0c51fbc05ad011e6760c37538ef2510e11f33cb7080000de4c452d3fc136ece677b67088acbd792a9b5ce5df0c751f3b4524f01d0d87382a85e78d7c74a94532bf2216c7659751c13f005aa3d330478c93ec81671986980aa7fe7a7b9972d62db986e6a7786ea36ae9d56eb16d980a18602322ed6531c3174e62dc3d3ada99b0b48be05ce9e0b5dc31c6d8baf62ed660490bf621322abf89d13028ed7794077b5a072711d7aed1cb7d89d92a1a81866aad6582ae8930795aa5c0a31646d43343ed71bb6fce5230efd39c66e' );
     	}
     }
@@ Expand Down @@