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

Side by Side Diff: src/gpu/GrDrawTarget.cpp

Issue 1276133002: Fix warnings on VS2015 x86_64 build (Closed) Base URL: https://skia.googlesource.com/skia.git@didSetPipeline
Patch Set: tabs- Created 5 years, 4 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 | « gyp/zlib.gyp ('k') | tests/GrMemoryPoolTest.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 2010 Google Inc. 3 * Copyright 2010 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 "GrDrawTarget.h" 9 #include "GrDrawTarget.h"
10 10
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 const GrPathRange* pathRange, 249 const GrPathRange* pathRange,
250 const void* indices, 250 const void* indices,
251 PathIndexType indexType, 251 PathIndexType indexType,
252 const float transformValues[], 252 const float transformValues[],
253 PathTransformType transformType, 253 PathTransformType transformType,
254 int count, 254 int count,
255 GrPathRendering::FillType fill) { 255 GrPathRendering::FillType fill) {
256 SkASSERT(this->caps()->shaderCaps()->pathRenderingSupport()); 256 SkASSERT(this->caps()->shaderCaps()->pathRenderingSupport());
257 SkASSERT(pathRange); 257 SkASSERT(pathRange);
258 SkASSERT(indices); 258 SkASSERT(indices);
259 SkASSERT(0 == reinterpret_cast<long>(indices) % GrPathRange::PathIndexSizeIn Bytes(indexType)); 259 SkASSERT(0 == reinterpret_cast<intptr_t>(indices) %
260 GrPathRange::PathIndexSizeInBytes(indexType));
260 SkASSERT(transformValues); 261 SkASSERT(transformValues);
261 262
262 // Setup clip 263 // Setup clip
263 GrScissorState scissorState; 264 GrScissorState scissorState;
264 GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps; 265 GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
265 GrPipelineBuilder::AutoRestoreStencil ars; 266 GrPipelineBuilder::AutoRestoreStencil ars;
266 if (!this->setupClip(pipelineBuilder, &arfps, &ars, &scissorState, NULL)) { 267 if (!this->setupClip(pipelineBuilder, &arfps, &ars, &scissorState, NULL)) {
267 return; 268 return;
268 } 269 }
269 270
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 ars, 516 ars,
516 scissorState, 517 scissorState,
517 devBounds); 518 devBounds);
518 } 519 }
519 520
520 void GrClipTarget::purgeResources() { 521 void GrClipTarget::purgeResources() {
521 // The clip mask manager can rebuild all its clip masks so just 522 // The clip mask manager can rebuild all its clip masks so just
522 // get rid of them all. 523 // get rid of them all.
523 fClipMaskManager->purgeResources(); 524 fClipMaskManager->purgeResources();
524 }; 525 };
OLDNEW
« no previous file with comments | « gyp/zlib.gyp ('k') | tests/GrMemoryPoolTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698