diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-05-02 11:40:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 11:40:09 -0700 |
| commit | 60bcc6809f57e12f3705cc65cb325b0983b08899 (patch) | |
| tree | db7707963ffaaff2778b24909e7ffdb5e18ac906 /tests/hlsl | |
| parent | d3c1c8b5a80d7ae72678ae209b5c0a7a7053ae2a (diff) | |
Add support for explicit register space bindings (#542)
This change adds support for specifying explicit register spaces, like:
```hlsl
// Bind to texture register #2 in space #1
Texture2D t : register(t2, space1);
```
I added a test case to confirm that the register space is properly propagated through the Slang reflection API.
This change also adds proper error messages for some error/unsupported cases that weren't being diagnosed:
* Specifying a completely bogus register "class" (e.g., `register(bad99)`)
* Failing to specify a register index (`register(u)`)
* Specifying a component mask (`register(t0.x)`)
* Using `packoffset` bindings
I added test cases to cover all of these, as well as the new errors around support for register `space` bindings.
In order to get the existing tests to pass, I had to remove explicit `packoffset` bindings from some DXSDK test shaders.
None of these `packoffset` bindings were semantically significant (they matched what the compiler would do anyway, for both Slang and the standard HLSL compiler). Removing them is required for Slang now that we give an explicit error about our lack of `packoffset` support.
In a future change we might add logic to either detect semantically insignificant `packoffset`s, or to just go ahead and support them properly (as a general feature on `struct` types).
Diffstat (limited to 'tests/hlsl')
8 files changed, 13 insertions, 13 deletions
diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl index 73eeb8f81..7b7b285b7 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl @@ -15,7 +15,7 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - row_major matrix g_mWorldViewProjection : packoffset( c0 ); + row_major matrix g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); } // The tessellated vertex structure diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl index d119653a9..97b8b6c7e 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl @@ -21,13 +21,13 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - float4 g_vObjectColor : packoffset( c0 ); + float4 g_vObjectColor ;//SLANG: : packoffset( c0 ); }; cbuffer cbPerFrame : register( b1 ) { - float3 g_vLightDir : packoffset( c0 ); - float g_fAmbient : packoffset( c0.w ); + float3 g_vLightDir ;//SLANG: : packoffset( c0 ); + float g_fAmbient ;//SLANG: : packoffset( c0.w ); }; //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl index 6d854a83b..fa5a7e0b4 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl @@ -19,8 +19,8 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - matrix g_mWorldViewProjection : packoffset( c0 ); - matrix g_mWorld : packoffset( c4 ); + matrix g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); + matrix g_mWorld ;//SLANG: : packoffset( c4 ); }; //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl index 0f3b851df..e9175834a 100644 --- a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl +++ b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl @@ -19,7 +19,7 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - matrix g_mWorldViewProjection : packoffset( c0 ); + matrix g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); }; //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl index 80f7c452a..7421c8aa7 100644 --- a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl +++ b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl @@ -19,8 +19,8 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - float4x4 g_mWorldViewProjection : packoffset( c0 ); - float4x4 g_mWorld : packoffset( c4 ); + float4x4 g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); + float4x4 g_mWorld ;//SLANG: : packoffset( c4 ); }; //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl index c2239293e..464bb4c8a 100644 --- a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl +++ b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl @@ -23,11 +23,11 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - matrix g_mWorld : packoffset( c0 ); + matrix g_mWorld ;//SLANG: : packoffset( c0 ); }; cbuffer cbPerScene : register( b1 ) { - matrix g_mViewProj : packoffset( c0 ); + matrix g_mViewProj ;//SLANG: : packoffset( c0 ); }; //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl index b361df0d6..a6b971a57 100644 --- a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl +++ b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl @@ -16,7 +16,7 @@ cbuffer cbPerObject : register( b0 ) { - row_major matrix g_mWorldViewProjection : packoffset( c0 ); + row_major matrix g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); } struct SceneVS_Input diff --git a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl index af5ba6343..e80360754 100644 --- a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl +++ b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl @@ -10,7 +10,7 @@ //-------------------------------------------------------------------------------------- cbuffer cbPerObject : register( b0 ) { - matrix g_mWorldViewProjection : packoffset( c0 ); + matrix g_mWorldViewProjection ;//SLANG: : packoffset( c0 ); }; //-------------------------------------------------------------------------------------- |
