Changeset 111986 in webkit

Timestamp:

Mar 24, 2012 1:37:51 AM (12 years ago)

Author:

zeno.albisser@nokia.com

Message:

[Qt][WK2] Make TextureMapperShaderManager::getShaderProgram() not be a template.
​https://bugs.webkit.org/show_bug.cgi?id=82049

Change the getShaderProgram() function to not be a template.
This is a workaround for a compiler bug that leads to an assert
when compiling in debug mode on mac.

Reviewed by Noam Rosenthal.

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGL::drawTexture):
(WebCore::TextureMapperGL::beginClip):

• platform/graphics/texmap/TextureMapperShaderManager.h:

(TextureMapperShaderProgram):
(WebCore::TextureMapperShaderManager::getShaderProgram):
(TextureMapperShaderManager):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.cpp (modified) (2 diffs)
• platform/graphics/texmap/TextureMapperShaderManager.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-24  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt][WK2] Make TextureMapperShaderManager::getShaderProgram() not be a template.
+        https://bugs.webkit.org/show_bug.cgi?id=82049
+
+        Change the getShaderProgram() function to not be a template.
+        This is a workaround for a compiler bug that leads to an assert
+        when compiling in debug mode on mac.
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGL::drawTexture):
+        (WebCore::TextureMapperGL::beginClip):
+        * platform/graphics/texmap/TextureMapperShaderManager.h:
+        (TextureMapperShaderProgram):
+        (WebCore::TextureMapperShaderManager::getShaderProgram):
+        (TextureMapperShaderManager):
+
 2012-03-23  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

@@ -320 +320 @@
     RefPtr<TextureMapperShaderProgram> shaderInfo;
     if (maskTexture)
-        shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram<TextureMapperShaderProgramOpacityAndMask>();
+        shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram(TextureMapperShaderManager::OpacityAndMask);
     else
-        shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram<TextureMapperShaderProgramSimple>();
+        shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram(TextureMapperShaderManager::Simple);
 
     GL_CMD(glUseProgram(shaderInfo->id()))
@@ -625 +625 @@
     data().initializeStencil();
 
-    RefPtr<TextureMapperShaderProgramSimple> shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram<TextureMapperShaderProgramSimple>();
+    RefPtr<TextureMapperShaderProgram> shaderInfo = data().sharedGLData().textureMapperShaderManager.getShaderProgram(TextureMapperShaderManager::Simple);
 
     GL_CMD(glUseProgram(shaderInfo->id()))

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h

@@ -34 +34 @@
 namespace WebCore {
 
-typedef void* ShaderType;
-
 class BitmapTexture;
 class TextureMapperShaderManager;
@@ -45 +43 @@
 
     virtual ~TextureMapperShaderProgram();
-
-    template<class T>
-    static ShaderType shaderType()
-    {
-        static int type = 0;
-        return &type;
-    }
 
     virtual void prepare(float opacity, const BitmapTexture*) { }
@@ -102 +93 @@
 class TextureMapperShaderManager {
 public:
+    enum ShaderType {
+        Invalid = 0, // HashMaps do not like 0 as a key.
+        Simple,
+        OpacityAndMask
+    };
+
     TextureMapperShaderManager();
     virtual ~TextureMapperShaderManager();
 
-    template<class T>
-    PassRefPtr<T> getShaderProgram()
+    PassRefPtr<TextureMapperShaderProgram> getShaderProgram(ShaderType shaderType)
     {
-        ShaderType shaderType = TextureMapperShaderProgram::shaderType<T>();
+        RefPtr<TextureMapperShaderProgram> program;
+        if (shaderType == Invalid)
+            return program;
+
         TextureMapperShaderProgramMap::iterator it = m_textureMapperShaderProgramMap.find(shaderType);
-        if (it != m_textureMapperShaderProgramMap.end())
-            return static_cast<T*>(it->second.get());
-
-        RefPtr<T> t = T::create();
-        m_textureMapperShaderProgramMap.add(shaderType, t);
-        return t;
+        switch (shaderType) {
+        case Simple:
+            program = TextureMapperShaderProgramSimple::create();
+            break;
+        case OpacityAndMask:
+            program = TextureMapperShaderProgramOpacityAndMask::create();
+            break;
+        }
+        m_textureMapperShaderProgramMap.add(shaderType, program);
+        return program;
     }
 
 private:
-    typedef HashMap<ShaderType, RefPtr<TextureMapperShaderProgram> > TextureMapperShaderProgramMap;
+    typedef HashMap<ShaderType, RefPtr<TextureMapperShaderProgram>, DefaultHash<int>::Hash, HashTraits<int> > TextureMapperShaderProgramMap;
     TextureMapperShaderProgramMap m_textureMapperShaderProgramMap;
 };