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

Side by Side Diff: src/gpu/gl/GrGLNoOpInterface.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/gpu/gl/GrGLNameAllocator.cpp ('k') | src/gpu/gl/GrGLPath.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrGLNoOpInterface.h" 8 #include "GrGLNoOpInterface.h"
9 #include "SkMutex.h" 9 #include "SkMutex.h"
10 #include "SkString.h" 10 #include "SkString.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 case GR_GL_VERSION: 635 case GR_GL_VERSION:
636 return (const GrGLubyte*)"4.0 Debug GL"; 636 return (const GrGLubyte*)"4.0 Debug GL";
637 case GR_GL_SHADING_LANGUAGE_VERSION: 637 case GR_GL_SHADING_LANGUAGE_VERSION:
638 return (const GrGLubyte*)"4.20.8 Debug GLSL"; 638 return (const GrGLubyte*)"4.20.8 Debug GLSL";
639 case GR_GL_VENDOR: 639 case GR_GL_VENDOR:
640 return (const GrGLubyte*)"Debug Vendor"; 640 return (const GrGLubyte*)"Debug Vendor";
641 case GR_GL_RENDERER: 641 case GR_GL_RENDERER:
642 return (const GrGLubyte*)"The Debug (Non-)Renderer"; 642 return (const GrGLubyte*)"The Debug (Non-)Renderer";
643 default: 643 default:
644 SkFAIL("Unexpected name passed to GetString"); 644 SkFAIL("Unexpected name passed to GetString");
645 return NULL; 645 return nullptr;
646 } 646 }
647 } 647 }
648 648
649 const GrGLubyte* GR_GL_FUNCTION_TYPE noOpGLGetStringi(GrGLenum name, GrGLuint i) { 649 const GrGLubyte* GR_GL_FUNCTION_TYPE noOpGLGetStringi(GrGLenum name, GrGLuint i) {
650 switch (name) { 650 switch (name) {
651 case GR_GL_EXTENSIONS: 651 case GR_GL_EXTENSIONS:
652 if (static_cast<size_t>(i) <= SK_ARRAY_COUNT(kExtensions)) { 652 if (static_cast<size_t>(i) <= SK_ARRAY_COUNT(kExtensions)) {
653 return (const GrGLubyte*) kExtensions[i]; 653 return (const GrGLubyte*) kExtensions[i];
654 } else { 654 } else {
655 return NULL; 655 return nullptr;
656 } 656 }
657 default: 657 default:
658 SkFAIL("Unexpected name passed to GetStringi"); 658 SkFAIL("Unexpected name passed to GetStringi");
659 return NULL; 659 return nullptr;
660 } 660 }
661 } 661 }
662 662
663 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLGetTexLevelParameteriv(GrGLenum target, 663 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLGetTexLevelParameteriv(GrGLenum target,
664 GrGLint level, 664 GrGLint level,
665 GrGLenum pname, 665 GrGLenum pname,
666 GrGLint* params) { 666 GrGLint* params) {
667 // we used to use this to query stuff about externally created textures, 667 // we used to use this to query stuff about externally created textures,
668 // now we just require clients to tell us everything about the texture. 668 // now we just require clients to tell us everything about the texture.
669 SkFAIL("Should never query texture parameters."); 669 SkFAIL("Should never query texture parameters.");
670 } 670 }
671 671
672 GrGLint GR_GL_FUNCTION_TYPE noOpGLGetUniformLocation(GrGLuint program, const cha r* name) { 672 GrGLint GR_GL_FUNCTION_TYPE noOpGLGetUniformLocation(GrGLuint program, const cha r* name) {
673 static int gUniLocation = 0; 673 static int gUniLocation = 0;
674 return ++gUniLocation; 674 return ++gUniLocation;
675 } 675 }
676 676
677 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) { 677 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) {
678 } 678 }
679 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) { 679 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) {
680 } 680 }
681 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() { 681 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() {
682 } 682 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLNameAllocator.cpp ('k') | src/gpu/gl/GrGLPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698