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

Unified Diff: src/core/SkLightingShader.cpp

Issue 1428543003: Create GLSL base class for ProgramDataManager (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add space Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/gpu.gypi ('k') | src/effects/GrCircleBlurFragmentProcessor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkLightingShader.cpp
diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp
index 16441aa84b4538da5309352d85cee87df86ac7c2..4c8ed3bb1d53f8ad97b903825ff5cae7f56968fa 100644
--- a/src/core/SkLightingShader.cpp
+++ b/src/core/SkLightingShader.cpp
@@ -132,6 +132,7 @@ private:
#include "GrTextureAccess.h"
#include "gl/GrGLProcessor.h"
#include "gl/builders/GrGLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
#include "SkGr.h"
#include "SkGrPriv.h"
@@ -237,7 +238,7 @@ public:
}
protected:
- void onSetData(const GrGLProgramDataManager& pdman, const GrProcessor& proc) override {
+ void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override {
const LightingFP& lightingFP = proc.cast<LightingFP>();
const SkVector3& lightDir = lightingFP.lightDir();
@@ -267,16 +268,16 @@ public:
private:
SkVector3 fLightDir;
- GrGLProgramDataManager::UniformHandle fLightDirUni;
+ GrGLSLProgramDataManager::UniformHandle fLightDirUni;
SkColor3f fLightColor;
- GrGLProgramDataManager::UniformHandle fLightColorUni;
+ GrGLSLProgramDataManager::UniformHandle fLightColorUni;
SkColor3f fAmbientColor;
- GrGLProgramDataManager::UniformHandle fAmbientColorUni;
+ GrGLSLProgramDataManager::UniformHandle fAmbientColorUni;
SkVector fInvNormRotation;
- GrGLProgramDataManager::UniformHandle fXformUni;
+ GrGLSLProgramDataManager::UniformHandle fXformUni;
};
void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
« no previous file with comments | « gyp/gpu.gypi ('k') | src/effects/GrCircleBlurFragmentProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698