diff options
author | 2016-11-16 07:29:51 -0800 | |
---|---|---|
committer | 2016-11-16 07:29:52 -0800 | |
commit | 988283c89458442f65d961f2746a9f271a39c31e (patch) | |
tree | 5b62299020e1a566d62b154b7f0fc229fd74b858 /src/sksl/SkSLSPIRVCodeGenerator.h | |
parent | cb115bdeed5898ded3fdbe572a14616cff809b7c (diff) |
Revert of added support for push_constant layout (patchset #7 id:140001 of https://codereview.chromium.org/2187433003/ )
Reason for revert:
hitting assert in vulkan
Original issue's description:
> added support for push_constant layout
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2187433003
>
> Committed: https://skia.googlesource.com/skia/+/fa5f65ac61fd525029aa9dab161ffe4896c10f6d
TBR=ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2509673002
Diffstat (limited to 'src/sksl/SkSLSPIRVCodeGenerator.h')
-rw-r--r-- | src/sksl/SkSLSPIRVCodeGenerator.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h index 6459e5bcf5..e6fc28ee0c 100644 --- a/src/sksl/SkSLSPIRVCodeGenerator.h +++ b/src/sksl/SkSLSPIRVCodeGenerator.h @@ -14,7 +14,6 @@ #include <unordered_map> #include "SkSLCodeGenerator.h" -#include "SkSLMemoryLayout.h" #include "ir/SkSLBinaryExpression.h" #include "ir/SkSLBoolLiteral.h" #include "ir/SkSLConstructor.h" @@ -64,7 +63,6 @@ public: SPIRVCodeGenerator(const Context* context) : fContext(*context) - , fDefaultLayout(MemoryLayout::k140_Standard) , fCapabilities(1 << SpvCapabilityShader) , fIdCount(1) , fBoolTrue(0) @@ -95,22 +93,17 @@ private: SpvId getType(const Type& type); - SpvId getType(const Type& type, const MemoryLayout& layout); - SpvId getFunctionType(const FunctionDeclaration& function); SpvId getPointerType(const Type& type, SpvStorageClass_ storageClass); - SpvId getPointerType(const Type& type, const MemoryLayout& layout, - SpvStorageClass_ storageClass); - std::vector<SpvId> getAccessChain(const Expression& expr, std::ostream& out); void writeLayout(const Layout& layout, SpvId target); void writeLayout(const Layout& layout, SpvId target, int member); - void writeStruct(const Type& type, const MemoryLayout& layout, SpvId resultId); + void writeStruct(const Type& type, SpvId resultId); void writeProgramElement(const ProgramElement& pe, std::ostream& out); @@ -236,7 +229,6 @@ private: std::ostream& out); const Context& fContext; - const MemoryLayout fDefaultLayout; uint64_t fCapabilities; SpvId fIdCount; |