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

Side by Side Diff: gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc

Issue 1444683002: Revert of Fix gpu command buffer use after free by GrContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" 5 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
6 6
7 #ifndef GL_GLEXT_PROTOTYPES 7 #ifndef GL_GLEXT_PROTOTYPES
8 #define GL_GLEXT_PROTOTYPES 8 #define GL_GLEXT_PROTOTYPES
9 #endif 9 #endif
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "gpu/GLES2/gl2extchromium.h" 11 #include "gpu/GLES2/gl2extchromium.h"
12 #include "third_party/khronos/GLES2/gl2.h" 12 #include "third_party/khronos/GLES2/gl2.h"
13 #include "third_party/khronos/GLES2/gl2ext.h" 13 #include "third_party/khronos/GLES2/gl2ext.h"
14 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" 14 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
15 15
16 namespace skia_bindings { 16 namespace skia_bindings {
17 17
18 void InitCommandBufferSkiaGLBinding(GrGLInterface* interface) { 18 GrGLInterface* CreateCommandBufferSkiaGLBinding() {
19 GrGLInterface* interface = new GrGLInterface;
19 interface->fStandard = kGLES_GrGLStandard; 20 interface->fStandard = kGLES_GrGLStandard;
20 interface->fExtensions.init(kGLES_GrGLStandard, 21 interface->fExtensions.init(kGLES_GrGLStandard,
21 glGetString, 22 glGetString,
22 NULL, 23 NULL,
23 glGetIntegerv); 24 glGetIntegerv);
24 25
25 GrGLInterface::Functions* functions = &interface->fFunctions; 26 GrGLInterface::Functions* functions = &interface->fFunctions;
26 functions->fActiveTexture = glActiveTexture; 27 functions->fActiveTexture = glActiveTexture;
27 functions->fAttachShader = glAttachShader; 28 functions->fAttachShader = glAttachShader;
28 functions->fBindAttribLocation = glBindAttribLocation; 29 functions->fBindAttribLocation = glBindAttribLocation;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 functions->fCoverFillPathInstanced = glCoverFillPathInstancedCHROMIUM; 173 functions->fCoverFillPathInstanced = glCoverFillPathInstancedCHROMIUM;
173 functions->fCoverStrokePathInstanced = glCoverStrokePathInstancedCHROMIUM; 174 functions->fCoverStrokePathInstanced = glCoverStrokePathInstancedCHROMIUM;
174 functions->fStencilThenCoverFillPathInstanced = 175 functions->fStencilThenCoverFillPathInstanced =
175 glStencilThenCoverFillPathInstancedCHROMIUM; 176 glStencilThenCoverFillPathInstancedCHROMIUM;
176 functions->fStencilThenCoverStrokePathInstanced = 177 functions->fStencilThenCoverStrokePathInstanced =
177 glStencilThenCoverStrokePathInstancedCHROMIUM; 178 glStencilThenCoverStrokePathInstancedCHROMIUM;
178 functions->fProgramPathFragmentInputGen = 179 functions->fProgramPathFragmentInputGen =
179 glProgramPathFragmentInputGenCHROMIUM; 180 glProgramPathFragmentInputGenCHROMIUM;
180 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM; 181 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM;
181 } 182 }
183
184 return interface;
182 } 185 }
183 186
184 } // namespace skia 187 } // namespace skia
OLDNEW
« no previous file with comments | « gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h ('k') | third_party/WebKit/public/platform/WebGraphicsContext3D.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698