Chromium Code Reviews| Index: Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp |
| diff --git a/Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp b/Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp |
| index 99077fa2e57740a5dc098d8e6b6372217bf6d19f..01863c80b347bfa7f6b3e5c0a7c962c2ef0b7034 100644 |
| --- a/Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp |
| +++ b/Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp |
| @@ -29,6 +29,7 @@ |
| #include "config.h" |
| #include "core/platform/graphics/filters/custom/CustomFilterCompiledProgram.h" |
| +#include "third_party/khronos/GLES2/gl2.h" |
|
Ken Russell (switch to Gerrit)
2013/12/06 23:45:20
This #include should be unnecessary. GraphicsConte
|
| namespace WebCore { |
| @@ -50,11 +51,11 @@ CustomFilterCompiledProgram::CustomFilterCompiledProgram(PassRefPtr<GraphicsCont |
| { |
| m_context->makeContextCurrent(); |
| - Platform3DObject vertexShader = compileShader(GraphicsContext3D::VERTEX_SHADER, validatedVertexShader); |
| + Platform3DObject vertexShader = compileShader(GL_VERTEX_SHADER, validatedVertexShader); |
| if (!vertexShader) |
| return; |
| - Platform3DObject fragmentShader = compileShader(GraphicsContext3D::FRAGMENT_SHADER, validatedFragmentShader); |
| + Platform3DObject fragmentShader = compileShader(GL_FRAGMENT_SHADER, validatedFragmentShader); |
| if (!fragmentShader) { |
| m_context->deleteShader(vertexShader); |
| return; |
| @@ -82,7 +83,7 @@ Platform3DObject CustomFilterCompiledProgram::compileShader(GC3Denum shaderType, |
| m_context->compileShader(shader); |
| int compiled = 0; |
| - m_context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compiled); |
| + m_context->getShaderiv(shader, GL_COMPILE_STATUS, &compiled); |
| if (!compiled) { |
| // FIXME: This is an invalid shader. Throw some errors. |
| // https://bugs.webkit.org/show_bug.cgi?id=74416 |
| @@ -101,7 +102,7 @@ Platform3DObject CustomFilterCompiledProgram::linkProgram(Platform3DObject verte |
| m_context->linkProgram(program); |
| int linked = 0; |
| - m_context->getProgramiv(program, GraphicsContext3D::LINK_STATUS, &linked); |
| + m_context->getProgramiv(program, GL_LINK_STATUS, &linked); |
| if (!linked) { |
| // FIXME: Invalid vertex/fragment shader combination. Throw some errors here. |
| // https://bugs.webkit.org/show_bug.cgi?id=74416 |