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

Side by Side Diff: src/core/SkLightingShader.cpp

Issue 1431433003: Move shader compiling to ProgramBuilder and various ShaderBuilder cleanups. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: nits 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 | « gm/dcshader.cpp ('k') | src/gpu/effects/GrXfermodeFragmentProcessor.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 "SkBitmapProcState.h" 9 #include "SkBitmapProcState.h"
10 #include "SkColor.h" 10 #include "SkColor.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 typedef SkShader INHERITED; 123 typedef SkShader INHERITED;
124 }; 124 };
125 125
126 //////////////////////////////////////////////////////////////////////////// 126 ////////////////////////////////////////////////////////////////////////////
127 127
128 #if SK_SUPPORT_GPU 128 #if SK_SUPPORT_GPU
129 129
130 #include "GrCoordTransform.h" 130 #include "GrCoordTransform.h"
131 #include "GrFragmentProcessor.h" 131 #include "GrFragmentProcessor.h"
132 #include "GrTextureAccess.h" 132 #include "GrTextureAccess.h"
133 #include "gl/GrGLFragmentProcessor.h"
133 #include "gl/builders/GrGLProgramBuilder.h" 134 #include "gl/builders/GrGLProgramBuilder.h"
134 #include "glsl/GrGLSLProgramDataManager.h" 135 #include "glsl/GrGLSLProgramDataManager.h"
135 #include "SkGr.h" 136 #include "SkGr.h"
136 #include "SkGrPriv.h" 137 #include "SkGrPriv.h"
137 138
138 class LightingFP : public GrFragmentProcessor { 139 class LightingFP : public GrFragmentProcessor {
139 public: 140 public:
140 LightingFP(GrTexture* diffuse, GrTexture* normal, const SkMatrix& diffMatrix , 141 LightingFP(GrTexture* diffuse, GrTexture* normal, const SkMatrix& diffMatrix ,
141 const SkMatrix& normMatrix, const GrTextureParams& diffParams, 142 const SkMatrix& normMatrix, const GrTextureParams& diffParams,
142 const GrTextureParams& normParams, const SkLightingShader::Lights * lights, 143 const GrTextureParams& normParams, const SkLightingShader::Lights * lights,
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 normLocalM); 713 normLocalM);
713 } 714 }
714 715
715 /////////////////////////////////////////////////////////////////////////////// 716 ///////////////////////////////////////////////////////////////////////////////
716 717
717 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader) 718 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
718 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl) 719 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
719 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 720 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
720 721
721 /////////////////////////////////////////////////////////////////////////////// 722 ///////////////////////////////////////////////////////////////////////////////
OLDNEW
« no previous file with comments | « gm/dcshader.cpp ('k') | src/gpu/effects/GrXfermodeFragmentProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698