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

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

Issue 19449002: Replace all instances of GrRect with SkRect. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 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/GrGpuGL.cpp ('k') | tests/ClipCacheTest.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 2011 Google Inc. 2 * Copyright 2011 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 "GrGpuGL.h" 8 #include "GrGpuGL.h"
9 9
10 #include "GrEffect.h" 10 #include "GrEffect.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 blendOpts, 310 blendOpts,
311 colorStages.begin(), 311 colorStages.begin(),
312 coverageStages.begin(), 312 coverageStages.begin(),
313 dstCopy, 313 dstCopy,
314 &fSharedGLProgramState); 314 &fSharedGLProgramState);
315 } 315 }
316 this->flushStencil(type); 316 this->flushStencil(type);
317 this->flushScissor(); 317 this->flushScissor();
318 this->flushAAState(type); 318 this->flushAAState(type);
319 319
320 GrIRect* devRect = NULL; 320 SkIRect* devRect = NULL;
321 GrIRect devClipBounds; 321 SkIRect devClipBounds;
322 if (drawState.isClipState()) { 322 if (drawState.isClipState()) {
323 this->getClip()->getConservativeBounds(drawState.getRenderTarget(), &dev ClipBounds); 323 this->getClip()->getConservativeBounds(drawState.getRenderTarget(), &dev ClipBounds);
324 devRect = &devClipBounds; 324 devRect = &devClipBounds;
325 } 325 }
326 // This must come after textures are flushed because a texture may need 326 // This must come after textures are flushed because a texture may need
327 // to be msaa-resolved (which will modify bound FBO state). 327 // to be msaa-resolved (which will modify bound FBO state).
328 this->flushRenderTarget(devRect); 328 this->flushRenderTarget(devRect);
329 329
330 return true; 330 return true;
331 } 331 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 GrGLAttribTypeToLayout(attribType).fCount, 399 GrGLAttribTypeToLayout(attribType).fCount,
400 GrGLAttribTypeToLayout(attribType).fType, 400 GrGLAttribTypeToLayout(attribType).fType,
401 GrGLAttribTypeToLayout(attribType).fNormalized, 401 GrGLAttribTypeToLayout(attribType).fNormalized,
402 stride, 402 stride,
403 reinterpret_cast<GrGLvoid*>( 403 reinterpret_cast<GrGLvoid*>(
404 vertexOffsetInBytes + vertexAttrib->fOffset)); 404 vertexOffsetInBytes + vertexAttrib->fOffset));
405 } 405 }
406 406
407 attribState->disableUnusedAttribArrays(this, usedAttribArraysMask); 407 attribState->disableUnusedAttribArrays(this, usedAttribArraysMask);
408 } 408 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGpuGL.cpp ('k') | tests/ClipCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698