Merge pull request #5623 from AnimatedRNG/webgl2-upgrade

modernizeShader and other WebGL2 changes

Source/Renderer/Context.js

@@ -269,12 +269,15 @@ define([
 
         // Query and initialize extensions
         this._standardDerivatives = !!getExtension(gl, ['OES_standard_derivatives']);
+        this._blendMinmax = !!getExtension(gl, ['EXT_blend_minmax']);
         this._elementIndexUint = !!getExtension(gl, ['OES_element_index_uint']);
         this._depthTexture = !!getExtension(gl, ['WEBGL_depth_texture', 'WEBKIT_WEBGL_depth_texture']);
         this._textureFloat = !!getExtension(gl, ['OES_texture_float']);
         this._fragDepth = !!getExtension(gl, ['EXT_frag_depth']);
         this._debugShaders = getExtension(gl, ['WEBGL_debug_shaders']);
 
+        this._colorBufferFloat = this._webgl2 && !!getExtension(gl, ['EXT_color_buffer_float']);
+
         this._s3tc = !!getExtension(gl, ['WEBGL_compressed_texture_s3tc', 'MOZ_WEBGL_compressed_texture_s3tc', 'WEBKIT_WEBGL_compressed_texture_s3tc']);
         this._pvrtc = !!getExtension(gl, ['WEBGL_compressed_texture_pvrtc', 'WEBKIT_WEBGL_compressed_texture_pvrtc']);
         this._etc1 = !!getExtension(gl, ['WEBGL_compressed_texture_etc1']);
@@ -483,7 +486,21 @@ define([
          */
         standardDerivatives : {
             get : function() {
-                return this._standardDerivatives;
+                return this._standardDerivatives || this._webgl2;
+            }
+        },
+
+        /**
+         * <code>true</code> if the EXT_blend_minmax extension is supported.  This
+         * extension extends blending capabilities by adding two new blend equations:
+         * the minimum or maximum color components of the source and destination colors.
+         * @memberof Context.prototype
+         * @type {Boolean}
+         * @see {@link https://www.khronos.org/registry/webgl/extensions/EXT_blend_minmax/}
+         */
+        blendMinmax : {
+            get : function() {
+                return this._blendMinmax || this._webgl2;
             }
         },
 
@@ -510,7 +527,7 @@ define([
          */
         depthTexture : {
             get : function() {
-                return this._depthTexture;
+                return this._depthTexture || this._webgl2;
             }
         },
 
@@ -523,7 +540,7 @@ define([
          */
         floatingPointTexture : {
             get : function() {
-                return this._textureFloat;
+                return this._textureFloat || this._colorBufferFloat;
             }
         },
 
@@ -597,7 +614,7 @@ define([
          */
         fragmentDepth : {
             get : function() {
-                return this._fragDepth;
+                return this._fragDepth || this._webgl2;
             }
         },
 
@@ -614,6 +631,20 @@ define([
             }
         },
 
+        /**
+         * <code>true</code> if the EXT_color_buffer_float extension is supported.  This
+         * extension makes the formats gl.R16F, gl.RG16F, gl.RGBA16F, gl.R32F, gl.RG32F,
+         * gl.RGBA32F, gl.R11F_G11F_B10F color renderable.
+         * @memberof Context.prototype
+         * @type {Boolean}
+         * @see {@link https://www.khronos.org/registry/webgl/extensions/EXT_color_buffer_float/}
+         */
+        colorBufferFloat : {
+            get : function() {
+                return this._colorBufferFloat;
+            }
+        },
+
         /**
          * <code>true</code> if the WEBGL_draw_buffers extension is supported. This
          * extensions provides support for multiple render targets. The framebuffer object can have mutiple
@@ -1076,7 +1107,8 @@ define([
             }),
             uniformMap : overrides.uniformMap,
             owner : overrides.owner,
-            framebuffer : overrides.framebuffer
+            framebuffer : overrides.framebuffer,
+            pass : overrides.pass
         });
     };
 

Source/Renderer/RenderState.js

@@ -21,7 +21,9 @@ define([
     function validateBlendEquation(blendEquation) {
         return ((blendEquation === WebGLConstants.FUNC_ADD) ||
                 (blendEquation === WebGLConstants.FUNC_SUBTRACT) ||
-                (blendEquation === WebGLConstants.FUNC_REVERSE_SUBTRACT));
+                (blendEquation === WebGLConstants.FUNC_REVERSE_SUBTRACT) ||
+                (blendEquation === WebGLConstants.MIN) ||
+                (blendEquation === WebGLConstants.MAX));
     }
 
     function validateBlendFunction(blendFunction) {

Source/Renderer/ShaderCache.js

@@ -96,8 +96,8 @@ define([
             });
         }
 
-        var vertexShaderText = vertexShaderSource.createCombinedVertexShader();
-        var fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader();
+        var vertexShaderText = vertexShaderSource.createCombinedVertexShader(this._context);
+        var fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader(this._context);
 
         var keyword = vertexShaderText + fragmentShaderText + JSON.stringify(attributeLocations);
         var cachedShader;
@@ -169,10 +169,11 @@ define([
             });
         }
 
-        var vertexShaderText = vertexShaderSource.createCombinedVertexShader();
-        var fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader();
-
         var context = this._context;
+
+        var vertexShaderText = vertexShaderSource.createCombinedVertexShader(context);
+        var fragmentShaderText = fragmentShaderSource.createCombinedFragmentShader(context);
+
         var derivedShaderProgram = new ShaderProgram({
             gl : context._gl,
             logShaderCompilation : context.logShaderCompilation,

Source/Renderer/ShaderSource.js

@@ -2,12 +2,14 @@ define([
         '../Core/defaultValue',
         '../Core/defined',
         '../Core/DeveloperError',
+        '../Renderer/modernizeShader',
         '../Shaders/Builtin/CzmBuiltins',
         './AutomaticUniforms'
     ], function(
         defaultValue,
         defined,
         DeveloperError,
+        modernizeShader,
         CzmBuiltins,
         AutomaticUniforms) {
     'use strict';
@@ -151,7 +153,7 @@ define([
         return builtinsSource.replace(root.glslSource, '');
     }
 
-    function combineShader(shaderSource, isFragmentShader) {
+    function combineShader(shaderSource, isFragmentShader, context) {
         var i;
         var length;
 
@@ -186,6 +188,17 @@ define([
             return '\n';
         });
 
+        // Extract shader extensions from sources
+        var extensions = [];
+        combinedSources = combinedSources.replace(/#extension.*\n/gm, function(match) {
+            // Extract extension to put at the top
+            extensions.push(match);
+
+            // Replace original #extension directive with a new line so the line numbers
+            // are not off by one.
+            return '\n';
+        });
+
         // Remove precision qualifier
         combinedSources = combinedSources.replace(/precision\s(lowp|mediump|highp)\s(float|int);/, '');
 
@@ -204,6 +217,11 @@ define([
             result = '#version ' + version + '\n';
         }
 
+        var extensionsLength = extensions.length;
+        for (i = 0; i < extensionsLength; i++) {
+            result += extensions[i];
+        }
+
         if (isFragmentShader) {
             result += '\
 #ifdef GL_FRAGMENT_PRECISION_HIGH\n\
@@ -224,6 +242,12 @@ define([
             }
         }
 
+        // GLSLModernizer inserts its own layout qualifiers
+        // at this position in the source
+        if (context.webgl2) {
+            result += '#define OUTPUT_DECLARATION\n\n';
+        }
+
         // append built-ins
         if (shaderSource.includeBuiltIns) {
             result += getBuiltinsAndAutomaticUniforms(combinedSources);
@@ -235,6 +259,11 @@ define([
         // append actual source
         result += combinedSources;
 
+        // modernize the source
+        if (context.webgl2) {
+            result = modernizeShader(result, isFragmentShader, true);
+        }
+
         return result;
     }
 
@@ -297,19 +326,23 @@ define([
     /**
      * Create a single string containing the full, combined vertex shader with all dependencies and defines.
      *
+     * @param {Context} context The current rendering context
+     *
      * @returns {String} The combined shader string.
      */
-    ShaderSource.prototype.createCombinedVertexShader = function() {
-        return combineShader(this, false);
+    ShaderSource.prototype.createCombinedVertexShader = function(context) {
+        return combineShader(this, false, context);
     };
 
     /**
      * Create a single string containing the full, combined fragment shader with all dependencies and defines.
      *
+     * @param {Context} context The current rendering context
+     *
      * @returns {String} The combined shader string.
      */
-    ShaderSource.prototype.createCombinedFragmentShader = function() {
-        return combineShader(this, true);
+    ShaderSource.prototype.createCombinedFragmentShader = function(context) {
+        return combineShader(this, true, context);
     };
 
     /**

Source/Renderer/Texture.js

@@ -71,6 +71,23 @@ define([
                     internalFormat = WebGLConstants.DEPTH_COMPONENT24;
                 }
             }
+
+            if (pixelDatatype === PixelDatatype.FLOAT) {
+                switch (pixelFormat) {
+                    case PixelFormat.RGBA:
+                        internalFormat = WebGLConstants.RGBA32F;
+                        break;
+                    case PixelFormat.RGB:
+                        internalFormat = WebGLConstants.RGB32F;
+                        break;
+                    case PixelFormat.RG:
+                        internalFormat = WebGLConstants.RG32F;
+                        break;
+                    case PixelFormat.R:
+                        internalFormat = WebGLConstants.R32F;
+                        break;
+                }
+            }
         }
 
         //>>includeStart('debug', pragmas.debug);