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

Side by Side Diff: src/gpu/gl/debug/GrFrameBufferObj.cpp

Issue 16952006: Replace fixed-size array of effect stages in GrDrawState with two appendable arrays, one for color,… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix comments Created 7 years, 6 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 | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | tests/GLProgramsTest.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 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "GrFrameBufferObj.h" 9 #include "GrFrameBufferObj.h"
10 #include "GrFBBindableObj.h" 10 #include "GrFBBindableObj.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 fDepthBuffer->setDepthBound(this); 46 fDepthBuffer->setDepthBound(this);
47 } 47 }
48 } 48 }
49 49
50 void GrFrameBufferObj::setStencil(GrFBBindableObj *buffer) { 50 void GrFrameBufferObj::setStencil(GrFBBindableObj *buffer) {
51 if (fStencilBuffer) { 51 if (fStencilBuffer) {
52 // automatically break the binding of the old buffer 52 // automatically break the binding of the old buffer
53 GrAlwaysAssert(fStencilBuffer->getStencilBound(this)); 53 GrAlwaysAssert(fStencilBuffer->getStencilBound(this));
54 fStencilBuffer->resetStencilBound(this); 54 fStencilBuffer->resetStencilBound(this);
55 55
56 GrAlwaysAssert(!fStencilBuffer->getDeleted()); 56 //GrAlwaysAssert(!fStencilBuffer->getDeleted());
57 fStencilBuffer->unref(); 57 fStencilBuffer->unref();
58 } 58 }
59 fStencilBuffer = buffer; 59 fStencilBuffer = buffer;
60 if (fStencilBuffer) { 60 if (fStencilBuffer) {
61 GrAlwaysAssert(!fStencilBuffer->getDeleted()); 61 GrAlwaysAssert(!fStencilBuffer->getDeleted());
62 fStencilBuffer->ref(); 62 fStencilBuffer->ref();
63 63
64 GrAlwaysAssert(!fStencilBuffer->getStencilBound(this)); 64 GrAlwaysAssert(!fStencilBuffer->getStencilBound(this));
65 fStencilBuffer->setStencilBound(this); 65 fStencilBuffer->setStencilBound(this);
66 } 66 }
67 } 67 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698