From 44c0a56974b664e50b2cb8cb6f10740b19c4e02f Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 3 Dec 2020 08:23:05 -0800 Subject: Add shader object parameter binding to renderer_test. (#1622) * Add shader object parameter binding to renderer_test. * remove multiple-definitions.hlsl * Fix cuda implementation. Co-authored-by: Tim Foley --- tools/render-test/shader-input-layout.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tools/render-test/shader-input-layout.h') diff --git a/tools/render-test/shader-input-layout.h b/tools/render-test/shader-input-layout.h index 97796d7f6..437da820b 100644 --- a/tools/render-test/shader-input-layout.h +++ b/tools/render-test/shader-input-layout.h @@ -17,7 +17,8 @@ using namespace gfx; enum class ShaderInputType { - Buffer, Texture, Sampler, CombinedTextureSampler, Array + Buffer, Texture, Sampler, CombinedTextureSampler, Array, Uniform, + Object, }; enum class InputTextureContent @@ -81,6 +82,11 @@ struct BindlessHandleDataEntry Slang::String name; }; +struct InputObjectDesc +{ + Slang::String typeName; +}; + class ShaderInputLayoutEntry { public: @@ -92,6 +98,7 @@ public: InputBufferDesc bufferDesc; InputSamplerDesc samplerDesc; ArrayDesc arrayDesc; + InputObjectDesc objectDesc; bool isOutput = false; bool onlyCPULikeBinding = false; ///< If true, only use on targets that have 'uniform' or 'CPU like' binding, like CPU and CUDA bool isBindlessObject = false; ///< If true, this is a bindless object with no associated binding point in the shader. -- cgit v1.2.3