diff options
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r-- | src/gpu/glsl/GrGLSLBlend.cpp | 1 | ||||
-rwxr-xr-x | src/gpu/glsl/GrGLSLCaps.cpp | 1 | ||||
-rwxr-xr-x | src/gpu/glsl/GrGLSLCaps.h | 6 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp | 7 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLPLSPathRendering.h | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 4 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 2 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramDataManager.cpp | 2 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.cpp | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLVarying.cpp | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp | 1 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLVertexShaderBuilder.h | 2 |
14 files changed, 10 insertions, 21 deletions
diff --git a/src/gpu/glsl/GrGLSLBlend.cpp b/src/gpu/glsl/GrGLSLBlend.cpp index 6937977a94..d2c364035b 100644 --- a/src/gpu/glsl/GrGLSLBlend.cpp +++ b/src/gpu/glsl/GrGLSLBlend.cpp @@ -479,4 +479,3 @@ void GrGLSLBlend::AppendRegionOp(GrGLSLFragmentBuilder* fsBuilder, const char* s } fsBuilder->codeAppend(";"); } - diff --git a/src/gpu/glsl/GrGLSLCaps.cpp b/src/gpu/glsl/GrGLSLCaps.cpp index f14274143b..c2404c6e52 100755 --- a/src/gpu/glsl/GrGLSLCaps.cpp +++ b/src/gpu/glsl/GrGLSLCaps.cpp @@ -94,4 +94,3 @@ SkString GrGLSLCaps::dump() const { void GrGLSLCaps::onApplyOptionsOverrides(const GrContextOptions& options) { } - diff --git a/src/gpu/glsl/GrGLSLCaps.h b/src/gpu/glsl/GrGLSLCaps.h index f54c61d933..7b0868ea92 100755 --- a/src/gpu/glsl/GrGLSLCaps.h +++ b/src/gpu/glsl/GrGLSLCaps.h @@ -15,7 +15,7 @@ class GrGLSLCaps : public GrShaderCaps { public: - + /** * Indicates how GLSL must interact with advanced blend equations. The KHR extension requires @@ -77,7 +77,7 @@ public: bool mustEnableSpecificAdvBlendEqs() const { return fAdvBlendEqInteraction == kSpecificEnables_AdvBlendEqInteraction; } - + bool mustDeclareFragmentShaderOutput() const { return fGLSLGeneration > k110_GrGLSLGeneration; } @@ -173,7 +173,7 @@ private: void onApplyOptionsOverrides(const GrContextOptions& options) override; GrGLSLGeneration fGLSLGeneration; - + bool fDropsTileOnZeroDivide : 1; bool fFBFetchSupport : 1; bool fFBFetchNeedsCustomOutput : 1; diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp index 166e474434..a52b1a6386 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp @@ -176,7 +176,7 @@ const char* GrGLSLFragmentShaderBuilder::fragmentPosition() { // The Adreno compiler seems to be very touchy about access to "gl_FragCoord". // Accessing glFragCoord.zw can cause a program to fail to link. Additionally, // depending on the surrounding code, accessing .xy with a uniform involved can - // do the same thing. Copying gl_FragCoord.xy into a temp vec2 beforehand + // do the same thing. Copying gl_FragCoord.xy into a temp vec2 beforehand // (and only accessing .xy) seems to "fix" things. const char* precision = glslCaps->usesPrecisionModifiers() ? "highp " : ""; this->codePrependf("\t%svec4 %s = vec4(%s.x, %s - %s.y, 1.0, 1.0);\n", @@ -264,7 +264,7 @@ const char* GrGLSLFragmentShaderBuilder::dstColor() { return fbFetchColorName; } else { return kDstTextureColorName; - } + } } void GrGLSLFragmentShaderBuilder::enableAdvancedBlendEquationIfNeeded(GrBlendEquation equation) { @@ -322,7 +322,7 @@ void GrGLSLFragmentBuilder::declAppendf(const char* fmt, ...) { va_list argp; va_start(argp, fmt); inputs().appendVAList(fmt, argp); - va_end(argp); + va_end(argp); } const char* GrGLSLFragmentShaderBuilder::getSecondaryColorOutputName() const { @@ -392,4 +392,3 @@ void GrGLSLFragmentShaderBuilder::onAfterChildProcEmitCode() { int removeAt = fMangleString.findLastOf('_'); fMangleString.remove(removeAt, fMangleString.size() - removeAt); } - diff --git a/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp b/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp index 25e9f9e320..eddd69f7cd 100644 --- a/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp @@ -17,4 +17,3 @@ GrGLSLGeometryBuilder::GrGLSLGeometryBuilder(GrGLSLProgramBuilder* program) void GrGLSLGeometryBuilder::onFinalize() { fProgramBuilder->varyingHandler()->getGeomDecls(&this->inputs(), &this->outputs()); } - diff --git a/src/gpu/glsl/GrGLSLPLSPathRendering.h b/src/gpu/glsl/GrGLSLPLSPathRendering.h index 9a1625d43e..60889e98d2 100644 --- a/src/gpu/glsl/GrGLSLPLSPathRendering.h +++ b/src/gpu/glsl/GrGLSLPLSPathRendering.h @@ -10,4 +10,3 @@ " layout(rgba8i) ivec4 windings;\n"\ " layout(rgba8) vec4 dstColor;\n"\ "} pls;\n" - diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 83b50ad534..512d9d14d9 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -69,9 +69,9 @@ bool GrGLSLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, this->emitAndInstallFragProcs(0, this->pipeline().numColorFragmentProcessors(), inputColor); this->emitAndInstallFragProcs(this->pipeline().numColorFragmentProcessors(), numProcs, inputCoverage); - if (primProc.getPixelLocalStorageState() != + if (primProc.getPixelLocalStorageState() != GrPixelLocalStorageState::kDraw_GrPixelLocalStorageState) { - this->emitAndInstallXferProc(this->pipeline().getXferProcessor(), *inputColor, + this->emitAndInstallXferProc(this->pipeline().getXferProcessor(), *inputColor, *inputCoverage, this->pipeline().ignoresCoverage(), primProc.getPixelLocalStorageState()); this->emitFSOutputSwizzle(this->pipeline().getXferProcessor().hasSecondaryOutput()); diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 67d1eb653b..952db7e09b 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -53,7 +53,7 @@ public: // Used to add a uniform in the vertex shader for transforming into normalized device space. void addRTAdjustmentUniform(GrSLPrecision precision, const char* name, const char** outName); const char* rtAdjustment() const { return "rtAdjustment"; } - + // Used to add a uniform for the RenderTarget height (used for frag position) without mangling // the name of the uniform inside of a stage. void addRTHeightUniform(const char* name, const char** outName); diff --git a/src/gpu/glsl/GrGLSLProgramDataManager.cpp b/src/gpu/glsl/GrGLSLProgramDataManager.cpp index 8d3d3cea80..0c98e08edd 100644 --- a/src/gpu/glsl/GrGLSLProgramDataManager.cpp +++ b/src/gpu/glsl/GrGLSLProgramDataManager.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2016 Google Inc. * @@ -24,4 +23,3 @@ void GrGLSLProgramDataManager::setSkMatrix(UniformHandle u, const SkMatrix& matr }; this->setMatrix3f(u, mt); } - diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp index 30bf86d210..93b9f8a57a 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp @@ -174,4 +174,3 @@ void GrGLSLShaderBuilder::finalize(uint32_t visibility) { fFinalized = true; } - diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index 14835fbd26..a2f70532ad 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -70,4 +70,3 @@ private: }; #endif - diff --git a/src/gpu/glsl/GrGLSLVarying.cpp b/src/gpu/glsl/GrGLSLVarying.cpp index d124e77b67..f3b0405ff5 100644 --- a/src/gpu/glsl/GrGLSLVarying.cpp +++ b/src/gpu/glsl/GrGLSLVarying.cpp @@ -157,4 +157,3 @@ void GrGLSLVaryingHandler::getFragDecls(SkString* inputDecls, SkString* outputDe this->appendDecls(fFragInputs, inputDecls); this->appendDecls(fFragOutputs, outputDecls); } - diff --git a/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp b/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp index 005b2725ff..4931e0f256 100644 --- a/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp @@ -53,4 +53,3 @@ void GrGLSLVertexBuilder::transformToNormalizedDeviceSpace(const GrShaderVar& po void GrGLSLVertexBuilder::onFinalize() { fProgramBuilder->varyingHandler()->getVertexDecls(&this->inputs(), &this->outputs()); } - diff --git a/src/gpu/glsl/GrGLSLVertexShaderBuilder.h b/src/gpu/glsl/GrGLSLVertexShaderBuilder.h index 7c624cee65..af8d10c2cb 100644 --- a/src/gpu/glsl/GrGLSLVertexShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLVertexShaderBuilder.h @@ -23,7 +23,7 @@ public: void transformToNormalizedDeviceSpace(const GrShaderVar& posVar); private: void onFinalize() override; - + const char* fRtAdjustName; friend class GrGLProgramBuilder; |