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

Side by Side Diff: webkit/glue/gl_bindings_skia_cmd_buffer.cc

Issue 8423038: Move GL headers from gpu to third_party/khronos (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed mac_rel build failure Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h" 6 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
7 7
8 #ifndef GL_GLEXT_PROTOTYPES 8 #ifndef GL_GLEXT_PROTOTYPES
9 #define GL_GLEXT_PROTOTYPES 9 #define GL_GLEXT_PROTOTYPES
10 #endif 10 #endif
11 #include "gpu/GLES2/gl2.h" 11 #include "third_party/khronos/GLES2/gl2.h"
12 #include "gpu/GLES2/gl2ext.h" 12 #include "third_party/khronos/GLES2/gl2ext.h"
13
14 #include "third_party/skia/include/gpu/GrGLInterface.h" 13 #include "third_party/skia/include/gpu/GrGLInterface.h"
15 14
16 namespace webkit_glue { 15 namespace webkit_glue {
17 16
18 GrGLInterface* CreateCommandBufferSkiaGLBinding() { 17 GrGLInterface* CreateCommandBufferSkiaGLBinding() {
19 GrGLInterface* interface = new GrGLInterface; 18 GrGLInterface* interface = new GrGLInterface;
20 interface->fBindingsExported = kES2_GrGLBinding; 19 interface->fBindingsExported = kES2_GrGLBinding;
21 interface->fActiveTexture = glActiveTexture; 20 interface->fActiveTexture = glActiveTexture;
22 interface->fAttachShader = glAttachShader; 21 interface->fAttachShader = glAttachShader;
23 interface->fBindAttribLocation = glBindAttribLocation; 22 interface->fBindAttribLocation = glBindAttribLocation;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 glGetFramebufferAttachmentParameteriv; 111 glGetFramebufferAttachmentParameteriv;
113 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv; 112 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
114 interface->fRenderbufferStorage = glRenderbufferStorage; 113 interface->fRenderbufferStorage = glRenderbufferStorage;
115 interface->fRenderbufferStorageMultisample = 114 interface->fRenderbufferStorageMultisample =
116 glRenderbufferStorageMultisampleEXT; 115 glRenderbufferStorageMultisampleEXT;
117 interface->fBlitFramebuffer = glBlitFramebufferEXT; 116 interface->fBlitFramebuffer = glBlitFramebufferEXT;
118 return interface; 117 return interface;
119 } 118 }
120 119
121 } // namespace webkit_glue 120 } // namespace webkit_glue
122
OLDNEW
« no previous file with comments | « webkit/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698