From ff4621460a98f34d74e4275841c313400cbda0dd Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Mon, 17 Jul 2017 15:13:37 -0700 Subject: Handle `Buffer` types more like textures Fixes #94 We'd been handling HLSL `Buffer` and `RWBuffer` in a one-off fashion, and that led to a lot of code duplication, and also to the issue that we weren't handling `RasterizerOrderedBuffer` at all. This change basically folds `Buffer` in so that it is conceptually a texture type (just with a unique shape). Hopefully all the other logic still works. --- source/slang/type-layout.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source/slang/type-layout.cpp') diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp index 6ca2d68fb..b4bf8949f 100644 --- a/source/slang/type-layout.cpp +++ b/source/slang/type-layout.cpp @@ -361,14 +361,12 @@ struct HLSLObjectLayoutRulesImpl : ObjectLayoutRulesImpl case ShaderParameterKind::TextureUniformBuffer: case ShaderParameterKind::StructuredBuffer: - case ShaderParameterKind::SampledBuffer: case ShaderParameterKind::RawBuffer: case ShaderParameterKind::Buffer: case ShaderParameterKind::Texture: return SimpleLayoutInfo(LayoutResourceKind::ShaderResource, 1); case ShaderParameterKind::MutableStructuredBuffer: - case ShaderParameterKind::MutableSampledBuffer: case ShaderParameterKind::MutableRawBuffer: case ShaderParameterKind::MutableBuffer: case ShaderParameterKind::MutableTexture: @@ -1041,8 +1039,6 @@ SimpleLayoutInfo GetLayoutImpl( type, rules, outTypeLayout); \ } while(0) - CASE(HLSLBufferType, SampledBuffer); - CASE(HLSLRWBufferType, MutableSampledBuffer); CASE(HLSLByteAddressBufferType, RawBuffer); CASE(HLSLRWByteAddressBufferType, MutableRawBuffer); -- cgit v1.2.3