Skip to content

S
swiftshader
Commit 9a16248d by Ben Clayton Committed by Ben Clayton
Options

SpirvShader: Decouple SPIR-V type attributes from object representation

StorageClass, sizeInComponents, isBuiltInBlock are all attributes of the Type, not the Object. Add 'type' field to Object so type information can easily be looked up regardless of definition opcode. Add 'element' field to Type, simplifying the likes of WalkAccessChain. Fixes the weird edge case of OpVariable's sizeInComponents being the size of the pointee, not its type (the pointer). Bug: b/126126820 Change-Id: I2d1d93e03ee0253a87f831031c3b2806b1d80de0 Reviewed-on: https://swiftshader-review.googlesource.com/c/25408 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com>
parent ab51bbfa
Showing with 12 additions and 8 deletions
src/Pipeline/SpirvShader.hpp
...@@ -154,23 +154,30 @@ namespace sw ...@@ -154,23 +154,30 @@ namespace sw
return InsnIterator{insns.cend()}; return InsnIterator{insns.cend()};
} }
class Type;
using TypeID = SpirvID<Type>;
class Type class Type
{ {
public: public:
InsnIterator definition; InsnIterator definition;
spv::StorageClass storageClass; spv::StorageClass storageClass = static_cast<spv::StorageClass>(-1);
uint32_t sizeInComponents = 0; uint32_t sizeInComponents = 0;
bool isBuiltInBlock = false; bool isBuiltInBlock = false;
// Inner element type for pointers, arrays, vectors and matrices.
TypeID element;
}; };
class Object;
using ObjectID = SpirvID<Object>;
class Object class Object
{ {
public: public:
InsnIterator definition; InsnIterator definition;
spv::StorageClass storageClass; TypeID type;
uint32_t sizeInComponents = 0; ObjectID pointerBase;
bool isBuiltInBlock = false;
uint32_t pointerBase = 0;
std::unique_ptr<uint32_t[]> constantValue = nullptr; std::unique_ptr<uint32_t[]> constantValue = nullptr;
enum class Kind enum class Kind
...@@ -183,9 +190,6 @@ namespace sw ...@@ -183,9 +190,6 @@ namespace sw
} kind = Kind::Unknown; } kind = Kind::Unknown;
}; };
using TypeID = SpirvID<Type>;
using ObjectID = SpirvID<Object>;
struct TypeOrObject {}; // Dummy struct to represent a Type or Object. struct TypeOrObject {}; // Dummy struct to represent a Type or Object.
// TypeOrObjectID is an identifier that represents a Type or an Object, // TypeOrObjectID is an identifier that represents a Type or an Object,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment