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

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

Issue 1271903003: Remove IGNORE_ROT_AA_RECT_OPT flag (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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/common_conditions.gypi ('k') | src/gpu/SkGpuDevice.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 2015 Google Inc. 3 * Copyright 2015 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 "GrAARectRenderer.h" 9 #include "GrAARectRenderer.h"
10 #include "GrAtlasTextContext.h" 10 #include "GrAtlasTextContext.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 GrPipelineBuilder* pipelineBuilder, 210 GrPipelineBuilder* pipelineBuilder,
211 SkRect* devBoundRect, 211 SkRect* devBoundRect,
212 const SkRect& rect, 212 const SkRect& rect,
213 SkScalar strokeWidth, 213 SkScalar strokeWidth,
214 const SkMatrix& combinedMatrix, 214 const SkMatrix& combinedMatrix,
215 GrColor color) { 215 GrColor color) {
216 if (pipelineBuilder->getRenderTarget()->isUnifiedMultisampled()) { 216 if (pipelineBuilder->getRenderTarget()->isUnifiedMultisampled()) {
217 return false; 217 return false;
218 } 218 }
219 219
220 #if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) 220 #ifdef SHADER_AA_FILL_RECT
221 if (strokeWidth >= 0) { 221 if (strokeWidth >= 0) {
222 #endif 222 #endif
223 if (!combinedMatrix.preservesAxisAlignment()) { 223 if (!combinedMatrix.preservesAxisAlignment()) {
224 return false; 224 return false;
225 } 225 }
226 226
227 #if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) 227 #ifdef SHADER_AA_FILL_RECT
228 } else { 228 } else {
229 if (!combinedMatrix.preservesRightAngles()) { 229 if (!combinedMatrix.preservesRightAngles()) {
230 return false; 230 return false;
231 } 231 }
232 } 232 }
233 #endif 233 #endif
234 234
235 combinedMatrix.mapRect(devBoundRect, rect); 235 combinedMatrix.mapRect(devBoundRect, rect);
236 if (!combinedMatrix.rectStaysRect()) { 236 if (!combinedMatrix.rectStaysRect()) {
237 return true; 237 return true;
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 return DrawVerticesBatch::Create(geometry, type, viewMatrix, 1334 return DrawVerticesBatch::Create(geometry, type, viewMatrix,
1335 positions.begin(), vertexCount, 1335 positions.begin(), vertexCount,
1336 indices.begin(), hasIndices ? vertexCount : 0, 1336 indices.begin(), hasIndices ? vertexCount : 0,
1337 colors.begin(), 1337 colors.begin(),
1338 texCoords.begin(), 1338 texCoords.begin(),
1339 bounds); 1339 bounds);
1340 } 1340 }
1341 1341
1342 #endif 1342 #endif
1343 1343
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698