Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp - Issue 93873009: Moved GL enums from GraphicsContext3D to a more generic location.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp

Issue 93873009: Moved GL enums from GraphicsContext3D to a more generic location. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Changed over to use the standard GL headers and enums. Also fixed some minor style issues. 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

« Source/core/platform/graphics/GraphicsContext3D.h ('K') | « Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp ('k') | Source/core/platform/graphics/filters/custom/CustomFilterProgram.cpp » ('j') | Source/core/platform/graphics/filters/custom/CustomFilterProgram.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp

diff --git a/Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp b/Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp

index b18d65b1a4aa16514c1ac190f7ef1d36b9ec8831..2fb238f5697f40d5c3af35a2e0880238bd5df747 100644

--- a/Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp

+++ b/Source/core/platform/graphics/filters/custom/CustomFilterMesh.cpp

@@ -32,6 +32,7 @@

#include "core/platform/graphics/GraphicsContext3D.h"

#include "core/platform/graphics/filters/custom/CustomFilterMesh.h"

#include "platform/graphics/filters/custom/CustomFilterMeshGenerator.h"

+#include "third_party/khronos/GLES2/gl2.h"

namespace WebCore {

@@ -50,12 +51,12 @@ CustomFilterMesh::CustomFilterMesh(GraphicsContext3D* context, unsigned columns,

m_context->makeContextCurrent();

m_verticesBufferObject = m_context->createBuffer();

- m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_verticesBufferObject);

- m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, generator.vertices().size() * sizeof(float), generator.vertices().data(), GraphicsContext3D::STATIC_DRAW);

+ m_context->bindBuffer(GL_ARRAY_BUFFER, m_verticesBufferObject);

+ m_context->bufferData(GL_ARRAY_BUFFER, generator.vertices().size() * sizeof(float), generator.vertices().data(), GL_STATIC_DRAW);

m_elementsBufferObject = m_context->createBuffer();

- m_context->bindBuffer(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, m_elementsBufferObject);

- m_context->bufferData(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, generator.indices().size() * sizeof(uint16_t), generator.indices().data(), GraphicsContext3D::STATIC_DRAW);

+ m_context->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementsBufferObject);

+ m_context->bufferData(GL_ELEMENT_ARRAY_BUFFER, generator.indices().size() * sizeof(uint16_t), generator.indices().data(), GL_STATIC_DRAW);

}

CustomFilterMesh::~CustomFilterMesh()