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

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

Issue 1425013003: Remove GrGLProcessor and create GrGLSLTextureSampler class. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove grglprocessor from gyp Created 5 years, 1 month 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/effects/SkBlurMaskFilter.cpp ('k') | src/gpu/GrPathProcessor.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 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 "GrOvalRenderer.h" 8 #include "GrOvalRenderer.h"
9 9
10 #include "GrBatchFlushState.h" 10 #include "GrBatchFlushState.h"
11 #include "GrBatchTest.h" 11 #include "GrBatchTest.h"
12 #include "GrDrawTarget.h" 12 #include "GrDrawTarget.h"
13 #include "GrGeometryProcessor.h" 13 #include "GrGeometryProcessor.h"
14 #include "GrInvariantOutput.h" 14 #include "GrInvariantOutput.h"
15 #include "GrPipelineBuilder.h" 15 #include "GrPipelineBuilder.h"
16 #include "GrProcessor.h" 16 #include "GrProcessor.h"
17 #include "GrResourceProvider.h" 17 #include "GrResourceProvider.h"
18 #include "GrVertexBuffer.h" 18 #include "GrVertexBuffer.h"
19 #include "SkRRect.h" 19 #include "SkRRect.h"
20 #include "SkStrokeRec.h" 20 #include "SkStrokeRec.h"
21 #include "SkTLazy.h" 21 #include "SkTLazy.h"
22 #include "batches/GrVertexBatch.h" 22 #include "batches/GrVertexBatch.h"
23 #include "effects/GrRRectEffect.h" 23 #include "effects/GrRRectEffect.h"
24 #include "gl/GrGLUtil.h" 24 #include "gl/GrGLUtil.h"
25 #include "gl/GrGLProcessor.h"
26 #include "gl/GrGLGeometryProcessor.h" 25 #include "gl/GrGLGeometryProcessor.h"
27 #include "gl/builders/GrGLProgramBuilder.h" 26 #include "gl/builders/GrGLProgramBuilder.h"
28 #include "glsl/GrGLSLProgramDataManager.h" 27 #include "glsl/GrGLSLProgramDataManager.h"
29 28
30 // TODO(joshualitt) - Break this file up during GrBatch post implementation clea nup 29 // TODO(joshualitt) - Break this file up during GrBatch post implementation clea nup
31 30
32 namespace { 31 namespace {
33 // TODO(joshualitt) add per vertex colors 32 // TODO(joshualitt) add per vertex colors
34 struct CircleVertex { 33 struct CircleVertex {
35 SkPoint fPos; 34 SkPoint fPos;
(...skipping 1995 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 } 2030 }
2032 2031
2033 DRAW_BATCH_TEST_DEFINE(RRectBatch) { 2032 DRAW_BATCH_TEST_DEFINE(RRectBatch) {
2034 SkMatrix viewMatrix = GrTest::TestMatrixRectStaysRect(random); 2033 SkMatrix viewMatrix = GrTest::TestMatrixRectStaysRect(random);
2035 GrColor color = GrRandomColor(random); 2034 GrColor color = GrRandomColor(random);
2036 const SkRRect& rrect = GrTest::TestRRectSimple(random); 2035 const SkRRect& rrect = GrTest::TestRRectSimple(random);
2037 return create_rrect_batch(color, viewMatrix, rrect, GrTest::TestStrokeRec(ra ndom)); 2036 return create_rrect_batch(color, viewMatrix, rrect, GrTest::TestStrokeRec(ra ndom));
2038 } 2037 }
2039 2038
2040 #endif 2039 #endif
OLDNEW
« no previous file with comments | « src/effects/SkBlurMaskFilter.cpp ('k') | src/gpu/GrPathProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698