diff options
Diffstat (limited to 'tests/hlsl')
11 files changed, 26 insertions, 26 deletions
diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl index 7b7b285b7..0a3209343 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl @@ -1,8 +1,8 @@ //TEST(smoke):COMPARE_HLSL:-no-mangle -profile vs_4_0 -entry RenderBaseVS -profile ps_4_0 -entry RenderPS -target dxbc-assembly #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 #endif diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl index 97b8b6c7e..c446b3493 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl @@ -1,11 +1,11 @@ //TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry PSMain #ifndef __SLANG__ -#define cbPerFrame _SV031SLANG_parameterGroup_cbPerFrame -#define g_vLightDir _SV031SLANG_ParameterGroup_cbPerFrame11g_vLightDir -#define g_fAmbient _SV031SLANG_ParameterGroup_cbPerFrame10g_fAmbient -#define g_samLinear _SV011g_samLinear -#define g_txDiffuse _SV011g_txDiffuse +#define cbPerFrame cbPerFrame_0 +#define g_vLightDir g_vLightDir_0 +#define g_fAmbient g_fAmbient_0 +#define g_samLinear g_samLinear_0 +#define g_txDiffuse g_txDiffuse_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl index fa5a7e0b4..8ff5e64d7 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl @@ -1,9 +1,9 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection -#define g_mWorld _SV032SLANG_ParameterGroup_cbPerObject8g_mWorld +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 +#define g_mWorld g_mWorld_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl index e9175834a..5e2cfacf8 100644 --- a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl +++ b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl @@ -1,8 +1,8 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -entry VSMainPancake #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl index 7421c8aa7..ecbcb85f9 100644 --- a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl +++ b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl @@ -1,9 +1,9 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection -#define g_mWorld _SV032SLANG_ParameterGroup_cbPerObject8g_mWorld +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 +#define g_mWorld g_mWorld_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl index 464bb4c8a..3f1d90bfd 100644 --- a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl +++ b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl @@ -1,10 +1,10 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorld _SV032SLANG_ParameterGroup_cbPerObject8g_mWorld -#define cbPerScene _SV031SLANG_parameterGroup_cbPerScene -#define g_mViewProj _SV031SLANG_ParameterGroup_cbPerScene11g_mViewProj +#define cbPerObject cbPerObject_0 +#define g_mWorld g_mWorld_0 +#define cbPerScene cbPerScene_0 +#define g_mViewProj g_mViewProj_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl index a6b971a57..6f96938ed 100644 --- a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl +++ b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl @@ -1,8 +1,8 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry SceneVS #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 #endif //----------------------------------------------------------------------------- diff --git a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl index e80360754..744e16d0e 100644 --- a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl +++ b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl @@ -1,8 +1,8 @@ //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSMain #ifndef __SLANG__ -#define cbPerObject _SV032SLANG_parameterGroup_cbPerObject -#define g_mWorldViewProjection _SV032SLANG_ParameterGroup_cbPerObject22g_mWorldViewProjection +#define cbPerObject cbPerObject_0 +#define g_mWorldViewProjection g_mWorldViewProjection_0 #endif //-------------------------------------------------------------------------------------- diff --git a/tests/hlsl/simple/allow-uav-conditional.hlsl b/tests/hlsl/simple/allow-uav-conditional.hlsl index 3f12c9be8..8195a9f1d 100644 --- a/tests/hlsl/simple/allow-uav-conditional.hlsl +++ b/tests/hlsl/simple/allow-uav-conditional.hlsl @@ -3,7 +3,7 @@ // Check output for `[allow_uav_conditional]` #ifndef __SLANG__ -#define gBuffer _SV07gBuffer +#define gBuffer gBuffer_0 #endif RWStructuredBuffer<uint> gBuffer : register(u0); diff --git a/tests/hlsl/simple/compute-numthreads.hlsl b/tests/hlsl/simple/compute-numthreads.hlsl index 4f3291671..805c960c4 100644 --- a/tests/hlsl/simple/compute-numthreads.hlsl +++ b/tests/hlsl/simple/compute-numthreads.hlsl @@ -3,7 +3,7 @@ // Confirm that we properly pass along the `numthreads` attribute on an entry point. #ifndef __SLANG__ -#define b _SV01b +#define b b_0 #endif RWStructuredBuffer<float> b; diff --git a/tests/hlsl/simple/literal-typing.hlsl b/tests/hlsl/simple/literal-typing.hlsl index 48ea5b2cb..0ecf60506 100644 --- a/tests/hlsl/simple/literal-typing.hlsl +++ b/tests/hlsl/simple/literal-typing.hlsl @@ -18,7 +18,7 @@ Bad foo(int x) { Bad b; b.bad = x; return b; } // or ignore it and call the wrong one. #ifndef __SLANG__ -#define b _SV01b +#define b b_0 #endif RWStructuredBuffer<uint> b; |