From cba99b88fd5fb39def7a094dc32c0745c7a1cfea Mon Sep 17 00:00:00 2001 From: jvanverth Date: Wed, 24 Jun 2015 06:59:57 -0700 Subject: Move GLSL-specific routines/classes to separate glsl directory The purpose is to begin separating our GLSL-specific code from our GL-specific code, so it can be used with the GL45 platform Review URL: https://codereview.chromium.org/1202293002 --- src/gpu/glsl/GrGLSL.cpp | 35 +++++ src/gpu/glsl/GrGLSL.h | 326 ++++++++++++++++++++++++++++++++++++++++++++ src/gpu/glsl/GrGLSLCaps.cpp | 47 +++++++ src/gpu/glsl/GrGLSLCaps.h | 94 +++++++++++++ src/gpu/glsl/GrGLSL_impl.h | 175 ++++++++++++++++++++++++ 5 files changed, 677 insertions(+) create mode 100644 src/gpu/glsl/GrGLSL.cpp create mode 100644 src/gpu/glsl/GrGLSL.h create mode 100755 src/gpu/glsl/GrGLSLCaps.cpp create mode 100755 src/gpu/glsl/GrGLSLCaps.h create mode 100644 src/gpu/glsl/GrGLSL_impl.h (limited to 'src/gpu/glsl') diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/glsl/GrGLSL.cpp new file mode 100644 index 0000000000..c77b7fab20 --- /dev/null +++ b/src/gpu/glsl/GrGLSL.cpp @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "GrGLSL.h" +#include "SkString.h" + +bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration gen) { + switch (gen) { + case k110_GrGLSLGeneration: + return false; + case k130_GrGLSLGeneration: + case k140_GrGLSLGeneration: + case k150_GrGLSLGeneration: + case k330_GrGLSLGeneration: + case k310es_GrGLSLGeneration: + return true; + } + return false; +} + +void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor) { + if (mulFactor.isOnes()) { + *outAppend = SkString(); + } + + if (mulFactor.isZeros()) { + outAppend->appendf("%s = vec4(0);", vec4VarName); + } else { + outAppend->appendf("%s *= %s;", vec4VarName, mulFactor.c_str()); + } +} diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h new file mode 100644 index 0000000000..efe31fe2dd --- /dev/null +++ b/src/gpu/glsl/GrGLSL.h @@ -0,0 +1,326 @@ +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef GrGLSL_DEFINED +#define GrGLSL_DEFINED + +#include "GrTypesPriv.h" +#include "SkString.h" + +// Limited set of GLSL versions we build shaders for. Caller should round +// down the GLSL version to one of these enums. +enum GrGLSLGeneration { + /** + * Desktop GLSL 1.10 and ES2 shading language (based on desktop GLSL 1.20) + */ + k110_GrGLSLGeneration, + /** + * Desktop GLSL 1.30 + */ + k130_GrGLSLGeneration, + /** + * Desktop GLSL 1.40 + */ + k140_GrGLSLGeneration, + /** + * Desktop GLSL 1.50 + */ + k150_GrGLSLGeneration, + /** + * Desktop GLSL 3.30, and ES GLSL 3.00 + */ + k330_GrGLSLGeneration, + /** + * ES GLSL 3.10 only TODO Make GLSLCap objects to make this more granular + */ + k310es_GrGLSLGeneration, +}; + +bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration); + +/** + * Gets the name of the function that should be used to sample a 2D texture. Coord type is used + * to indicate whether the texture is sampled using projective textured (kVec3f) or not (kVec2f). + */ +inline const char* GrGLSLTexture2DFunctionName(GrSLType coordType, GrGLSLGeneration glslGen) { + if (kVec2f_GrSLType == coordType) { + return glslGen >= k130_GrGLSLGeneration ? "texture" : "texture2D"; + } else { + SkASSERT(kVec3f_GrSLType == coordType); + return glslGen >= k130_GrGLSLGeneration ? "textureProj" : "texture2DProj"; + } +} + +/** + * Converts a GrSLType to a string containing the name of the equivalent GLSL type. + */ +static inline const char* GrGLSLTypeString(GrSLType t) { + switch (t) { + case kVoid_GrSLType: + return "void"; + case kFloat_GrSLType: + return "float"; + case kVec2f_GrSLType: + return "vec2"; + case kVec3f_GrSLType: + return "vec3"; + case kVec4f_GrSLType: + return "vec4"; + case kMat33f_GrSLType: + return "mat3"; + case kMat44f_GrSLType: + return "mat4"; + case kSampler2D_GrSLType: + return "sampler2D"; + default: + SkFAIL("Unknown shader var type."); + return ""; // suppress warning + } +} + +/** A generic base-class representing a GLSL expression. + * The instance can be a variable name, expression or vecN(0) or vecN(1). Does simple constant + * folding with help of 1 and 0. + * + * Clients should not use this class, rather the specific instantiations defined + * later, for example GrGLSLExpr4. + */ +template +class GrGLSLExpr { +public: + bool isOnes() const { return kOnes_ExprType == fType; } + bool isZeros() const { return kZeros_ExprType == fType; } + + const char* c_str() const { + if (kZeros_ExprType == fType) { + return Self::ZerosStr(); + } else if (kOnes_ExprType == fType) { + return Self::OnesStr(); + } + SkASSERT(!fExpr.isEmpty()); // Empty expressions should not be used. + return fExpr.c_str(); + } + + bool isValid() const { + return kFullExpr_ExprType != fType || !fExpr.isEmpty(); + } + +protected: + /** Constructs an invalid expression. + * Useful only as a return value from functions that never actually return + * this and instances that will be assigned to later. */ + GrGLSLExpr() + : fType(kFullExpr_ExprType) { + // The only constructor that is allowed to build an empty expression. + SkASSERT(!this->isValid()); + } + + /** Constructs an expression with all components as value v */ + explicit GrGLSLExpr(int v) { + if (v == 0) { + fType = kZeros_ExprType; + } else if (v == 1) { + fType = kOnes_ExprType; + } else { + fType = kFullExpr_ExprType; + fExpr.appendf(Self::CastIntStr(), v); + } + } + + /** Constructs an expression from a string. + * Argument expr is a simple expression or a parenthesized expression. */ + // TODO: make explicit once effects input Exprs. + GrGLSLExpr(const char expr[]) { + if (NULL == expr) { // TODO: remove this once effects input Exprs. + fType = kOnes_ExprType; + } else { + fType = kFullExpr_ExprType; + fExpr = expr; + } + SkASSERT(this->isValid()); + } + + /** Constructs an expression from a string. + * Argument expr is a simple expression or a parenthesized expression. */ + // TODO: make explicit once effects input Exprs. + GrGLSLExpr(const SkString& expr) { + if (expr.isEmpty()) { // TODO: remove this once effects input Exprs. + fType = kOnes_ExprType; + } else { + fType = kFullExpr_ExprType; + fExpr = expr; + } + SkASSERT(this->isValid()); + } + + /** Constructs an expression from a string with one substitution. */ + GrGLSLExpr(const char format[], const char in0[]) + : fType(kFullExpr_ExprType) { + fExpr.appendf(format, in0); + } + + /** Constructs an expression from a string with two substitutions. */ + GrGLSLExpr(const char format[], const char in0[], const char in1[]) + : fType(kFullExpr_ExprType) { + fExpr.appendf(format, in0, in1); + } + + /** Returns expression casted to another type. + * Generic implementation that is called for non-trivial cases of casts. */ + template + static Self VectorCastImpl(const T& other); + + /** Returns a GLSL multiplication: component-wise or component-by-scalar. + * The multiplication will be component-wise or multiply each component by a scalar. + * + * The returned expression will compute the value of: + * vecN(in0.x * in1.x, ...) if dim(T0) == dim(T1) (component-wise) + * vecN(in0.x * in1, ...) if dim(T1) == 1 (vector by scalar) + * vecN(in0 * in1.x, ...) if dim(T0) == 1 (scalar by vector) + */ + template + static Self Mul(T0 in0, T1 in1); + + /** Returns a GLSL addition: component-wise or add a scalar to each component. + * Return value computes: + * vecN(in0.x + in1.x, ...) or vecN(in0.x + in1, ...) or vecN(in0 + in1.x, ...). + */ + template + static Self Add(T0 in0, T1 in1); + + /** Returns a GLSL subtraction: component-wise or subtract compoments by a scalar. + * Return value computes + * vecN(in0.x - in1.x, ...) or vecN(in0.x - in1, ...) or vecN(in0 - in1.x, ...). + */ + template + static Self Sub(T0 in0, T1 in1); + + /** Returns expression that accesses component(s) of the expression. + * format should be the form "%s.x" where 'x' is the component(s) to access. + * Caller is responsible for making sure the amount of components in the + * format string is equal to dim(T). + */ + template + T extractComponents(const char format[]) const; + +private: + enum ExprType { + kZeros_ExprType, + kOnes_ExprType, + kFullExpr_ExprType, + }; + ExprType fType; + SkString fExpr; +}; + +class GrGLSLExpr1; +class GrGLSLExpr4; + +/** Class representing a float GLSL expression. */ +class GrGLSLExpr1 : public GrGLSLExpr { +public: + GrGLSLExpr1() + : INHERITED() { + } + explicit GrGLSLExpr1(int v) + : INHERITED(v) { + } + GrGLSLExpr1(const char* expr) + : INHERITED(expr) { + } + GrGLSLExpr1(const SkString& expr) + : INHERITED(expr) { + } + + static GrGLSLExpr1 VectorCast(const GrGLSLExpr1& expr); + +private: + GrGLSLExpr1(const char format[], const char in0[]) + : INHERITED(format, in0) { + } + GrGLSLExpr1(const char format[], const char in0[], const char in1[]) + : INHERITED(format, in0, in1) { + } + + static const char* ZerosStr(); + static const char* OnesStr(); + static const char* CastStr(); + static const char* CastIntStr(); + + friend GrGLSLExpr1 operator*(const GrGLSLExpr1& in0, const GrGLSLExpr1&in1); + friend GrGLSLExpr1 operator+(const GrGLSLExpr1& in0, const GrGLSLExpr1&in1); + friend GrGLSLExpr1 operator-(const GrGLSLExpr1& in0, const GrGLSLExpr1&in1); + + friend class GrGLSLExpr; + friend class GrGLSLExpr; + + typedef GrGLSLExpr INHERITED; +}; + +/** Class representing a float vector (vec4) GLSL expression. */ +class GrGLSLExpr4 : public GrGLSLExpr { +public: + GrGLSLExpr4() + : INHERITED() { + } + explicit GrGLSLExpr4(int v) + : INHERITED(v) { + } + GrGLSLExpr4(const char* expr) + : INHERITED(expr) { + } + GrGLSLExpr4(const SkString& expr) + : INHERITED(expr) { + } + + typedef GrGLSLExpr1 AExpr; + AExpr a() const; + + /** GLSL vec4 cast / constructor, eg vec4(floatv) -> vec4(floatv, floatv, floatv, floatv) */ + static GrGLSLExpr4 VectorCast(const GrGLSLExpr1& expr); + static GrGLSLExpr4 VectorCast(const GrGLSLExpr4& expr); + +private: + GrGLSLExpr4(const char format[], const char in0[]) + : INHERITED(format, in0) { + } + GrGLSLExpr4(const char format[], const char in0[], const char in1[]) + : INHERITED(format, in0, in1) { + } + + static const char* ZerosStr(); + static const char* OnesStr(); + static const char* CastStr(); + static const char* CastIntStr(); + + // The vector-by-scalar and scalar-by-vector binary operations. + friend GrGLSLExpr4 operator*(const GrGLSLExpr1& in0, const GrGLSLExpr4&in1); + friend GrGLSLExpr4 operator+(const GrGLSLExpr1& in0, const GrGLSLExpr4&in1); + friend GrGLSLExpr4 operator-(const GrGLSLExpr1& in0, const GrGLSLExpr4&in1); + friend GrGLSLExpr4 operator*(const GrGLSLExpr4& in0, const GrGLSLExpr1&in1); + friend GrGLSLExpr4 operator+(const GrGLSLExpr4& in0, const GrGLSLExpr1&in1); + friend GrGLSLExpr4 operator-(const GrGLSLExpr4& in0, const GrGLSLExpr1&in1); + + // The vector-by-vector, i.e. component-wise, binary operations. + friend GrGLSLExpr4 operator*(const GrGLSLExpr4& in0, const GrGLSLExpr4&in1); + friend GrGLSLExpr4 operator+(const GrGLSLExpr4& in0, const GrGLSLExpr4&in1); + friend GrGLSLExpr4 operator-(const GrGLSLExpr4& in0, const GrGLSLExpr4&in1); + + friend class GrGLSLExpr; + + typedef GrGLSLExpr INHERITED; +}; + +/** + * Does an inplace mul, *=, of vec4VarName by mulFactor. + * A semicolon is added after the assignment. + */ +void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor); + +#include "GrGLSL_impl.h" + +#endif diff --git a/src/gpu/glsl/GrGLSLCaps.cpp b/src/gpu/glsl/GrGLSLCaps.cpp new file mode 100755 index 0000000000..cb72864347 --- /dev/null +++ b/src/gpu/glsl/GrGLSLCaps.cpp @@ -0,0 +1,47 @@ +/* + * Copyright 2012 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + + +#include "GrGLSLCaps.h" + +//////////////////////////////////////////////////////////////////////////////////////////// + +GrGLSLCaps::GrGLSLCaps(const GrContextOptions& options) { + fDropsTileOnZeroDivide = false; + fFBFetchSupport = false; + fFBFetchNeedsCustomOutput = false; + fBindlessTextureSupport = false; + fAdvBlendEqInteraction = kNotSupported_AdvBlendEqInteraction; + fFBFetchColorName = NULL; + fFBFetchExtensionString = NULL; +} + +SkString GrGLSLCaps::dump() const { + SkString r = INHERITED::dump(); + + static const char* kAdvBlendEqInteractionStr[] = { + "Not Supported", + "Automatic", + "General Enable", + "Specific Enables", + }; + GR_STATIC_ASSERT(0 == kNotSupported_AdvBlendEqInteraction); + GR_STATIC_ASSERT(1 == kAutomatic_AdvBlendEqInteraction); + GR_STATIC_ASSERT(2 == kGeneralEnable_AdvBlendEqInteraction); + GR_STATIC_ASSERT(3 == kSpecificEnables_AdvBlendEqInteraction); + GR_STATIC_ASSERT(SK_ARRAY_COUNT(kAdvBlendEqInteractionStr) == kLast_AdvBlendEqInteraction + 1); + + r.appendf("--- GLSL-Specific ---\n"); + + r.appendf("FB Fetch Support: %s\n", (fFBFetchSupport ? "YES" : "NO")); + r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO")); + r.appendf("Bindless texture support: %s\n", (fBindlessTextureSupport ? "YES" : "NO")); + r.appendf("Advanced blend equation interaction: %s\n", + kAdvBlendEqInteractionStr[fAdvBlendEqInteraction]); + return r; +} + diff --git a/src/gpu/glsl/GrGLSLCaps.h b/src/gpu/glsl/GrGLSLCaps.h new file mode 100755 index 0000000000..3264535704 --- /dev/null +++ b/src/gpu/glsl/GrGLSLCaps.h @@ -0,0 +1,94 @@ +/* + * Copyright 2012 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + + +#ifndef GrGLSLCaps_DEFINED +#define GrGLSLCaps_DEFINED + +#include "GrCaps.h" +#include "GrGLSL.h" + +class GrGLSLCaps : public GrShaderCaps { +public: + SK_DECLARE_INST_COUNT(GrGLSLCaps) + + /** + * Indicates how GLSL must interact with advanced blend equations. The KHR extension requires + * special layout qualifiers in the fragment shader. + */ + enum AdvBlendEqInteraction { + kNotSupported_AdvBlendEqInteraction, //= kGeneralEnable_AdvBlendEqInteraction; + } + + bool mustEnableSpecificAdvBlendEqs() const { + return fAdvBlendEqInteraction == kSpecificEnables_AdvBlendEqInteraction; + } + + bool mustDeclareFragmentShaderOutput() const { + return fGLSLGeneration > k110_GrGLSLGeneration; + } + + GrGLSLGeneration generation() const { return fGLSLGeneration; } + + /** + * Returns a string containing the caps info. + */ + SkString dump() const override; + +private: + GrGLSLGeneration fGLSLGeneration; + + bool fDropsTileOnZeroDivide : 1; + bool fFBFetchSupport : 1; + bool fFBFetchNeedsCustomOutput : 1; + bool fBindlessTextureSupport : 1; + + const char* fFBFetchColorName; + const char* fFBFetchExtensionString; + + AdvBlendEqInteraction fAdvBlendEqInteraction; + + friend class GrGLCaps; // For initialization. + + typedef GrShaderCaps INHERITED; +}; + + +#endif diff --git a/src/gpu/glsl/GrGLSL_impl.h b/src/gpu/glsl/GrGLSL_impl.h new file mode 100644 index 0000000000..bdd69cc76b --- /dev/null +++ b/src/gpu/glsl/GrGLSL_impl.h @@ -0,0 +1,175 @@ +/* + * Copyright 2013 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef GrGLSL_impl_DEFINED +#define GrGLSL_impl_DEFINED + +template +template +inline Self GrGLSLExpr::VectorCastImpl(const T& expr) { + if (expr.isZeros()) { + return Self(0); + } + if (expr.isOnes()) { + return Self(1); + } + return Self(Self::CastStr(), expr.c_str()); +} + +template +template +inline Self GrGLSLExpr::Mul(T0 in0, T1 in1) { + if (in0.isZeros() || in1.isZeros()) { + return Self(0); + } + if (in0.isOnes()) { + return Self::VectorCast(in1); + } + if (in1.isOnes()) { + return Self::VectorCast(in0); + } + return Self("(%s * %s)", in0.c_str(), in1.c_str()); +} + +template +template +inline Self GrGLSLExpr::Add(T0 in0, T1 in1) { + if (in1.isZeros()) { + return Self::VectorCast(in0); + } + if (in0.isZeros()) { + return Self::VectorCast(in1); + } + if (in0.isOnes() && in1.isOnes()) { + return Self(2); + } + return Self("(%s + %s)", in0.c_str(), in1.c_str()); +} + +template +template +inline Self GrGLSLExpr::Sub(T0 in0, T1 in1) { + if (in1.isZeros()) { + return Self::VectorCast(in0); + } + if (in1.isOnes()) { + if (in0.isOnes()) { + return Self(0); + } + } + + return Self("(%s - %s)", in0.c_str(), in1.c_str()); +} + +template +template +T GrGLSLExpr::extractComponents(const char format[]) const { + if (this->isZeros()) { + return T(0); + } + if (this->isOnes()) { + return T(1); + } + return T(format, this->c_str()); +} + +inline GrGLSLExpr1 GrGLSLExpr1::VectorCast(const GrGLSLExpr1& expr) { + return expr; +} + +inline const char* GrGLSLExpr1::ZerosStr() { + return "0"; +} + +inline const char* GrGLSLExpr1::OnesStr() { + return "1.0"; +} + +// GrGLSLExpr1::CastStr() is unimplemented because using them is likely an +// error. This is now caught compile-time. + +inline const char* GrGLSLExpr1::CastIntStr() { + return "%d"; +} + +inline GrGLSLExpr1 operator*(const GrGLSLExpr1& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr1::Mul(in0, in1); +} + +inline GrGLSLExpr1 operator+(const GrGLSLExpr1& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr1::Add(in0, in1); +} + +inline GrGLSLExpr1 operator-(const GrGLSLExpr1& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr1::Sub(in0, in1); +} + +inline const char* GrGLSLExpr4::ZerosStr() { + return "vec4(0)"; +} + +inline const char* GrGLSLExpr4::OnesStr() { + return "vec4(1)"; +} + +inline const char* GrGLSLExpr4::CastStr() { + return "vec4(%s)"; +} + +inline const char* GrGLSLExpr4::CastIntStr() { + return "vec4(%d)"; +} + +inline GrGLSLExpr4 GrGLSLExpr4::VectorCast(const GrGLSLExpr1& expr) { + return INHERITED::VectorCastImpl(expr); +} + +inline GrGLSLExpr4 GrGLSLExpr4::VectorCast(const GrGLSLExpr4& expr) { + return expr; +} + +inline GrGLSLExpr4::AExpr GrGLSLExpr4::a() const { + return this->extractComponents("%s.a"); +} + +inline GrGLSLExpr4 operator*(const GrGLSLExpr1& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Mul(in0, in1); +} + +inline GrGLSLExpr4 operator+(const GrGLSLExpr1& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Add(in0, in1); +} + +inline GrGLSLExpr4 operator-(const GrGLSLExpr1& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Sub(in0, in1); +} + +inline GrGLSLExpr4 operator*(const GrGLSLExpr4& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr4::Mul(in0, in1); +} + +inline GrGLSLExpr4 operator+(const GrGLSLExpr4& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr4::Add(in0, in1); +} + +inline GrGLSLExpr4 operator-(const GrGLSLExpr4& in0, const GrGLSLExpr1& in1) { + return GrGLSLExpr4::Sub(in0, in1); +} + +inline GrGLSLExpr4 operator*(const GrGLSLExpr4& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Mul(in0, in1); +} + +inline GrGLSLExpr4 operator+(const GrGLSLExpr4& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Add(in0, in1); +} + +inline GrGLSLExpr4 operator-(const GrGLSLExpr4& in0, const GrGLSLExpr4& in1) { + return GrGLSLExpr4::Sub(in0, in1); +} + +#endif -- cgit v1.2.3