diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-04-10 17:53:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 17:53:03 -0400 |
| commit | c4004b32ca2c0effb455ec847114240db3cb993b (patch) | |
| tree | 7530f131892e2973929948e61e46e957d38510a2 /tools/render-test/d3d-util.h | |
| parent | 5298ccf7da486d0010c6157974d5dd9a5556f265 (diff) | |
Feature/dx12 compute (#482)
* Dx12 rendering works in test framework.
* Turn on dx12 render tests.
* Getting simpler dx12 compute tests to work.
* With expected data in test - check for specialized and then for the default, so that multiple test can share the same expected data, but specialized cases can still be set.
* Fixed construction and binding on dx12 textures.
* Control which render apis used in test from command line.
* Small aesthetic fixes in render-test/main.cpp.
* Fix binding problem for uavs/srvs dx12. Previously tried to create srv/uav for StorageBuffers (like dx11 does), but the binding breaks as you can end up with two srvs using the same register.
First pass at fixing problems with Texture creation for dx12 - assertions were hit with 3d or array textures.
* Fixes to improve Dx12 setup shader resource views for cubemaps/arrays.
* Fixed d3d12 textureSamplingTest - problem was that cubemap/array textures were not being uploaded correctly.
* Changed the order of how binding of constant buffers (as just set on the Renderer) indexes. Previously they were given the lowest indices, but they clashed with the indices from the 'Binding'. Changing this means all tests run on d3d12.
* Add code to allow use of warp (although not command line switchable yet).
Fix problem setting up raw UAV - as identified by warp.
* Added RenderApiUtil - which can detect if a render api is potentially available.
* Moved render flag testing/parsing into RenderApiUtil.
* Fix signed/unsigned warning.
* Fixes around enums prefixed with k on the review of feature/dx12 compute branch.
Diffstat (limited to 'tools/render-test/d3d-util.h')
| -rw-r--r-- | tools/render-test/d3d-util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/render-test/d3d-util.h b/tools/render-test/d3d-util.h index 95ccf4b18..6ac39aefb 100644 --- a/tools/render-test/d3d-util.h +++ b/tools/render-test/d3d-util.h @@ -26,8 +26,8 @@ class D3DUtil }; enum UsageFlag { - USAGE_FLAG_MULTI_SAMPLE = 0x1, - USAGE_FLAG_SRV = 0x2, + USAGE_FLAG_MULTI_SAMPLE = 0x1, ///< If set will be used form multi sampling (such as MSAA) + USAGE_FLAG_SRV = 0x2, ///< If set means will be used as a shader resource view (SRV) }; /// Get primitive topology as D3D primitive topology @@ -41,9 +41,9 @@ class D3DUtil /// Definition of the HLSL-to-bytecode compilation logic. static Slang::Result compileHLSLShader(char const* sourcePath, char const* source, char const* entryPointName, char const* dxProfileName, Slang::ComPtr<ID3DBlob>& shaderBlobOut); + /// Given a slang pixel format returns the equivalent DXGI_ pixel format. If the format is not known, will return DXGI_FORMAT_UNKNOWN static DXGI_FORMAT getMapFormat(Format format); - /// Given the usage, flags, and format will return the most suitable format. Will return DXGI_UNKNOWN if combination is not possible static DXGI_FORMAT calcFormat(UsageType usage, DXGI_FORMAT format); /// Calculate appropriate format for creating a buffer for usage and flags |
