Changeset 122189 in webkit

Timestamp:

Jul 9, 2012 8:27:37 PM (12 years ago)

Author:

Alexandru Chiculita

Message:

[CSS Shaders] The FECustomFilter is not making the GL context active
​https://bugs.webkit.org/show_bug.cgi?id=90840

Reviewed by Dean Jackson.

I've added a couple of makeContextCurrent() in the FECustomFilter related classes.
Also, removed the assumption that GraphicsContext3D::create() never returns 0.

No new tests, this was crashing on existing tests.

• platform/graphics/filters/CustomFilterCompiledProgram.cpp:

(WebCore::CustomFilterCompiledProgram::CustomFilterCompiledProgram):
(WebCore::CustomFilterCompiledProgram::~CustomFilterCompiledProgram):

• platform/graphics/filters/CustomFilterGlobalContext.cpp:

(WebCore::CustomFilterGlobalContext::prepareContextIfNeeded):

• platform/graphics/filters/CustomFilterMesh.cpp:

(WebCore::CustomFilterMesh::CustomFilterMesh):
(WebCore::CustomFilterMesh::~CustomFilterMesh):

• platform/graphics/filters/FECustomFilter.cpp:

(WebCore::FECustomFilter::deleteRenderBuffers):
(WebCore::FECustomFilter::platformApplySoftware):
(WebCore::FECustomFilter::initializeContext):

• platform/graphics/filters/FECustomFilter.h:

(FECustomFilter):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/CustomFilterCompiledProgram.cpp (modified) (2 diffs)
• platform/graphics/filters/CustomFilterGlobalContext.cpp (modified) (1 diff)
• platform/graphics/filters/CustomFilterMesh.cpp (modified) (2 diffs)
• platform/graphics/filters/FECustomFilter.cpp (modified) (4 diffs)
• platform/graphics/filters/FECustomFilter.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-09  Alexandru Chiculita  <achicu@adobe.com>
+
+        [CSS Shaders] The FECustomFilter is not making the GL context active
+        https://bugs.webkit.org/show_bug.cgi?id=90840
+
+        Reviewed by Dean Jackson.
+
+        I've added a couple of makeContextCurrent() in the FECustomFilter related classes.
+        Also, removed the assumption that GraphicsContext3D::create() never returns 0.
+
+        No new tests, this was crashing on existing tests.
+
+        * platform/graphics/filters/CustomFilterCompiledProgram.cpp:
+        (WebCore::CustomFilterCompiledProgram::CustomFilterCompiledProgram):
+        (WebCore::CustomFilterCompiledProgram::~CustomFilterCompiledProgram):
+        * platform/graphics/filters/CustomFilterGlobalContext.cpp:
+        (WebCore::CustomFilterGlobalContext::prepareContextIfNeeded):
+        * platform/graphics/filters/CustomFilterMesh.cpp:
+        (WebCore::CustomFilterMesh::CustomFilterMesh):
+        (WebCore::CustomFilterMesh::~CustomFilterMesh):
+        * platform/graphics/filters/FECustomFilter.cpp:
+        (WebCore::FECustomFilter::deleteRenderBuffers):
+        (WebCore::FECustomFilter::platformApplySoftware):
+        (WebCore::FECustomFilter::initializeContext):
+        * platform/graphics/filters/FECustomFilter.h:
+        (FECustomFilter):
+
 2012-07-09  Kent Tamura  <tkent@chromium.org>
 

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

@@ -88 +88 @@
     , m_isInitialized(false)
 {
+    m_context->makeContextCurrent();
+    
     Platform3DObject vertexShader = compileShader(GraphicsContext3D::VERTEX_SHADER, m_vertexShaderString);
     if (!vertexShader)
@@ -172 +174 @@
 CustomFilterCompiledProgram::~CustomFilterCompiledProgram()
 {
-    if (m_program)
+    if (m_program) {
+        m_context->makeContextCurrent();
         m_context->deleteProgram(m_program);
+    }
 }
 

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

@@ -54 +54 @@
     attributes.premultipliedAlpha = false;
     m_context = GraphicsContext3D::create(attributes, hostWindow, GraphicsContext3D::RenderOffscreen);
-
+    if (!m_context)
+        return;
+    m_context->makeContextCurrent();
     m_context->enable(GraphicsContext3D::DEPTH_TEST);
 }

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

@@ -246 +246 @@
     m_bytesPerVertex = generator.floatsPerVertex() * sizeof(float);    
 
+    m_context->makeContextCurrent();
+
     m_verticesBufferObject = m_context->createBuffer();
     m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_verticesBufferObject);
@@ -257 +259 @@
 CustomFilterMesh::~CustomFilterMesh()
 {
+    m_context->makeContextCurrent();
     m_context->deleteBuffer(m_verticesBufferObject);
     m_context->deleteBuffer(m_elementsBufferObject);

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

@@ -104 +104 @@
 void FECustomFilter::deleteRenderBuffers()
 {
+    if (!m_context)
+        return;
+    m_context->makeContextCurrent();
     if (m_frameBuffer) {
         m_context->deleteFramebuffer(m_frameBuffer);
@@ -130 +133 @@
     IntSize newContextSize(effectDrawingRect.size());
     bool hadContext = m_context;
-    if (!m_context)
-        initializeContext();
+    if (!m_context && !initializeContext())
+        return;
+    m_context->makeContextCurrent();
     
     if (!hadContext || m_contextSize != newContextSize)
@@ -158 +162 @@
 }
 
-void FECustomFilter::initializeContext()
+bool FECustomFilter::initializeContext()
 {
     ASSERT(!m_context.get());
-    ASSERT(m_globalContext->context());
     m_context = m_globalContext->context();
+    if (!m_context)
+        return false;
+    m_context->makeContextCurrent();
     
     // FIXME: The shader and the mesh can be shared across multiple elements when possible.
@@ -175 +181 @@
                                       FloatRect(0, 0, 1, 1),
                                       m_meshType);
+    return true;
 }
 

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

@@ -73 +73 @@
     ~FECustomFilter();
     
-    void initializeContext();
+    bool initializeContext();
     void deleteRenderBuffers();
     void resizeContext(const IntSize& newContextSize);