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

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

Issue 1677123002: Replace NULL with nullptr in call to GrGLExtensions::init (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | 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 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 void InitCommandBufferSkiaGLBinding(GrGLInterface* interface) {
19 interface->fStandard = kGLES_GrGLStandard; 19 interface->fStandard = kGLES_GrGLStandard;
20 interface->fExtensions.init(kGLES_GrGLStandard, 20 interface->fExtensions.init(kGLES_GrGLStandard,
21 glGetString, 21 glGetString,
22 NULL, 22 nullptr,
23 glGetIntegerv); 23 glGetIntegerv);
24 24
25 GrGLInterface::Functions* functions = &interface->fFunctions; 25 GrGLInterface::Functions* functions = &interface->fFunctions;
26 functions->fActiveTexture = glActiveTexture; 26 functions->fActiveTexture = glActiveTexture;
27 functions->fAttachShader = glAttachShader; 27 functions->fAttachShader = glAttachShader;
28 functions->fBindAttribLocation = glBindAttribLocation; 28 functions->fBindAttribLocation = glBindAttribLocation;
29 functions->fBindBuffer = glBindBuffer; 29 functions->fBindBuffer = glBindBuffer;
30 functions->fBindTexture = glBindTexture; 30 functions->fBindTexture = glBindTexture;
31 functions->fBindVertexArray = glBindVertexArrayOES; 31 functions->fBindVertexArray = glBindVertexArrayOES;
32 functions->fBlendBarrier = glBlendBarrierKHR; 32 functions->fBlendBarrier = glBlendBarrierKHR;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 glStencilThenCoverFillPathInstancedCHROMIUM; 173 glStencilThenCoverFillPathInstancedCHROMIUM;
174 functions->fStencilThenCoverStrokePathInstanced = 174 functions->fStencilThenCoverStrokePathInstanced =
175 glStencilThenCoverStrokePathInstancedCHROMIUM; 175 glStencilThenCoverStrokePathInstancedCHROMIUM;
176 functions->fProgramPathFragmentInputGen = 176 functions->fProgramPathFragmentInputGen =
177 glProgramPathFragmentInputGenCHROMIUM; 177 glProgramPathFragmentInputGenCHROMIUM;
178 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM; 178 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM;
179 functions->fCoverageModulation = glCoverageModulationCHROMIUM; 179 functions->fCoverageModulation = glCoverageModulationCHROMIUM;
180 } 180 }
181 181
182 } // namespace skia 182 } // namespace skia
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698