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

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

Issue 1017803002: Revert of Improve tracking of bound FBOs in GrGLGpu. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 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/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLRenderTarget.h » ('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 "SkString.h" 9 #include "SkString.h"
10 #include "SkThread.h" 10 #include "SkThread.h"
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 433 }
434 434
435 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocationIndexed(GrGLuint program, 435 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocationIndexed(GrGLuint program,
436 GrGLuint colorNum ber, 436 GrGLuint colorNum ber,
437 GrGLuint index, 437 GrGLuint index,
438 const GrGLchar * name) { 438 const GrGLchar * name) {
439 } 439 }
440 440
441 GrGLenum GR_GL_FUNCTION_TYPE noOpGLCheckFramebufferStatus(GrGLenum target) { 441 GrGLenum GR_GL_FUNCTION_TYPE noOpGLCheckFramebufferStatus(GrGLenum target) {
442 442
443 GrAlwaysAssert(GR_GL_FRAMEBUFFER == target || GR_GL_READ_FRAMEBUFFER == targ et || 443 GrAlwaysAssert(GR_GL_FRAMEBUFFER == target);
444 GR_GL_DRAW_FRAMEBUFFER == target);
445 444
446 return GR_GL_FRAMEBUFFER_COMPLETE; 445 return GR_GL_FRAMEBUFFER_COMPLETE;
447 } 446 }
448 447
449 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLGenIds(GrGLsizei n, GrGLuint* ids) { 448 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLGenIds(GrGLsizei n, GrGLuint* ids) {
450 static int gCurrID = 1; 449 static int gCurrID = 1;
451 for (int i = 0; i < n; ++i) { 450 for (int i = 0; i < n; ++i) {
452 ids[i] = ++gCurrID; 451 ids[i] = ++gCurrID;
453 } 452 }
454 } 453 }
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 static int gUniLocation = 0; 655 static int gUniLocation = 0;
657 return ++gUniLocation; 656 return ++gUniLocation;
658 } 657 }
659 658
660 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) { 659 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) {
661 } 660 }
662 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) { 661 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) {
663 } 662 }
664 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() { 663 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() {
665 } 664 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLRenderTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698