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

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

Issue 23018003: Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 GrGLSLModulatef<4>(&modulate, inputColor, "edgeAlpha"); 535 GrGLSLModulatef<4>(&modulate, inputColor, "edgeAlpha");
536 builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str() ); 536 builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str() );
537 537
538 builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str()); 538 builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
539 } 539 }
540 540
541 static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrG LCaps&) { 541 static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrG LCaps&) {
542 return 0x0; 542 return 0x0;
543 } 543 }
544 544
545 virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_ OVERRIDE {} 545 virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRID E {}
546 546
547 private: 547 private:
548 typedef GrGLEffect INHERITED; 548 typedef GrGLEffect INHERITED;
549 }; 549 };
550 550
551 private: 551 private:
552 QuadEdgeEffect() { 552 QuadEdgeEffect() {
553 this->addVertexAttrib(kVec4f_GrSLType); 553 this->addVertexAttrib(kVec4f_GrSLType);
554 } 554 }
555 555
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 vOffset, // start vertex 677 vOffset, // start vertex
678 0, // start index 678 0, // start index
679 draw.fVertexCnt, 679 draw.fVertexCnt,
680 draw.fIndexCnt, 680 draw.fIndexCnt,
681 &devBounds); 681 &devBounds);
682 vOffset += draw.fVertexCnt; 682 vOffset += draw.fVertexCnt;
683 } 683 }
684 684
685 return true; 685 return true;
686 } 686 }
OLDNEW
« no previous file with comments | « src/effects/gradients/SkTwoPointRadialGradient.cpp ('k') | src/gpu/GrAAHairLinePathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698