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

Side by Side Diff: src/gpu/gl/GrGLProgramEffects.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 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
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGLRenderTarget.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 "gl/builders/GrGLProgramBuilder.h" 8 #include "gl/builders/GrGLProgramBuilder.h"
9 #include "GrGLProgramEffects.h" 9 #include "GrGLProgramEffects.h"
10 #include "GrDrawEffect.h" 10 #include "GrDrawEffect.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 : fBuilder(builder) 454 : fBuilder(builder)
455 , fProgramEffects(SkNEW_ARGS(GrGLVertexProgramEffects, 455 , fProgramEffects(SkNEW_ARGS(GrGLVertexProgramEffects,
456 (reserveCount, 456 (reserveCount,
457 fBuilder->getVertexShaderBuilder()->hasExplici tLocalCoords()))) { 457 fBuilder->getVertexShaderBuilder()->hasExplici tLocalCoords()))) {
458 } 458 }
459 void GrGLVertexProgramEffectsBuilder::emitEffect(const GrEffectStage& stage, 459 void GrGLVertexProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
460 const GrEffectKey& key, 460 const GrEffectKey& key,
461 const char* outColor, 461 const char* outColor,
462 const char* inColor, 462 const char* inColor,
463 int stageIndex) { 463 int stageIndex) {
464 SkASSERT(NULL != fProgramEffects.get()); 464 SkASSERT(fProgramEffects.get());
465 fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIn dex); 465 fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIn dex);
466 } 466 }
467 467
468 //////////////////////////////////////////////////////////////////////////////// 468 ////////////////////////////////////////////////////////////////////////////////
469 469
470 void GrGLPathTexGenProgramEffects::emitEffect(GrGLFragmentOnlyProgramBuilder* bu ilder, 470 void GrGLPathTexGenProgramEffects::emitEffect(GrGLFragmentOnlyProgramBuilder* bu ilder,
471 const GrEffectStage& stage, 471 const GrEffectStage& stage,
472 const GrEffectKey& key, 472 const GrEffectKey& key,
473 const char* outColor, 473 const char* outColor,
474 const char* inColor, 474 const char* inColor,
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 GrGLFragmentOnlyProgramBuilder* builder, 563 GrGLFragmentOnlyProgramBuilder* builder,
564 int reserveCount) 564 int reserveCount)
565 : fBuilder(builder) 565 : fBuilder(builder)
566 , fProgramEffects(SkNEW_ARGS(GrGLPathTexGenProgramEffects, (reserveCount))) { 566 , fProgramEffects(SkNEW_ARGS(GrGLPathTexGenProgramEffects, (reserveCount))) {
567 } 567 }
568 void GrGLPathTexGenProgramEffectsBuilder::emitEffect(const GrEffectStage& stage, 568 void GrGLPathTexGenProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
569 const GrEffectKey& key, 569 const GrEffectKey& key,
570 const char* outColor, 570 const char* outColor,
571 const char* inColor, 571 const char* inColor,
572 int stageIndex) { 572 int stageIndex) {
573 SkASSERT(NULL != fProgramEffects.get()); 573 SkASSERT(fProgramEffects.get());
574 fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIn dex); 574 fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIn dex);
575 } 575 }
576 576
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGLRenderTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698