Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1297)

Unified Diff: Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp

Issue 106503003: Changed GL enums from GraphicsContext3D to standard versions (Take 2) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp
diff --git a/Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp b/Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp
index 5284a9100ebe5b831639b83bf35ed71e2c5846eb..2e5d853dcc93560949e97645d59311b93829d57b 100644
--- a/Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp
+++ b/Source/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp
@@ -50,11 +50,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 +82,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 +101,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
« no previous file with comments | « Source/platform/graphics/ImageBuffer.cpp ('k') | Source/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698