Update the format table to check support for filtering and rendering.

src/libGLESv2/Caps.h

@@ -36,11 +36,18 @@ struct TextureCaps
 class TextureCapsMap
 {
   public:
+    typedef std::unordered_map<GLenum, TextureCaps>::const_iterator const_iterator;
+
     void insert(GLenum internalFormat, const TextureCaps &caps);
     void remove(GLenum internalFormat);
 
     const TextureCaps &get(GLenum internalFormat) const;
 
+    const_iterator begin() const;
+    const_iterator end() const;
+
+    size_t size() const;
+
   private:
     typedef std::unordered_map<GLenum, TextureCaps> InternalFormatToCapsMap;
     InternalFormatToCapsMap mCapsMap;
@@ -51,7 +58,7 @@ struct Extensions
     Extensions();
 
     // Generate a vector of supported extension strings
-    std::vector<std::string> getStrings(GLuint clientVersion) const;
+    std::vector<std::string> getStrings() const;
 
     // Set all texture related extension support based on the supported textures.
     // Determines support for:

src/libGLESv2/Context.cpp

@@ -44,9 +44,7 @@ Context::Context(int clientVersion, const gl::Context *shareContext, rx::Rendere
 {
     ASSERT(robustAccess == false);   // Unimplemented
 
-    mCaps = mRenderer->getRendererCaps();
-    mTextureCaps = mRenderer->getRendererTextureCaps();
-    mExtensions = mRenderer->getRendererExtensions();
+    initCaps(clientVersion);
 
     mClientVersion = clientVersion;
 
@@ -2329,7 +2327,7 @@ const std::string &Context::getRendererString() const
 
 void Context::initExtensionStrings()
 {
-    mExtensionStrings = mExtensions.getStrings(mClientVersion);
+    mExtensionStrings = mExtensions.getStrings();
 
     std::ostringstream combinedStringStream;
     std::copy(mExtensionStrings.begin(), mExtensionStrings.end(), std::ostream_iterator<std::string>(combinedStringStream, " "));
@@ -2508,6 +2506,40 @@ bool Context::hasMappedBuffer(GLenum target) const
     return false;
 }
 
+void Context::initCaps(GLuint clientVersion)
+{
+    mCaps = mRenderer->getRendererCaps();
+
+    mExtensions = mRenderer->getRendererExtensions();
+
+    if (clientVersion < 3)
+    {
+        // Disable ES3+ extensions
+        mExtensions.colorBufferFloat = false;
+    }
+
+    if (clientVersion > 2)
+    {
+        // FIXME(geofflang): Don't support EXT_sRGB in non-ES2 contexts
+        //mExtensions.sRGB = false;
+    }
+
+    const TextureCapsMap &rendererFormats = mRenderer->getRendererTextureCaps();
+    for (TextureCapsMap::const_iterator i = rendererFormats.begin(); i != rendererFormats.end(); i++)
+    {
+        GLenum format = i->first;
+        TextureCaps formatCaps = i->second;
+
+        if (formatCaps.texturable && IsValidInternalFormat(format, mExtensions, clientVersion))
+        {
+            // Update the format caps based on the client version and extensions
+            formatCaps.renderable = IsRenderingSupported(format, mExtensions, clientVersion);
+            formatCaps.filterable = IsFilteringSupported(format, mExtensions, clientVersion);
+            mTextureCaps.insert(format, formatCaps);
+        }
+    }
+}
+
 }
 
 extern "C"

src/libGLESv2/Context.h

@@ -278,6 +278,8 @@ class Context
 
     size_t getBoundFramebufferTextureSerials(FramebufferTextureSerialArray *outSerialArray);
 
+    void initCaps(GLuint clientVersion);
+
     // Caps to use for validation
     Caps mCaps;
     TextureCapsMap mTextureCaps;

src/libGLESv2/formatutils.h

@@ -45,6 +45,9 @@ bool IsValidType(GLenum type, const Extensions &extensions, GLuint clientVersion
 bool IsValidFormatCombination(GLenum internalFormat, GLenum format, GLenum type, const Extensions &extensions, GLuint clientVersion);
 bool IsValidCopyTexImageCombination(GLenum textureInternalFormat, GLenum frameBufferInternalFormat, GLuint readBufferHandle, GLuint clientVersion);
 
+bool IsRenderingSupported(GLenum internalFormat, const Extensions &extensions, GLuint clientVersion);
+bool IsFilteringSupported(GLenum internalFormat, const Extensions &extensions, GLuint clientVersion);
+
 bool IsSizedInternalFormat(GLenum internalFormat);
 GLenum GetSizedInternalFormat(GLenum format, GLenum type);