test

2 files changed, 11 insertions, 13 deletions

diff --git a/tests/compute/textureSamplingTest.slang b/tests/compute/textureSamplingTest.slang
index 76eebdf03..1661e6e3c 100644
--- a/tests/compute/textureSamplingTest.slang
+++ b/tests/compute/textureSamplingTest.slang
@@ -92,12 +92,12 @@ FragmentStageOutput fragmentMain(FragmentStageInput input)
 
     float4 val = 0.0;
     val += t1D.Sample(samplerState, uv.x);
-    val += t2D.Sample(samplerState, uv);
+    //val += t2D.Sample(samplerState, uv);
     //val += t3D.Sample (samplerState, float3(uv, 0.5));
     //val += t1dArray.Sample(samplerState, float2(uv.x, 0.0));
     //val += t2dArray.Sample(samplerState, float3(uv, 0.0));
     //val += tCubeArray.Sample(samplerState, float4(uv, 0.5, 0.0));
     //val += tCube.Sample(samplerState, float3(uv, 0.5));
-    outputBuffer[0] = 5.0 + val.x;
+    outputBuffer[0] = 6.0 + val.x;
 	return output;
 }
\ No newline at end of file
diff --git a/tools/render-test/render-d3d11.cpp b/tools/render-test/render-d3d11.cpp
index 3f0a8cc53..faa85556e 100644
--- a/tools/render-test/render-d3d11.cpp
+++ b/tools/render-test/render-d3d11.cpp
@@ -875,10 +875,10 @@ public:
         if (inputDesc.dimension == 1)
         {
             D3D11_TEXTURE1D_DESC desc = { 0 };
-            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET | D3D11_BIND_UNORDERED_ACCESS;
-            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
             desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;
+            desc.MiscFlags = 0;
             desc.MipLevels = texData.mipLevels;
             desc.ArraySize = texData.arraySize;
             desc.Width = texData.textureSize;
@@ -904,10 +904,10 @@ public:
         {
             D3D11_SHADER_RESOURCE_VIEW_DESC viewDesc;
             D3D11_TEXTURE2D_DESC desc = { 0 };
-            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET | D3D11_BIND_UNORDERED_ACCESS;
-            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
             desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;
+            desc.MiscFlags = 0;
             desc.MipLevels = texData.mipLevels;
             desc.ArraySize = texData.arraySize;
             if (inputDesc.isCube)
@@ -947,10 +947,10 @@ public:
         {
             D3D11_SHADER_RESOURCE_VIEW_DESC viewDesc;
             D3D11_TEXTURE3D_DESC desc = { 0 };
-            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET | D3D11_BIND_UNORDERED_ACCESS;
-            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
+            desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
             desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-            desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;
+            desc.MiscFlags = 0;
             desc.MipLevels = 1;
             viewDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
             desc.Width = texData.textureSize;
@@ -959,8 +959,6 @@ public:
             desc.Usage = D3D11_USAGE_DEFAULT;
             ID3D11Texture3D * texture;
             dxDevice->CreateTexture3D(&desc, subRes.Buffer(), &texture);
-            if (inputDesc.arrayLength != 0)
-                viewDesc.ViewDimension = (D3D11_SRV_DIMENSION)(int)(viewDesc.ViewDimension + 1);
             viewDesc.Texture3D.MipLevels = 1;
             viewDesc.Texture3D.MostDetailedMip = 0;
             viewDesc.Format = desc.Format;