Disable GL_OES_standard_derivatives when ps_2_x or later is not available.

src/libGLESv2/Context.cpp

@@ -259,7 +259,7 @@ void Context::makeCurrent(egl::Surface *surface)
         mSupportsLuminanceAlphaTextures = mRenderer->getLuminanceAlphaTextureSupport();
         mSupportsDepthTextures = mRenderer->getDepthTextureSupport();
         mSupportsTextureFilterAnisotropy = mRenderer->getTextureFilterAnisotropySupport();
-
+        mSupportsDerivativeInstructions = mRenderer->getDerivativeInstructionSupport();
         mSupports32bitIndices = mRenderer->get32BitIndexSupport();
 
         mNumCompressedTextureFormats = 0;
@@ -2266,6 +2266,11 @@ bool Context::supportsTextureFilterAnisotropy() const
     return mSupportsTextureFilterAnisotropy;
 }
 
+bool Context::supportsDerivativeInstructions() const
+{
+    return mSupportsDerivativeInstructions;
+}
+
 float Context::getTextureMaxAnisotropy() const
 {
     return mMaxTextureAnisotropy;
@@ -2504,7 +2509,10 @@ void Context::initExtensionString()
     mExtensionString += "GL_OES_packed_depth_stencil ";
     mExtensionString += "GL_OES_get_program_binary ";
     mExtensionString += "GL_OES_rgb8_rgba8 ";
-    mExtensionString += "GL_OES_standard_derivatives ";
+    if (supportsDerivativeInstructions())
+    {
+        mExtensionString += "GL_OES_standard_derivatives ";
+    }
 
     if (supportsFloat16Textures())
     {

src/libGLESv2/Context.h

@@ -409,6 +409,7 @@ class Context
     bool supportsNonPower2Texture() const;
     bool supportsInstancing() const;
     bool supportsTextureFilterAnisotropy() const;
+    bool supportsDerivativeInstructions() const;
 
     bool getCurrentReadFormatType(GLenum *format, GLenum *type);
 
@@ -515,6 +516,7 @@ class Context
     bool mSupportsDepthTextures;
     bool mSupports32bitIndices;
     bool mSupportsTextureFilterAnisotropy;
+    bool mSupportsDerivativeInstructions;
     int mNumCompressedTextureFormats;
 
     ResourceManager *mResourceManager;

src/libGLESv2/Shader.cpp

@@ -240,7 +240,7 @@ void Shader::initializeCompiler()
             resources.MaxTextureImageUnits = MAX_TEXTURE_IMAGE_UNITS;
             resources.MaxFragmentUniformVectors = context->getMaximumFragmentUniformVectors();
             resources.MaxDrawBuffers = MAX_DRAW_BUFFERS;
-            resources.OES_standard_derivatives = 1;
+            resources.OES_standard_derivatives = context->supportsDerivativeInstructions() ? 1 : 0;
             // resources.OES_EGL_image_external = getDisplay()->getRenderer()->getShareHandleSupport() ? 1 : 0; // TODO: commented out until the extension is actually supported.
 
             mFragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_GLES2_SPEC, SH_HLSL_OUTPUT, &resources);

src/libGLESv2/renderer/Renderer.h

@@ -150,6 +150,7 @@ class Renderer
     virtual bool getTextureFilterAnisotropySupport() const = 0;
     virtual float getTextureMaxAnisotropy() const = 0;
     virtual bool getShareHandleSupport() const = 0;
+    virtual bool getDerivativeInstructionSupport() const = 0;
 
     virtual int getMajorShaderModel() const = 0;
     virtual float getMaxPointSize() const = 0;

src/libGLESv2/renderer/Renderer11.cpp

@@ -1414,6 +1414,13 @@ bool Renderer11::getShareHandleSupport() const
     return false && !gl::perfActive();
 }
 
+bool Renderer11::getDerivativeInstructionSupport() const
+{
+    // TODO
+    // UNIMPLEMENTED();
+    return false;
+}
+
 int Renderer11::getMajorShaderModel() const
 {
     switch (mFeatureLevel)

src/libGLESv2/renderer/Renderer11.h

@@ -105,6 +105,7 @@ class Renderer11 : public Renderer
     virtual bool getTextureFilterAnisotropySupport() const;
     virtual float getTextureMaxAnisotropy() const;
     virtual bool getShareHandleSupport() const;
+    virtual bool getDerivativeInstructionSupport() const;
 
     virtual int getMajorShaderModel() const;
     virtual float getMaxPointSize() const;

src/libGLESv2/renderer/Renderer9.cpp

@@ -2211,6 +2211,11 @@ bool Renderer9::getShareHandleSupport() const
     return (mD3d9Ex != NULL) && !gl::perfActive();
 }
 
+bool Renderer9::getDerivativeInstructionSupport() const
+{
+    return (mDeviceCaps.PS20Caps.Caps & D3DPS20CAPS_GRADIENTINSTRUCTIONS) != 0;
+}
+
 int Renderer9::getMajorShaderModel() const
 {
     return D3DSHADER_VERSION_MAJOR(mDeviceCaps.PixelShaderVersion);

src/libGLESv2/renderer/Renderer9.h

@@ -130,6 +130,7 @@ class Renderer9 : public Renderer
     virtual bool getTextureFilterAnisotropySupport() const;
     virtual float getTextureMaxAnisotropy() const;
     virtual bool getShareHandleSupport() const;
+    virtual bool getDerivativeInstructionSupport() const;
 
     virtual int getMajorShaderModel() const;
     virtual float getMaxPointSize() const;