git subtree pull of latest Framework12

Remove default mips from dx12u when creating render targets
GPUOpen-Effects · Jun 23, 2016 · 96b766f · 96b766f
2 parents 6be1944 + df046db
commit 96b766f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/d3d12/dx12u/src/depth_stencil.cpp b/framework/d3d12/dx12u/src/depth_stencil.cpp
@@ -86,15 +86,15 @@ namespace
         if (h.Get() == nullptr)
         {
             auto default_heap = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT);
-            auto tex_desc = CD3DX12_RESOURCE_DESC::Tex2D(tex_format, width, static_cast<uint32_t>(height), static_cast<uint16_t>(array_sz), 0, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
+            auto tex_desc = CD3DX12_RESOURCE_DESC::Tex2D(tex_format, width, static_cast<uint32_t>(height), static_cast<uint16_t>(array_sz), 1, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
             auto r = dvc->CreateCommittedResource(&default_heap, D3D12_HEAP_FLAG_NONE,
                 &tex_desc,
                 D3D12_RESOURCE_STATE_DEPTH_WRITE, &depth_clear_value, IID_PPV_ARGS(&rsrc));
             dx12u::throw_if_error(r);
         }
         else
         {
-            auto tex_desc = CD3DX12_RESOURCE_DESC::Tex2D(tex_format, width, static_cast<uint32_t>(height), static_cast<uint16_t>(array_sz), 0, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
+            auto tex_desc = CD3DX12_RESOURCE_DESC::Tex2D(tex_format, width, static_cast<uint32_t>(height), static_cast<uint16_t>(array_sz), 1, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL);
             auto r = dvc->CreatePlacedResource(h.Get(), heap_offset,
                 &tex_desc,
                 D3D12_RESOURCE_STATE_DEPTH_WRITE, &depth_clear_value, IID_PPV_ARGS(&rsrc));

diff --git a/framework/d3d12/dx12u/src/render_target.cpp b/framework/d3d12/dx12u/src/render_target.cpp
@@ -53,15 +53,15 @@ namespace
         if (h.Get() == nullptr)
         {
             auto heap_default = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT, gpu_mask, visible_mask);
-            auto tex_2d_desc = CD3DX12_RESOURCE_DESC::Tex2D(format, width, static_cast<uint32_t>(height), 1, 0, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
+            auto tex_2d_desc = CD3DX12_RESOURCE_DESC::Tex2D(format, width, static_cast<uint32_t>(height), 1, 1, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
             auto r = dvc->CreateCommittedResource(&heap_default, D3D12_HEAP_FLAG_NONE,
                 &tex_2d_desc,
                 D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, IID_PPV_ARGS(&rsrc));
             dx12u::throw_if_error(r);
         }
         else
         {
-            auto tex_2d_desc = CD3DX12_RESOURCE_DESC::Tex2D(format, width, static_cast<uint32_t>(height), 1, 0, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
+            auto tex_2d_desc = CD3DX12_RESOURCE_DESC::Tex2D(format, width, static_cast<uint32_t>(height), 1, 1, 1, 0, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
             auto r = dvc->CreatePlacedResource(h.Get(), heap_offset,
                 &tex_2d_desc,
                 D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, IID_PPV_ARGS(&rsrc));