webkit/glue/gl_bindings_skia_cmd_buffer.cc - Issue 8268006: Roll skia to r2478

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 8268006: Roll skia to r2478 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 months 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 | « ui/gfx/gl/gl_bindings_skia_in_process.cc ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

OLD	NEW
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 "gpu/GLES2/gl2.h"

12 #include "gpu/GLES2/gl2ext.h"	12 #include "gpu/GLES2/gl2ext.h"

13	13

14 #include "third_party/skia/gpu/include/GrGLInterface.h"	14 #include "third_party/skia/include/gpu/GrGLInterface.h"

15	15

16 namespace webkit_glue {	16 namespace webkit_glue {

17	17

18 GrGLInterface* CreateCommandBufferSkiaGLBinding() {	18 GrGLInterface* CreateCommandBufferSkiaGLBinding() {

19 GrGLInterface* interface = new GrGLInterface;	19 GrGLInterface* interface = new GrGLInterface;

20 interface->fBindingsExported = kES2_GrGLBinding;	20 interface->fBindingsExported = kES2_GrGLBinding;

21 interface->fActiveTexture = glActiveTexture;	21 interface->fActiveTexture = glActiveTexture;

22 interface->fAttachShader = glAttachShader;	22 interface->fAttachShader = glAttachShader;

23 interface->fBindAttribLocation = glBindAttribLocation;	23 interface->fBindAttribLocation = glBindAttribLocation;

24 interface->fBindBuffer = glBindBuffer;	24 interface->fBindBuffer = glBindBuffer;

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;	111 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;

112 interface->fRenderbufferStorage = glRenderbufferStorage;	112 interface->fRenderbufferStorage = glRenderbufferStorage;

113 interface->fRenderbufferStorageMultisample =	113 interface->fRenderbufferStorageMultisample =

114 glRenderbufferStorageMultisampleEXT;	114 glRenderbufferStorageMultisampleEXT;

115 interface->fBlitFramebuffer = glBlitFramebufferEXT;	115 interface->fBlitFramebuffer = glBlitFramebufferEXT;

116 return interface;	116 return interface;

117 }	117 }

118	118

119 } // namespace webkit_glue	119 } // namespace webkit_glue

120	120

OLD	NEW