src/effects/SkLightingImageFilter.cpp - Issue 788733003: Make addUniform take a precision

Unified Diff: src/effects/SkLightingImageFilter.cpp

Issue 788733003: Make addUniform take a precision (Closed) Base URL: https://skia.googlesource.com/skia.git@move_prec

Patch Set: rebase Created 6 years 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

Index: src/effects/SkLightingImageFilter.cpp

diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp

index 512c13ef7d950e44d218b5a2af762eb4f371a7a8..adac45bdc9df826959c2e216013561ee00227f46 100644

--- a/src/effects/SkLightingImageFilter.cpp

+++ b/src/effects/SkLightingImageFilter.cpp

@@ -1337,10 +1337,10 @@ void GrGLLightingEffect::emitCode(GrGLFPBuilder* builder,

const TransformedCoordsArray& coords,

const TextureSamplerArray& samplers) {

fImageIncrementUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kVec2f_GrSLType,

+ kVec2f_GrSLType, kDefault_GrSLPrecision,

"ImageIncrement");

fSurfaceScaleUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType,

+ kFloat_GrSLType, kDefault_GrSLPrecision,

"SurfaceScale");

fLight->emitLightColorUniform(builder);

SkString lightFunc;

@@ -1453,9 +1453,8 @@ GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrProcessor& proc)

void GrGLDiffuseLightingEffect::emitLightFunc(GrGLFPBuilder* builder, SkString* funcName) {

const char* kd;

fKDUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType,

- "KD",

- &kd);

+ kFloat_GrSLType, kDefault_GrSLPrecision,

+ "KD", &kd);

static const GrGLShaderVar gLightArgs[] = {

GrGLShaderVar("normal", kVec3f_GrSLType),

@@ -1539,9 +1538,9 @@ void GrGLSpecularLightingEffect::emitLightFunc(GrGLFPBuilder* builder, SkString*

const char* shininess;

fKSUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "KS", &ks);

+ kFloat_GrSLType, kDefault_GrSLPrecision, "KS", &ks);

fShininessUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "Shininess", &shininess);

+ kFloat_GrSLType, kDefault_GrSLPrecision, "Shininess", &shininess);

static const GrGLShaderVar gLightArgs[] = {

GrGLShaderVar("normal", kVec3f_GrSLType),

@@ -1572,7 +1571,8 @@ void GrGLSpecularLightingEffect::setData(const GrGLProgramDataManager& pdman,

///////////////////////////////////////////////////////////////////////////////

void GrGLLight::emitLightColorUniform(GrGLFPBuilder* builder) {

fColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kVec3f_GrSLType, "LightColor");

+ kVec3f_GrSLType, kDefault_GrSLPrecision,

+ "LightColor");

}

void GrGLLight::emitLightColor(GrGLFPBuilder* builder,

@@ -1597,7 +1597,8 @@ void GrGLDistantLight::setData(const GrGLProgramDataManager& pdman,

void GrGLDistantLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* dir;

- fDirectionUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec3f_GrSLType,

+ fDirectionUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

+ kVec3f_GrSLType, kDefault_GrSLPrecision,

"LightDirection", &dir);

builder->getFragmentShaderBuilder()->codeAppend(dir);

}

@@ -1614,7 +1615,8 @@ void GrGLPointLight::setData(const GrGLProgramDataManager& pdman,

void GrGLPointLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* loc;

- fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec3f_GrSLType,

+ fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

+ kVec3f_GrSLType, kDefault_GrSLPrecision,

"LightLocation", &loc);

GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",

@@ -1639,7 +1641,8 @@ void GrGLSpotLight::setData(const GrGLProgramDataManager& pdman,

void GrGLSpotLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* location;

fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kVec3f_GrSLType, "LightLocation", &location);

+ kVec3f_GrSLType, kDefault_GrSLPrecision,

+ "LightLocation", &location);

GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",

@@ -1657,15 +1660,19 @@ void GrGLSpotLight::emitLightColor(GrGLFPBuilder* builder,

const char* coneScale;

const char* s;

fExponentUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "Exponent", &exponent);

+ kFloat_GrSLType, kDefault_GrSLPrecision,

+ "Exponent", &exponent);

fCosInnerConeAngleUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "CosInnerConeAngle", &cosInner);

+ kFloat_GrSLType, kDefault_GrSLPrecision,

+ "CosInnerConeAngle", &cosInner);

fCosOuterConeAngleUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "CosOuterConeAngle", &cosOuter);

+ kFloat_GrSLType, kDefault_GrSLPrecision,

+ "CosOuterConeAngle", &cosOuter);

fConeScaleUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kFloat_GrSLType, "ConeScale", &coneScale);

+ kFloat_GrSLType, kDefault_GrSLPrecision,

+ "ConeScale", &coneScale);

fSUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

- kVec3f_GrSLType, "S", &s);

+ kVec3f_GrSLType, kDefault_GrSLPrecision, "S", &s);

static const GrGLShaderVar gLightColorArgs[] = {

GrGLShaderVar("surfaceToLight", kVec3f_GrSLType)

« no previous file with comments | « src/effects/SkDisplacementMapEffect.cpp ('k') | src/effects/SkMagnifierImageFilter.cpp » ('j') | no next file with comments »