diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/filters/FECustomFilter.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/filters/FECustomFilter.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/filters/FECustomFilter.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp b/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp index fb5760f0b..707edb866 100644 --- a/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp +++ b/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp @@ -35,6 +35,7 @@ #include "CustomFilterArrayParameter.h" #include "CustomFilterCompiledProgram.h" +#include "CustomFilterConstants.h" #include "CustomFilterGlobalContext.h" #include "CustomFilterMesh.h" #include "CustomFilterNumberParameter.h" @@ -224,7 +225,7 @@ bool FECustomFilter::programNeedsInputTexture() const bool FECustomFilter::applyShader() { - Uint8ClampedArray* dstPixelArray = createUnmultipliedImageResult(); + Uint8ClampedArray* dstPixelArray = m_validatedProgram->programInfo().programType() == PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE ? createPremultipliedImageResult() : createUnmultipliedImageResult(); if (!dstPixelArray) return false; @@ -299,7 +300,8 @@ bool FECustomFilter::createMultisampleBuffer() m_triedMultisampleBuffer = true; Extensions3D* extensions = m_context->getExtensions(); - if (!extensions + if (!extensions + || !extensions->maySupportMultisampling() || !extensions->supports("GL_ANGLE_framebuffer_multisample") || !extensions->supports("GL_ANGLE_framebuffer_blit") || !extensions->supports("GL_OES_rgb8_rgba8")) @@ -569,18 +571,6 @@ void FECustomFilter::bindProgramAndBuffers(Platform3DObject inputTexture) m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_mesh->verticesBufferObject()); m_context->bindBuffer(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, m_mesh->elementsBufferObject()); - // FIXME: Ideally, these should be public members of CustomFilterMesh. - // https://bugs.webkit.org/show_bug.cgi?id=94755 - static const unsigned PositionAttribSize = 4; - static const unsigned TexAttribSize = 2; - static const unsigned MeshAttribSize = 2; - static const unsigned TriangleAttribSize = 3; - - static const unsigned PositionAttribOffset = 0; - static const unsigned TexAttribOffset = PositionAttribOffset + PositionAttribSize * sizeof(float); - static const unsigned MeshAttribOffset = TexAttribOffset + TexAttribSize * sizeof(float); - static const unsigned TriangleAttribOffset = MeshAttribOffset + MeshAttribSize * sizeof(float); - bindVertexAttribute(m_compiledProgram->positionAttribLocation(), PositionAttribSize, PositionAttribOffset); bindVertexAttribute(m_compiledProgram->texAttribLocation(), TexAttribSize, TexAttribOffset); // FIXME: Get rid of the internal tex coord attribute "css_a_texCoord". |