From 00389a127af8db18a3ec8fe7ad2dd114a65ac024 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 17 Apr 2018 16:59:03 -0400 Subject: Feature/renderer binding (#489) * Dx12 rendering works in test framework. * Turn on dx12 render tests. * First pass at Resource and TextureResource/BufferResource types. * Fix bug in Dx11 impl for BufferResource. * Dx12 supports TextureResource and binds using TextureResource type, and all tests pass. * Added TextureBuffer::Size type to make handling mips a little simpler. * Small improvements to Dx12 constant buffer binding Removed k prefix on an enum * First pass impl of dx11 createTextureResource Added setDefaults to TextureResource::Desc and BufferResource::Desc to simplify setup accessFlags -> cpuAccessFlags desc -> srcDesc * Split out generateTextureResource - can produce the texture using createTextureResource on the Renderer. * Added support for read mapping to Dx11 accessFlags -> cpuAccessFlags First pass at using TextureResource/BufferResource on Dx11 Some tests fail with this checkin * TextureResource working on all tests on dx11. * Construct ResourceBuffers on Dx11 and Dx12 using utility function createInputBufferResource. * First pass at OpenGl TextureResource * Small fixes to dx12 and dx11 setup. Gl working working using BufferResource and TextureResource * Tidy up around the compareSampler - looks like the previous test was incorrect. * Small documentation /naming improvements. * Fix some more small documentation issues. --- tests/render/cross-compile-entry-point.slang | 1 + tests/render/cross-compile0.hlsl | 1 + tests/render/imported-parameters.hlsl | 1 + tests/render/nointerpolation.hlsl | 1 + tests/render/unused-discard.hlsl | 1 + 5 files changed, 5 insertions(+) (limited to 'tests/render') diff --git a/tests/render/cross-compile-entry-point.slang b/tests/render/cross-compile-entry-point.slang index 018947228..fa35833f0 100644 --- a/tests/render/cross-compile-entry-point.slang +++ b/tests/render/cross-compile-entry-point.slang @@ -1,4 +1,5 @@ //TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: +//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12 // This is a test to ensure that we can cross-compile a complete entry point. diff --git a/tests/render/cross-compile0.hlsl b/tests/render/cross-compile0.hlsl index 1d33b68bf..3d25c93e5 100644 --- a/tests/render/cross-compile0.hlsl +++ b/tests/render/cross-compile0.hlsl @@ -1,4 +1,5 @@ //TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: +//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12 // This is a basic test case for cross-compilation behavior. // diff --git a/tests/render/imported-parameters.hlsl b/tests/render/imported-parameters.hlsl index 495ff8da2..0bee75bf9 100644 --- a/tests/render/imported-parameters.hlsl +++ b/tests/render/imported-parameters.hlsl @@ -1,4 +1,5 @@ //TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: +//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12 // This test is trying to ensure that we can // correctly handle cases where top-level shader diff --git a/tests/render/nointerpolation.hlsl b/tests/render/nointerpolation.hlsl index 11613b30e..644692e36 100644 --- a/tests/render/nointerpolation.hlsl +++ b/tests/render/nointerpolation.hlsl @@ -1,4 +1,5 @@ //TEST(smoke):COMPARE_HLSL_RENDER: +//TEST(smoke):COMPARE_HLSL_RENDER: -dx12 // Confirm that the `nointerpolation` modifier // makes it through Slang codegen with the diff --git a/tests/render/unused-discard.hlsl b/tests/render/unused-discard.hlsl index 76b04b862..2a99b77bb 100644 --- a/tests/render/unused-discard.hlsl +++ b/tests/render/unused-discard.hlsl @@ -1,4 +1,5 @@ //TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: +//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12 // This is a basic test case for cross-compilation behavior. // -- cgit v1.2.3