Changeset 148992 in webkit

Timestamp:

Apr 23, 2013 2:18:36 PM (11 years ago)

Author:

krit@webkit.org

Message:

Pick up color and mat values in custom shaders
​https://bugs.webkit.org/show_bug.cgi?id=115046

Reviewed by Dean Jackson.

Source/WebCore:

The custom filter functions accept color values and mat2-4 functions
as parameter types. These were implemented in CSS already.
This patch picks up the values and applies them as uniforms to the
custom shader program.

Tests: css3/filters/custom/custom-filter-color.html

css3/filters/custom/custom-filter-matN.html

• platform/graphics/filters/CustomFilterRenderer.cpp:

(WebCore::CustomFilterRenderer::bindProgramColorParameters): Set uniform for color values.
(WebCore):
(WebCore::CustomFilterRenderer::bindProgramMatrixParameters): Set uniform for mat2-4 values.
(WebCore::CustomFilterRenderer::bindProgramParameters): Call color and matrix functions.

• platform/graphics/filters/CustomFilterRenderer.h:

(WebCore):
(CustomFilterRenderer):

LayoutTests:

Test that the CSS defined color values and mat2-4 functions get
set as uniforms in shader programs.

• css3/filters/custom/custom-filter-color-expected.html: Added.
• css3/filters/custom/custom-filter-color.html: Added.
• css3/filters/custom/custom-filter-matN-expected.html: Added.
• css3/filters/custom/custom-filter-matN.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/custom/custom-filter-color-expected.html (added)
• LayoutTests/css3/filters/custom/custom-filter-color.html (added)
• LayoutTests/css3/filters/custom/custom-filter-matN-expected.html (added)
• LayoutTests/css3/filters/custom/custom-filter-matN.html (added)
• LayoutTests/css3/filters/resources/fragment-colors.fs (added)
• LayoutTests/css3/filters/resources/fragment-matN.fs (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/CustomFilterRenderer.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/filters/CustomFilterRenderer.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-23  Dirk Schulze  <krit@webkit.org>
+
+        Pick up color and mat values in custom shaders
+        https://bugs.webkit.org/show_bug.cgi?id=115046
+
+        Reviewed by Dean Jackson.
+
+        Test that the CSS defined color values and mat2-4 functions get 
+        set as uniforms in shader programs.
+
+        * css3/filters/custom/custom-filter-color-expected.html: Added.
+        * css3/filters/custom/custom-filter-color.html: Added.
+        * css3/filters/custom/custom-filter-matN-expected.html: Added.
+        * css3/filters/custom/custom-filter-matN.html: Added.
+
 2013-04-23  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-23  Dirk Schulze  <krit@webkit.org>
+
+        Pick up color and mat values in custom shaders
+        https://bugs.webkit.org/show_bug.cgi?id=115046
+
+        Reviewed by Dean Jackson.
+
+        The custom filter functions accept color values and mat2-4 functions
+        as parameter types. These were implemented in CSS already.
+        This patch picks up the values and applies them as uniforms to the
+        custom shader program. 
+
+        Tests: css3/filters/custom/custom-filter-color.html
+               css3/filters/custom/custom-filter-matN.html
+
+        * platform/graphics/filters/CustomFilterRenderer.cpp:
+        (WebCore::CustomFilterRenderer::bindProgramColorParameters): Set uniform for color values.
+        (WebCore):
+        (WebCore::CustomFilterRenderer::bindProgramMatrixParameters): Set uniform for mat2-4 values.
+        (WebCore::CustomFilterRenderer::bindProgramParameters): Call color and matrix functions.
+        * platform/graphics/filters/CustomFilterRenderer.h:
+        (WebCore):
+        (CustomFilterRenderer):
+
 2013-04-23  Jacky Jiang  <zhajiang@blackberry.com>
 

trunk/Source/WebCore/platform/graphics/filters/CustomFilterRenderer.cpp

@@ -36 +36 @@
 
 #include "CustomFilterArrayParameter.h"
+#include "CustomFilterColorParameter.h"
 #include "CustomFilterCompiledProgram.h"
 #include "CustomFilterConstants.h"
@@ -160 +161 @@
 
     m_context->uniform1fv(uniformLocation, parameterSize, floatVector.data());
+}
+
+void CustomFilterRenderer::bindProgramColorParameters(int uniformLocation, CustomFilterColorParameter* colorParameter)
+{
+    float r, g, b, a;
+    colorParameter->color().getRGBA(r, g, b, a);
+
+    m_context->uniform4f(uniformLocation, r, g, b, a);
+}
+
+void CustomFilterRenderer::bindProgramMatrixParameters(int uniformLocation, CustomFilterArrayParameter* matrixParameter)
+{
+    unsigned parameterSize = matrixParameter->size();
+    Vector<GC3Dfloat, 16> floatVector;
+
+    for (unsigned i = 0; i < parameterSize; ++i)
+        floatVector.append(matrixParameter->valueAt(i));
+
+    switch (parameterSize) {
+    case 4:
+        m_context->uniformMatrix2fv(uniformLocation, 1, false, floatVector.data());
+        break;
+    case 9:
+        m_context->uniformMatrix3fv(uniformLocation, 1, false, floatVector.data());
+        break;
+    case 16:
+        m_context->uniformMatrix4fv(uniformLocation, 1, false, floatVector.data());
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
 }
 
@@ -217 +249 @@
             break;
         case CustomFilterParameter::COLOR:        
+            bindProgramColorParameters(uniformLocation, static_cast<CustomFilterColorParameter*>(parameter));
+            break;
         case CustomFilterParameter::MATRIX:
-            // FIXME: Bind color and matrix to context.
+            bindProgramMatrixParameters(uniformLocation, static_cast<CustomFilterArrayParameter*>(parameter));
             break;
         case CustomFilterParameter::NUMBER:

trunk/Source/WebCore/platform/graphics/filters/CustomFilterRenderer.h

@@ -45 +45 @@
 
 class CustomFilterArrayParameter;
+class CustomFilterColorParameter;
 class CustomFilterCompiledProgram;
 class CustomFilterMesh;
@@ -77 +78 @@
     void unbindVertexAttribute(int attributeLocation);
     void bindProgramArrayParameters(int uniformLocation, CustomFilterArrayParameter*);
+    void bindProgramColorParameters(int uniformLocation, CustomFilterColorParameter*);
+    void bindProgramMatrixParameters(int uniformLocation, CustomFilterArrayParameter*);
     void bindProgramNumberParameters(int uniformLocation, CustomFilterNumberParameter*);
     void bindProgramTransformParameter(int uniformLocation, CustomFilterTransformParameter*);