From de619024c80ad056bc779bad5f0d66b277d8f3e3 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 29 Jun 2022 13:18:41 +0100 Subject: [PATCH] Test for extended UAV support in D3D11 test --- util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp | 5 +++++ util/test/demos/d3d11/d3d11_test.cpp | 1 + util/test/demos/d3d11/d3d11_test.h | 1 + 3 files changed, 7 insertions(+) diff --git a/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp b/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp index a765bdbca..2adc7fae1 100644 --- a/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp +++ b/util/test/demos/d3d11/d3d11_shader_debug_zoo.cpp @@ -705,6 +705,7 @@ float4 main(v2f IN) : SV_Target0 return read.b.wzwy; } +#ifdef TYPED_UAV_EXT if(IN.tri == 84) { return typedrwtest[uint(zero)].xyzw; @@ -721,6 +722,7 @@ float4 main(v2f IN) : SV_Target0 { return typedrwtest[uint(zero)].wzwy; } +#endif return float4(0.4f, 0.4f, 0.4f, 0.4f); } @@ -894,6 +896,9 @@ float4 main(v2f IN, uint samp : SV_SampleIndex) : SV_Target0 const uint32_t numTests = atoi(pixel.c_str() + lastTest) + 1; + if(opts2.TypedUAVLoadAdditionalFormats) + common += "\n#define TYPED_UAV_EXT 1\n"; + ID3DBlobPtr vsblob = Compile(common + vertex, "main", "vs_5_0"); ID3DBlobPtr psblob = Compile(common + pixel, "main", "ps_5_0"); diff --git a/util/test/demos/d3d11/d3d11_test.cpp b/util/test/demos/d3d11/d3d11_test.cpp index c1e711384..dc18e36bf 100644 --- a/util/test/demos/d3d11/d3d11_test.cpp +++ b/util/test/demos/d3d11/d3d11_test.cpp @@ -121,6 +121,7 @@ void D3D11GraphicsTest::Prepare(int argc, char **argv) { dev->CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS, &opts, sizeof(opts)); dev->CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS1, &opts1, sizeof(opts1)); + dev->CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS2, &opts2, sizeof(opts2)); } // This device was only used to get feature support. Set it back to NULL diff --git a/util/test/demos/d3d11/d3d11_test.h b/util/test/demos/d3d11/d3d11_test.h index 8c9e9bcb0..acb40fb2e 100644 --- a/util/test/demos/d3d11/d3d11_test.h +++ b/util/test/demos/d3d11/d3d11_test.h @@ -179,6 +179,7 @@ struct D3D11GraphicsTest : public GraphicsTest D3D11_FEATURE_DATA_D3D11_OPTIONS opts = {}; D3D11_FEATURE_DATA_D3D11_OPTIONS1 opts1 = {}; + D3D11_FEATURE_DATA_D3D11_OPTIONS2 opts2 = {}; ID3D11DepthStencilStatePtr depthState; ID3D11RasterizerStatePtr rastState;