AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Restrict where 'binding' and 'set' can appear"

Browse Source 
This reverts commit 9372ef0228.

Reason for revert: Unhappy bots

Original change's description:
> Restrict where 'binding' and 'set' can appear
>
> In SPIRV, these are an error when applied to struct members. Some of our
> tests were triggering that because we had free-floating uniforms
> decorated this way (and we coalesce those into members of an interface
> block).
>
> Now, we only allow those layout qualifiers on variable types that will
> remain top-level constructs in the back-end.
>
> Bug: skia:12670
> Change-Id: I73e69cecf6237a1c1180ad38d9b5d52ea80316fb
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/474218
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

Bug: skia:12670
Change-Id: Ie518192d9a52fc896e615ec08ce0674ad683ec61
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/475099
Auto-Submit: Brian Osman <brianosman@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Brian Osman 2021-11-22 19:51:10 +00:00 committed by SkCQ
parent e00afb0a1a
commit d7ebf8604e
17 changed files with 35 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/sksl/errors/VertexEarlyReturn.vert
View File

@ -1,4 +1,4 @@
uniform half zoom;
layout(set=0) uniform half zoom;
void main() {
sk_Position = half4(1);

2
resources/sksl/metal/OpaqueTypeInStruct.sksl
View File

@ -1,3 +1,3 @@
struct Bad { sampler x; };
uniform Bad b;
layout (set=0) uniform Bad b;
void main() {}

2
resources/sksl/shared/ComplexDelete.sksl
View File

@ -1,4 +1,4 @@
uniform float4x4 colorXform;
layout(set=0) uniform float4x4 colorXform;
layout(binding=0) uniform sampler2D s;
void main() {

2
resources/sksl/shared/NoFragCoordsPosRT.vert
View File

@ -1,6 +1,6 @@
/*#pragma settings CannotUseFragCoord*/
uniform float4 sk_RTAdjust;
layout(set=0) uniform float4 sk_RTAdjust;
layout(location=0) in float4 pos;
void main() {

2
resources/sksl/shared/NormalizationVert.vert
View File

@ -1,4 +1,4 @@
uniform float4 sk_RTAdjust;
layout(set=0) uniform float4 sk_RTAdjust;
void main() {
sk_Position = half4(1);

1
src/sksl/SkSLDehydrator.cpp
View File

@ -194,7 +194,6 @@ void Dehydrator::write(const Symbol& s) {
this->write(f.fName);
this->write(*f.fType);
}
this->writeU8(t.isInterfaceBlock());
break;
default:
this->writeCommand(Rehydrator::kSystemType_Command);

5
src/sksl/SkSLRehydrator.cpp
View File

@ -191,10 +191,9 @@ const Symbol* Rehydrator::symbol() {
const Type* type = this->type();
fields.emplace_back(m, fieldName, type);
}
bool interfaceBlock = this->readU8();
skstd::string_view nameChars(*fSymbolTable->takeOwnershipOfString(std::move(name)));
const Type* result = fSymbolTable->takeOwnershipOfSymbol(Type::MakeStructType(
/*line=*/-1, nameChars, std::move(fields), interfaceBlock));
const Type* result = fSymbolTable->takeOwnershipOfSymbol(
Type::MakeStructType(/*line=*/-1, nameChars, std::move(fields)));
this->addSymbol(id, result);
return result;
}

16
src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
View File

@ -2980,9 +2980,6 @@ void SPIRVCodeGenerator::writeLayout(const Layout& layout, SpvId target) {
}
void SPIRVCodeGenerator::writeLayout(const Layout& layout, SpvId target, int member) {
// 'binding' and 'set' can not be applied to struct members
SkASSERT(layout.fBinding == -1);
SkASSERT(layout.fSet == -1);
if (layout.fLocation >= 0) {
this->writeInstruction(SpvOpMemberDecorate, target, member, SpvDecorationLocation,
layout.fLocation, fDecorationBuffer);
@ -3035,9 +3032,8 @@ SpvId SPIRVCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf, bool a
fContext.fTypes.fFloat2.get());
{
AutoAttachPoolToThread attach(fProgram.fPool.get());
const Type* rtFlipStructType =
fProgram.fSymbols->takeOwnershipOfSymbol(Type::MakeStructType(
type.fLine, type.name(), std::move(fields), /*interfaceBlock=*/true));
const Type* rtFlipStructType = fProgram.fSymbols->takeOwnershipOfSymbol(
Type::MakeStructType(type.fLine, type.name(), std::move(fields)));
const Variable* modifiedVar = fProgram.fSymbols->takeOwnershipOfSymbol(
std::make_unique<Variable>(intfVar.fLine,
&intfVar.modifiers(),
@ -3436,8 +3432,8 @@ void SPIRVCodeGenerator::writeUniformBuffer(std::shared_ptr<SymbolTable> topLeve
fTopLevelUniformMap[var] = (int)fields.size();
fields.emplace_back(var->modifiers(), var->name(), &var->type());
}
fUniformBuffer.fStruct = Type::MakeStructType(
/*line=*/-1, kUniformBufferName, std::move(fields), /*interfaceBlock=*/true);
fUniformBuffer.fStruct = Type::MakeStructType(/*line=*/-1, kUniformBufferName,
std::move(fields));
// Create a global variable to contain this struct.
Layout layout;
@ -3481,8 +3477,8 @@ void SPIRVCodeGenerator::addRTFlipUniform(int line) {
SKSL_RTFLIP_NAME,
fContext.fTypes.fFloat2.get());
skstd::string_view name = "sksl_synthetic_uniforms";
const Type* intfStruct = fSynthetics.takeOwnershipOfSymbol(
Type::MakeStructType(/*line=*/-1, name, fields, /*interfaceBlock=*/true));
const Type* intfStruct =
fSynthetics.takeOwnershipOfSymbol(Type::MakeStructType(/*line=*/-1, name, fields));
int binding = fProgram.fConfig->fSettings.fRTFlipBinding;
if (binding == -1) {
fContext.fErrors->error(line, "layout(binding=...) is required in SPIR-V");

5
src/sksl/dsl/DSLCore.cpp
View File

@ -251,9 +251,8 @@ public:
skslFields.push_back(SkSL::Type::Field(field.fModifiers.fModifiers, field.fName,
&field.fType.skslType()));
}
const SkSL::Type* structType =
ThreadContext::SymbolTable()->takeOwnershipOfSymbol(SkSL::Type::MakeStructType(
pos.line(), typeName, std::move(skslFields), /*interfaceBlock=*/true));
const SkSL::Type* structType = ThreadContext::SymbolTable()->takeOwnershipOfSymbol(
SkSL::Type::MakeStructType(pos.line(), typeName, std::move(skslFields)));
DSLType varType = arraySize > 0 ? Array(structType, arraySize) : DSLType(structType);
DSLGlobalVar var(modifiers, varType, !varName.empty() ? varName : typeName, DSLExpression(),
pos);

2
src/sksl/generated/sksl_vert.dehydrated.sksl
View File

@ -15,7 +15,7 @@ static uint8_t SKSL_INCLUDE_sksl_vert[] = {82,0,
49,2,0,27,0,
36,
35,0,2,0,0,255,255,255,255,255,1,0,255,0,34,0,
49,3,0,47,0,1,
49,3,0,47,0,
52,4,0,
36,
16,32,2,0,

23
src/sksl/ir/SkSLInterfaceBlock.h
View File

@ -31,22 +31,15 @@ class InterfaceBlock final : public ProgramElement {
public:
inline static constexpr Kind kProgramElementKind = Kind::kInterfaceBlock;
InterfaceBlock(int line,
const Variable& var,
skstd::string_view typeName,
skstd::string_view instanceName,
int arraySize,
InterfaceBlock(int line, const Variable& var, skstd::string_view typeName,
skstd::string_view instanceName, int arraySize,
std::shared_ptr<SymbolTable> typeOwner)
: INHERITED(line, kProgramElementKind)
, fVariable(var)
, fTypeName(typeName)
, fInstanceName(instanceName)
, fArraySize(arraySize)
, fTypeOwner(std::move(typeOwner)) {
SkASSERT(fVariable.type().isInterfaceBlock() ||
(fVariable.type().isArray() &&
fVariable.type().componentType().isInterfaceBlock()));
}
: INHERITED(line, kProgramElementKind)
, fVariable(var)
, fTypeName(typeName)
, fInstanceName(instanceName)
, fArraySize(arraySize)
, fTypeOwner(std::move(typeOwner)) {}
const Variable& variable() const {
return fVariable;

17
src/sksl/ir/SkSLType.cpp
View File

@ -329,10 +329,9 @@ class StructType final : public Type {
public:
inline static constexpr TypeKind kTypeKind = TypeKind::kStruct;
StructType(int line, skstd::string_view name, std::vector<Field> fields, bool interfaceBlock)
StructType(int line, skstd::string_view name, std::vector<Field> fields)
: INHERITED(std::move(name), "S", kTypeKind, line)
, fFields(std::move(fields))
, fInterfaceBlock(interfaceBlock) {}
, fFields(std::move(fields)) {}
const std::vector<Field>& fields() const override {
return fFields;
@ -342,10 +341,6 @@ public:
return true;
}
bool isInterfaceBlock() const override {
return fInterfaceBlock;
}
bool isPrivate() const override {
return std::any_of(fFields.begin(), fFields.end(), [](const Field& f) {
return f.fType->isPrivate();
@ -370,7 +365,6 @@ private:
using INHERITED = Type;
std::vector<Field> fFields;
bool fInterfaceBlock;
};
class VectorType final : public Type {
@ -462,8 +456,8 @@ std::unique_ptr<Type> Type::MakeScalarType(skstd::string_view name, const char*
}
std::unique_ptr<Type> Type::MakeStructType(int line, skstd::string_view name,
std::vector<Field> fields, bool interfaceBlock) {
return std::make_unique<StructType>(line, name, std::move(fields), interfaceBlock);
std::vector<Field> fields) {
return std::make_unique<StructType>(line, name, std::move(fields));
}
std::unique_ptr<Type> Type::MakeTextureType(const char* name, SpvDim_ dimensions, bool isDepth,
@ -741,8 +735,7 @@ const Type* Type::clone(SymbolTable* symbolTable) const {
}
case TypeKind::kStruct: {
const String* name = symbolTable->takeOwnershipOfString(String(this->name()));
return symbolTable->add(Type::MakeStructType(
this->fLine, *name, this->fields(), this->isInterfaceBlock()));
return symbolTable->add(Type::MakeStructType(this->fLine, *name, this->fields()));
}
default:
SkDEBUGFAILF("don't know how to clone type '%s'", this->description().c_str());

10
src/sksl/ir/SkSLType.h
View File

@ -141,10 +141,8 @@ public:
Type::TypeKind typeKind);
/** Creates a struct type with the given fields. */
static std::unique_ptr<Type> MakeStructType(int line,
skstd::string_view name,
std::vector<Field> fields,
bool interfaceBlock = false);
static std::unique_ptr<Type> MakeStructType(int line, skstd::string_view name,
std::vector<Field> fields);
/** Create a texture type. */
static std::unique_ptr<Type> MakeTextureType(const char* name, SpvDim_ dimensions,
@ -449,10 +447,6 @@ public:
return false;
}
virtual bool isInterfaceBlock() const {
return false;
}
// Is this type something that can be bound & sampled from an SkRuntimeEffect?
// Includes types that represent stages of the Skia pipeline (colorFilter, shader, blender).
bool isEffectChild() const {

14
src/sksl/ir/SkSLVarDeclarations.cpp
View File

@ -97,19 +97,7 @@ void VarDeclaration::ErrorCheck(const Context& context,
Modifiers::kFlat_Flag | Modifiers::kNoPerspective_Flag;
}
// TODO(skbug.com/11301): Migrate above checks into building a mask of permitted layout flags
int permittedLayoutFlags = ~0;
// We don't allow 'binding' or 'set' on normal uniform variables, only on textures, samplers,
// and interface blocks (holding uniform variables).
bool permitBindingAndSet = baseType->typeKind() == Type::TypeKind::kSampler ||
baseType->typeKind() == Type::TypeKind::kSeparateSampler ||
baseType->typeKind() == Type::TypeKind::kTexture ||
baseType->isInterfaceBlock();
if ((modifiers.fFlags & Modifiers::kUniform_Flag) && !permitBindingAndSet) {
permittedLayoutFlags &= ~Layout::kBinding_Flag;
permittedLayoutFlags &= ~Layout::kSet_Flag;
}
modifiers.checkPermitted(context, line, permitted, permittedLayoutFlags);
modifiers.checkPermitted(context, line, permitted, /*permittedLayoutFlags=*/~0);
}
bool VarDeclaration::ErrorCheckAndCoerce(const Context& context, const Variable& var,

2
tests/sksl/shared/ComplexDelete.glsl
View File

@ -1,6 +1,6 @@
out vec4 sk_FragColor;
uniform mat4 colorXform;
layout (set = 0) uniform mat4 colorXform;
layout (binding = 0) uniform sampler2D s;
void main() {
vec4 tmpColor;

2
tests/sksl/shared/NoFragCoordsPosRT.glsl
View File

@ -1,6 +1,6 @@
#version 400
out vec4 sk_FragCoord_Workaround;
uniform vec4 sk_RTAdjust;
layout (set = 0) uniform vec4 sk_RTAdjust;
layout (location = 0) in vec4 pos;
void main() {
sk_FragCoord_Workaround = (gl_Position = pos);

2
tests/sksl/shared/NormalizationVert.glsl
View File

@ -1,5 +1,5 @@
uniform vec4 sk_RTAdjust;
layout (set = 0) uniform vec4 sk_RTAdjust;
void main() {
gl_Position = vec4(1.0);
gl_Position = vec4(gl_Position.xy * sk_RTAdjust.xz + gl_Position.ww * sk_RTAdjust.yw, 0.0, gl_Position.w);