4 files changed, 15 insertions, 210 deletions

diff --git a/tests/wgsl/texture-gather.slang b/tests/wgsl/texture-gather.slang
index d0772994e..bb5851159 100644
--- a/tests/wgsl/texture-gather.slang
+++ b/tests/wgsl/texture-gather.slang
@@ -68,66 +68,14 @@ TextureCubeArray<uint4> tCubeArray_u32v4;
 
 // depth
 
-__generic<let sampleCount:int=0, let format:int=0>
-typealias Depth2D = _Texture<
-    float,
-    __Shape2D,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<let sampleCount:int=0, let format:int=0>
-typealias Depth2DArray = _Texture<
-    float,
-    __Shape2D,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<let sampleCount:int=0, let format:int=0>
-typealias DepthCube = _Texture<
-    float,
-    __ShapeCube,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<let sampleCount:int=0, let format:int=0>
-typealias DepthCubeArray = _Texture<
-    float,
-    __ShapeCube,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
 //TEST_INPUT: Texture2D(size=4, content = zero):name d2D
-Depth2D d2D;
+DepthTexture2D d2D;
 //TEST_INPUT: TextureCube(size=4, content = zero):name dCube
-DepthCube dCube;
+DepthTextureCube dCube;
 //TEST_INPUT: Texture2D(size=4, content = zero, arrayLength=2):name d2DArray
-Depth2DArray d2DArray;
+DepthTexture2DArray d2DArray;
 //TEST_INPUT: TextureCube(size=4, content = zero, arrayLength=2):name dCubeArray
-DepthCubeArray dCubeArray;
+DepthTextureCubeArray dCubeArray;
 
 //TEST_INPUT: Sampler:name samplerState
 SamplerState samplerState;
diff --git a/tests/wgsl/texture-load.slang b/tests/wgsl/texture-load.slang
index 9be7cd2eb..f03a17443 100644
--- a/tests/wgsl/texture-load.slang
+++ b/tests/wgsl/texture-load.slang
@@ -80,51 +80,12 @@ Texture2DArray<uint4> t2DArray_u32v4;
 
 // depth
 
-__generic<let sampleCount:int=0, let format:int=0>
-typealias Depth2D = _Texture<
-    float,
-    __Shape2D,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<let sampleCount:int=0, let format:int=0>
-typealias Depth2DMS = _Texture<
-    float,
-    __Shape2D,
-    0, // isArray
-    1, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<let sampleCount:int=0, let format:int=0>
-typealias Depth2DArray = _Texture<
-    float,
-    __Shape2D,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
 //TEST_INPUT: Texture2D(size=4, content = zero):name d2D
-Depth2D d2D;
+DepthTexture2D d2D;
 //TEST_INPUT: Texture2D(size=4, content = zero):name d2DMS
-Depth2DMS d2DMS;
+DepthTexture2DMS d2DMS;
 //TEST_INPUT: Texture2D(size=4, content = zero, arrayLength=2):name d2DArray
-Depth2DArray d2DArray;
+DepthTexture2DArray d2DArray;
 
 
 bool TEST_textureLoad<T>(
diff --git a/tests/wgsl/texture-sampler-less.slang b/tests/wgsl/texture-sampler-less.slang
index 7868a9bcf..7048714b8 100644
--- a/tests/wgsl/texture-sampler-less.slang
+++ b/tests/wgsl/texture-sampler-less.slang
@@ -43,66 +43,14 @@ Sampler2DArray<float4> t2DArray_f32v4;
 //TEST_INPUT: TextureSamplerCube(size=4, content = zero, arrayLength=2):name tCubeArray_f32v4
 SamplerCubeArray<float4> tCubeArray_f32v4;
 
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias CombinedDepth2d = _Texture<
-    T,
-    __Shape2D,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    1, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias CombinedDepth2d_array = _Texture<
-    T,
-    __Shape2D,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    1, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias CombinedDepthcube = _Texture<
-    T,
-    __ShapeCube,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    1, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias CombinedDepthcube_array = _Texture<
-    T,
-    __ShapeCube,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    1, // isCombined
-    format
->;
-
 //TEST_INPUT: TextureSampler2D(size=4, content = zero):name d2D
-CombinedDepth2d<float> d2D;
+Sampler2DShadow d2D;
 //TEST_INPUT: TextureSamplerCube(size=4, content = zero):name dCube
-CombinedDepthcube<float> dCube;
+SamplerCubeShadow dCube;
 //TEST_INPUT: TextureSampler2D(size=4, content = zero, arrayLength=2):name d2DArray
-CombinedDepth2d_array<float> d2DArray;
+Sampler2DArrayShadow d2DArray;
 //TEST_INPUT: TextureSamplerCube(size=4, content = zero, arrayLength=2):name dCubeArray
-CombinedDepthcube_array<float> dCubeArray;
+SamplerCubeArrayShadow dCubeArray;
 
 //TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/wgsl/texture.slang b/tests/wgsl/texture.slang
index 1a14fec32..b49f14e07 100644
--- a/tests/wgsl/texture.slang
+++ b/tests/wgsl/texture.slang
@@ -35,66 +35,14 @@ Texture2DArray<float4> t2DArray_f32v4;
 //TEST_INPUT: TextureCube(size=4, content = zero, arrayLength=2):name tCubeArray_f32v4
 TextureCubeArray<float4> tCubeArray_f32v4;
 
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias depth2d = _Texture<
-    T,
-    __Shape2D,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias depth2d_array = _Texture<
-    T,
-    __Shape2D,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias depthcube = _Texture<
-    T,
-    __ShapeCube,
-    0, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
-__generic<T : ITexelElement, let sampleCount:int=0, let format:int=0>
-typealias depthcube_array = _Texture<
-    T,
-    __ShapeCube,
-    1, // isArray
-    0, // isMS
-    sampleCount,
-    0, // access
-    1, // isShadow
-    0, // isCombined
-    format
->;
-
 //TEST_INPUT: Texture2D(size=4, content = zero):name d2D
-depth2d<float> d2D;
+DepthTexture2D d2D;
 //TEST_INPUT: TextureCube(size=4, content = zero):name dCube
-depthcube<float> dCube;
+DepthTextureCube dCube;
 //TEST_INPUT: Texture2D(size=4, content = zero, arrayLength=2):name d2DArray
-depth2d_array<float> d2DArray;
+DepthTexture2DArray d2DArray;
 //TEST_INPUT: TextureCube(size=4, content = zero, arrayLength=2):name dCubeArray
-depthcube_array<float> dCubeArray;
+DepthTextureCubeArray dCubeArray;
 
 //TEST_INPUT: Sampler:name samplerState
 SamplerState samplerState;