summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 19:56:40 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 19:56:40 +0000
commitd5bf7ca12d258942349d25430c7ff2d1eb4a4e50 (patch)
treea527b43c86c971ad2f9d5f1df53dc6fbe8c2bd02 /webkit/gpu
parent4d7608f8e51963add407002e21615c72ab33b652 (diff)
downloadchromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.zip
chromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.tar.gz
chromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.tar.bz2
Refactor so chromium only GL extensions require gl2extchromium.h
This is a step toward making third_party/khronos/gl2.h and gl2ext.h have as few modifications as possible. BUG=none Review URL: https://chromiumcodereview.appspot.com/11782020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/gl_bindings_skia_cmd_buffer.cc1
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc b/webkit/gpu/gl_bindings_skia_cmd_buffer.cc
index d30afe3..8295723 100644
--- a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc
+++ b/webkit/gpu/gl_bindings_skia_cmd_buffer.cc
@@ -7,6 +7,7 @@
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
#endif
+#include "gpu/GLES2/gl2extchromium.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 9135827..48d882b 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -9,6 +9,7 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <GLES2/gl2ext.h>
+#include <GLES2/gl2extchromium.h>
#include <algorithm>
#include <set>