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

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

Issue 23464082: Revert "Add a requiresVertexShader method to GrGLEffect" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 3 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 | « no previous file | src/gpu/GrAARectRenderer.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 "GrAAConvexPathRenderer.h" 9 #include "GrAAConvexPathRenderer.h"
10 10
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 517
518 virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE { 518 virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
519 return GrTBackendEffectFactory<QuadEdgeEffect>::getInstance(); 519 return GrTBackendEffectFactory<QuadEdgeEffect>::getInstance();
520 } 520 }
521 521
522 class GLEffect : public GrGLEffect { 522 class GLEffect : public GrGLEffect {
523 public: 523 public:
524 GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&) 524 GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
525 : INHERITED (factory) {} 525 : INHERITED (factory) {}
526 526
527 virtual bool requiresVertexShader(const GrDrawEffect&) const SK_OVERRIDE { return true; }
528
529 virtual void emitCode(GrGLShaderBuilder* builder, 527 virtual void emitCode(GrGLShaderBuilder* builder,
530 const GrDrawEffect& drawEffect, 528 const GrDrawEffect& drawEffect,
531 EffectKey key, 529 EffectKey key,
532 const char* outputColor, 530 const char* outputColor,
533 const char* inputColor, 531 const char* inputColor,
534 const TextureSamplerArray& samplers) SK_OVERRIDE { 532 const TextureSamplerArray& samplers) SK_OVERRIDE {
535 GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertex Builder(); 533 GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertex Builder();
536 SkASSERT(NULL != vertexBuilder); 534 SkASSERT(NULL != vertexBuilder);
537 535
538 const char *vsName, *fsName; 536 const char *vsName, *fsName;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 vOffset, // start vertex 704 vOffset, // start vertex
707 0, // start index 705 0, // start index
708 draw.fVertexCnt, 706 draw.fVertexCnt,
709 draw.fIndexCnt, 707 draw.fIndexCnt,
710 &devBounds); 708 &devBounds);
711 vOffset += draw.fVertexCnt; 709 vOffset += draw.fVertexCnt;
712 } 710 }
713 711
714 return true; 712 return true;
715 } 713 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrAARectRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698