GPUDevice: Fix mipmap generation on targets

stenzek · stenzek · commit af5c3fac4271 · 2025-11-01T16:30:07.000+10:00
Mainly DX12 that was broken.
diff --git a/src/util/d3d12_builders.cpp b/src/util/d3d12_builders.cpp
@@ -256,6 +256,7 @@ void D3D12::RootSignatureBuilder::SetInputAssemblerFlag()
 u32 D3D12::RootSignatureBuilder::Add32BitConstants(u32 shader_reg, u32 num_values, D3D12_SHADER_VISIBILITY visibility)
 {
   const u32 index = m_desc.NumParameters++;
+  DebugAssert(index < MAX_PARAMETERS);
 
   m_params[index].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS;
   m_params[index].ShaderVisibility = visibility;
@@ -269,6 +270,7 @@ u32 D3D12::RootSignatureBuilder::Add32BitConstants(u32 shader_reg, u32 num_value
 u32 D3D12::RootSignatureBuilder::AddCBVParameter(u32 shader_reg, D3D12_SHADER_VISIBILITY visibility)
 {
   const u32 index = m_desc.NumParameters++;
+  DebugAssert(index < MAX_PARAMETERS);
 
   m_params[index].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
   m_params[index].ShaderVisibility = visibility;
@@ -281,6 +283,7 @@ u32 D3D12::RootSignatureBuilder::AddCBVParameter(u32 shader_reg, D3D12_SHADER_VI
 u32 D3D12::RootSignatureBuilder::AddSRVParameter(u32 shader_reg, D3D12_SHADER_VISIBILITY visibility)
 {
   const u32 index = m_desc.NumParameters++;
+  DebugAssert(index < MAX_PARAMETERS);
 
   m_params[index].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV;
   m_params[index].ShaderVisibility = visibility;
@@ -295,6 +298,8 @@ u32 D3D12::RootSignatureBuilder::AddDescriptorTable(D3D12_DESCRIPTOR_RANGE_TYPE
 {
   const u32 index = m_desc.NumParameters++;
   const u32 dr_index = m_num_descriptor_ranges++;
+  DebugAssert(index < MAX_PARAMETERS);
+  DebugAssert(dr_index < MAX_DESCRIPTOR_RANGES);
 
   m_descriptor_ranges[dr_index].RangeType = rt;
   m_descriptor_ranges[dr_index].NumDescriptors = num_shader_regs;
@@ -310,6 +315,53 @@ u32 D3D12::RootSignatureBuilder::AddDescriptorTable(D3D12_DESCRIPTOR_RANGE_TYPE
   return index;
 }
 
+u32 D3D12::RootSignatureBuilder::AddStaticSampler(u32 shader_reg, const D3D12_SAMPLER_DESC& sampler_desc,
+                                                  D3D12_SHADER_VISIBILITY visibility)
+{
+  static constexpr const std::pair<std::array<float, 4>, D3D12_STATIC_BORDER_COLOR> border_color_mapping[] = {
+    {{{0.0f, 0.0f, 0.0f, 0.0f}}, D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK},
+    {{{0.0f, 0.0f, 0.0f, 1.0f}}, D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK},
+    {{{1.0f, 1.0f, 1.0f, 1.0f}}, D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE},
+  };
+
+  const u32 index = m_desc.NumStaticSamplers++;
+  DebugAssert(index < MAX_STATIC_SAMPLERS);
+  m_desc.pStaticSamplers = m_static_samplers.data();
+
+  D3D12_STATIC_SAMPLER_DESC& ssdesc = m_static_samplers[index];
+  ssdesc.Filter = sampler_desc.Filter;
+  ssdesc.AddressU = sampler_desc.AddressU;
+  ssdesc.AddressV = sampler_desc.AddressV;
+  ssdesc.AddressW = sampler_desc.AddressW;
+  ssdesc.MipLODBias = sampler_desc.MipLODBias;
+  ssdesc.MaxAnisotropy = sampler_desc.MaxAnisotropy;
+  ssdesc.ComparisonFunc = sampler_desc.ComparisonFunc;
+  ssdesc.BorderColor = D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK;
+  if (sampler_desc.AddressU == D3D12_TEXTURE_ADDRESS_MODE_BORDER ||
+      sampler_desc.AddressV == D3D12_TEXTURE_ADDRESS_MODE_BORDER ||
+      sampler_desc.AddressW == D3D12_TEXTURE_ADDRESS_MODE_BORDER)
+  {
+    u32 i;
+    for (i = 0; i < static_cast<u32>(std::size(border_color_mapping)); i++)
+    {
+      if (std::memcmp(border_color_mapping[i].first.data(), sampler_desc.BorderColor, sizeof(float) * 4) == 0)
+        break;
+    }
+    if (i == std::size(border_color_mapping))
+      Panic("Unsupported border color");
+    else
+      ssdesc.BorderColor = border_color_mapping[i].second;
+  }
+
+  ssdesc.MinLOD = sampler_desc.MinLOD;
+  ssdesc.MaxLOD = sampler_desc.MaxLOD;
+  ssdesc.ShaderRegister = shader_reg;
+  ssdesc.RegisterSpace = 0;
+  ssdesc.ShaderVisibility = visibility;
+
+  return index;
+}
+
 #ifdef ENABLE_GPU_OBJECT_NAMES
 
 void D3D12::SetObjectName(ID3D12Object* object, std::string_view name)
diff --git a/src/util/d3d12_builders.h b/src/util/d3d12_builders.h
@@ -22,7 +22,8 @@ class RootSignatureBuilder
   enum : u32
   {
     MAX_PARAMETERS = 16,
-    MAX_DESCRIPTOR_RANGES = 16
+    MAX_DESCRIPTOR_RANGES = 16,
+    MAX_STATIC_SAMPLERS = 1,
   };
 
   RootSignatureBuilder();
@@ -38,11 +39,13 @@ class RootSignatureBuilder
   u32 AddSRVParameter(u32 shader_reg, D3D12_SHADER_VISIBILITY visibility);
   u32 AddDescriptorTable(D3D12_DESCRIPTOR_RANGE_TYPE rt, u32 start_shader_reg, u32 num_shader_regs,
                          D3D12_SHADER_VISIBILITY visibility);
+  u32 AddStaticSampler(u32 shader_reg, const D3D12_SAMPLER_DESC& sampler_desc, D3D12_SHADER_VISIBILITY visibility);
 
 private:
   D3D12_ROOT_SIGNATURE_DESC m_desc{};
   std::array<D3D12_ROOT_PARAMETER, MAX_PARAMETERS> m_params{};
   std::array<D3D12_DESCRIPTOR_RANGE, MAX_DESCRIPTOR_RANGES> m_descriptor_ranges{};
+  std::array<D3D12_STATIC_SAMPLER_DESC, MAX_STATIC_SAMPLERS> m_static_samplers{};
   u32 m_num_descriptor_ranges = 0;
 };
 
diff --git a/src/util/d3d12_device.cpp b/src/util/d3d12_device.cpp
@@ -65,33 +65,28 @@ static u32 s_debug_scope_depth = 0;
 #endif
 
 static constexpr const u32 s_mipmap_blit_vs[] = {
-  0x43425844, 0xe0f571cf, 0x51234ef3, 0x3a6beab4, 0x141cd2ef, 0x00000001, 0x000003ac, 0x00000005, 0x00000034,
-  0x00000144, 0x00000178, 0x000001d0, 0x00000310, 0x46454452, 0x00000108, 0x00000001, 0x00000068, 0x00000001,
-  0x0000003c, 0xfffe0500, 0x00008100, 0x000000e0, 0x31314452, 0x0000003c, 0x00000018, 0x00000020, 0x00000028,
-  0x00000024, 0x0000000c, 0x00000000, 0x0000005c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000001, 0x00000001, 0x424f4255, 0x6b636f6c, 0xababab00, 0x0000005c, 0x00000001, 0x00000080, 0x00000010,
-  0x00000000, 0x00000000, 0x000000a8, 0x00000000, 0x00000010, 0x00000002, 0x000000bc, 0x00000000, 0xffffffff,
-  0x00000000, 0xffffffff, 0x00000000, 0x72735f75, 0x65725f63, 0x66007463, 0x74616f6c, 0xabab0034, 0x00030001,
-  0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000b3, 0x7263694d,
-  0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30,
-  0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000006, 0x00000001, 0x00000000,
-  0x00000101, 0x565f5653, 0x65747265, 0x00444978, 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038,
-  0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000c03, 0x00000041, 0x00000000, 0x00000001, 0x00000003,
-  0x00000001, 0x0000000f, 0x43584554, 0x44524f4f, 0x5f565300, 0x69736f50, 0x6e6f6974, 0xababab00, 0x58454853,
-  0x00000138, 0x00010050, 0x0000004e, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000060,
+  0x43425844, 0x1790f572, 0x2810683a, 0xdff0fe9d, 0x8f210489, 0x00000001, 0x000002e0, 0x00000005, 0x00000034,
+  0x000000a0, 0x000000d4, 0x0000012c, 0x00000244, 0x46454452, 0x00000064, 0x00000000, 0x00000000, 0x00000000,
+  0x0000003c, 0xfffe0500, 0x00008100, 0x0000003c, 0x31314452, 0x0000003c, 0x00000018, 0x00000020, 0x00000028,
+  0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168,
+  0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+  0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, 0x4e47534f,
+  0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000c03,
+  0x00000041, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000f, 0x43584554, 0x44524f4f, 0x5f565300,
+  0x69736f50, 0x6e6f6974, 0xababab00, 0x58454853, 0x00000110, 0x00010050, 0x00000044, 0x0100086a, 0x04000060,
   0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102032, 0x00000000, 0x04000067, 0x001020f2, 0x00000001,
   0x00000001, 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001,
   0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, 0x0010100a,
-  0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, 0x00000000, 0x0b000032,
-  0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x00208046, 0x00000000,
-  0x00000000, 0x0f000032, 0x00102032, 0x00000001, 0x00100046, 0x00000000, 0x00004002, 0x40000000, 0xc0000000,
-  0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2,
-  0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x54415453, 0x00000094,
-  0x00000007, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000000,
+  0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, 0x00000000, 0x05000036,
+  0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x0f000032, 0x00102032, 0x00000001, 0x00100046, 0x00000000,
+  0x00004002, 0x40000000, 0xc0000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000,
+  0x00000000, 0x08000036, 0x001020c2, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000,
+  0x0100003e, 0x54415453, 0x00000094, 0x00000007, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000,
+  0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000,
   0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000};
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+};
 
 static constexpr const u32 s_mipmap_blit_ps[] = {
   0x43425844, 0x25500f77, 0x71f24271, 0x5f83f8b8, 0x3f405943, 0x00000001, 0x0000026c, 0x00000005, 0x00000034,
@@ -1786,11 +1781,23 @@ bool D3D12Device::CreateRootSignatures(Error* error)
     D3D12::SetObjectName(rs.Get(), "Compute Multi Texture Pipeline Layout");
   }
 
+  {
+    auto& rs = m_mipmap_render_root_signature;
+    rsb.AddDescriptorTable(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 0, 1, D3D12_SHADER_VISIBILITY_PIXEL);
+    rsb.AddStaticSampler(0, D3D12Sampler::GetD3DSamplerDesc(GPUSampler::GetLinearConfig()), D3D12_SHADER_VISIBILITY_PIXEL);
+    if (!(rs = rsb.Create(error, true)))
+      return false;
+    D3D12::SetObjectName(rs.Get(), "Render Mipmap Pipeline Layout");
+  }
+
   return true;
 }
 
 void D3D12Device::DestroyRootSignatures()
 {
+  for (ComPtr<ID3D12PipelineState>& it : m_mipmap_render_pipelines)
+    it.Reset();
+  m_mipmap_render_root_signature.Reset();
   m_root_signatures.enumerate([](auto& it) { it.Reset(); });
 }
 
@@ -2213,17 +2220,15 @@ void D3D12Device::UnbindTextureBuffer(D3D12TextureBuffer* buf)
 void D3D12Device::RenderTextureMipmap(D3D12Texture* texture, u32 dst_level, u32 dst_width, u32 dst_height,
                                       u32 src_level, u32 src_width, u32 src_height)
 {
-  ID3D12RootSignature* rootsig =
-    m_root_signatures[0][static_cast<size_t>(GPUPipeline::Layout::SingleTextureAndPushConstants)].Get();
   ComPtr<ID3D12PipelineState>& pipeline = m_mipmap_render_pipelines[static_cast<size_t>(texture->GetFormat())];
   if (!pipeline)
   {
     D3D12::GraphicsPipelineBuilder gpb;
-    gpb.SetRootSignature(rootsig);
+    gpb.SetRootSignature(m_mipmap_render_root_signature.Get());
     gpb.SetPrimitiveTopologyType(D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE);
     gpb.SetRenderTarget(0, texture->GetDXGIFormat());
-    gpb.SetVertexShader(s_mipmap_blit_vs, std::size(s_mipmap_blit_vs));
-    gpb.SetPixelShader(s_mipmap_blit_ps, std::size(s_mipmap_blit_ps));
+    gpb.SetVertexShader(s_mipmap_blit_vs, sizeof(s_mipmap_blit_vs));
+    gpb.SetPixelShader(s_mipmap_blit_ps, sizeof(s_mipmap_blit_ps));
     gpb.SetRasterizationState(D3D12_FILL_MODE_SOLID, D3D12_CULL_MODE_NONE, false);
     gpb.SetDepthState(false, false, D3D12_COMPARISON_FUNC_ALWAYS);
     gpb.SetBlendState(0, false, D3D12_BLEND_ZERO, D3D12_BLEND_ONE, D3D12_BLEND_OP_ADD, D3D12_BLEND_ZERO,
@@ -2266,17 +2271,26 @@ void D3D12Device::RenderTextureMipmap(D3D12Texture* texture, u32 dst_level, u32
     }
   }
 
-  EndRenderPass();
+  if (InRenderPass())
+    EndRenderPass();
 
   // we need a temporary SRV and RTV for each mip level
   // Safe to use the init buffer after exec, because everything will be done with the texture.
   D3D12DescriptorHandle rtv_handle;
   while (!GetRTVHeapManager().Allocate(&rtv_handle))
+  {
     SubmitCommandList(false, "Allocate RTV for RenderTextureMipmap()");
+    if (m_device_was_lost)
+      return;
+  }
 
   D3D12DescriptorHandle srv_handle;
-  while (!GetDescriptorHeapManager().Allocate(&srv_handle))
-    SubmitCommandList(false, "Allocate SRV for RenderTextureMipmap()");
+  while (!m_command_lists[m_current_command_list].descriptor_allocator.Allocate(1, &srv_handle))
+  {
+    SubmitCommandList(false, "Allocate SRV/sampler for RenderTextureMipmap()");
+    if (m_device_was_lost)
+      return;
+  }
 
   // Setup views. This will be a partial view for the SRV.
   const D3D12_RENDER_TARGET_VIEW_DESC rtv_desc = {.Format = texture->GetDXGIFormat(),
@@ -2317,8 +2331,8 @@ void D3D12Device::RenderTextureMipmap(D3D12Texture* texture, u32 dst_level, u32
   cmdlist->RSSetScissorRects(1, &scissor);
 
   cmdlist->SetPipelineState(pipeline.Get());
+  cmdlist->SetGraphicsRootSignature(m_mipmap_render_root_signature.Get());
   cmdlist->SetGraphicsRootDescriptorTable(0, srv_handle);
-  cmdlist->SetGraphicsRootDescriptorTable(1, static_cast<D3D12Sampler*>(m_linear_sampler)->GetDescriptor());
   cmdlist->DrawInstanced(3, 1, 0, 0);
 
   cmdlist->EndRenderPass();
@@ -2335,7 +2349,6 @@ void D3D12Device::RenderTextureMipmap(D3D12Texture* texture, u32 dst_level, u32
   }
 
   // Must destroy after current cmdlist.
-  DeferDescriptorDestruction(m_descriptor_heap_manager, &srv_handle);
   DeferDescriptorDestruction(m_rtv_heap_manager, &rtv_handle);
 
   // Restore for next normal draw.
diff --git a/src/util/d3d12_device.h b/src/util/d3d12_device.h
@@ -363,6 +363,7 @@ class D3D12Device final : public GPUDevice
 
   D3D12SwapChain* m_current_swap_chain = nullptr;
 
+  ComPtr<ID3D12RootSignature> m_mipmap_render_root_signature;
   std::array<ComPtr<ID3D12PipelineState>, static_cast<size_t>(GPUTexture::Format::MaxCount)> m_mipmap_render_pipelines =
     {};
 };
diff --git a/src/util/d3d12_texture.cpp b/src/util/d3d12_texture.cpp
@@ -74,7 +74,6 @@ std::unique_ptr<GPUTexture> D3D12Device::CreateTexture(u32 width, u32 height, u3
     case GPUTexture::Type::RenderTarget:
     {
       // RT's tend to be larger, so we'll keep them committed for speed.
-      DebugAssert(levels == 1);
       allocationDesc.Flags |= D3D12MA::ALLOCATION_FLAG_COMMITTED;
       desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
       optimized_clear_value.Format = fm.rtv_format;
@@ -566,8 +565,6 @@ void D3D12Texture::Unmap()
 
 void D3D12Texture::GenerateMipmaps()
 {
-  Panic("Not implemented");
-
   for (u32 layer = 0; layer < m_layers; layer++)
   {
     for (u32 dst_level = 1; dst_level < m_levels; dst_level++)
@@ -718,7 +715,7 @@ void D3D12Sampler::SetDebugName(std::string_view name)
 
 #endif
 
-std::unique_ptr<GPUSampler> D3D12Device::CreateSampler(const GPUSampler::Config& config, Error* error /* = nullptr */)
+D3D12_SAMPLER_DESC D3D12Sampler::GetD3DSamplerDesc(const GPUSampler::Config& config)
 {
   static constexpr std::array<D3D12_TEXTURE_ADDRESS_MODE, static_cast<u8>(GPUSampler::AddressMode::MaxCount)> ta = {{
     D3D12_TEXTURE_ADDRESS_MODE_WRAP,   // Repeat
@@ -742,7 +739,7 @@ std::unique_ptr<GPUSampler> D3D12Device::CreateSampler(const GPUSampler::Config&
   desc.AddressU = ta[static_cast<u8>(config.address_u.GetValue())];
   desc.AddressV = ta[static_cast<u8>(config.address_v.GetValue())];
   desc.AddressW = ta[static_cast<u8>(config.address_w.GetValue())];
-  std::memcpy(desc.BorderColor, RGBA8ToFloat(config.border_color).data(), sizeof(desc.BorderColor));
+  std::memcpy(desc.BorderColor, GPUDevice::RGBA8ToFloat(config.border_color).data(), sizeof(desc.BorderColor));
   desc.MinLOD = static_cast<float>(config.min_lod);
   desc.MaxLOD = static_cast<float>(config.max_lod);
 
@@ -758,9 +755,15 @@ std::unique_ptr<GPUSampler> D3D12Device::CreateSampler(const GPUSampler::Config&
     desc.MaxAnisotropy = 1;
   }
 
+  return desc;
+}
+
+std::unique_ptr<GPUSampler> D3D12Device::CreateSampler(const GPUSampler::Config& config, Error* error /* = nullptr */)
+{
   D3D12DescriptorHandle handle;
   if (m_sampler_heap_manager.Allocate(&handle)) [[likely]]
   {
+    const D3D12_SAMPLER_DESC desc = D3D12Sampler::GetD3DSamplerDesc(config);
     m_device->CreateSampler(&desc, handle);
     return std::unique_ptr<GPUSampler>(new D3D12Sampler(handle));
   }
diff --git a/src/util/d3d12_texture.h b/src/util/d3d12_texture.h
@@ -81,8 +81,8 @@ class D3D12Texture final : public GPUTexture
                D3D12_RESOURCE_STATES resource_state);
 
   ID3D12GraphicsCommandList4* GetCommandBufferForUpdate();
-  ID3D12Resource* AllocateUploadStagingBuffer(const void* data, u32 pitch, u32 upload_pitch, u32 width,
-                                              u32 height, u32 buffer_size) const;
+  ID3D12Resource* AllocateUploadStagingBuffer(const void* data, u32 pitch, u32 upload_pitch, u32 width, u32 height,
+                                              u32 buffer_size) const;
   void ActuallyCommitClear(ID3D12GraphicsCommandList* cmdlist);
 
   ComPtr<ID3D12Resource> m_resource;
@@ -121,6 +121,8 @@ class D3D12Sampler final : public GPUSampler
   void SetDebugName(std::string_view name) override;
 #endif
 
+  static D3D12_SAMPLER_DESC GetD3DSamplerDesc(const GPUSampler::Config& config);
+
 private:
   D3D12Sampler(D3D12DescriptorHandle descriptor);
 
diff --git a/src/util/gpu_texture.cpp b/src/util/gpu_texture.cpp
@@ -344,9 +344,9 @@ bool GPUTexture::ValidateConfig(u32 width, u32 height, u32 layers, u32 levels, u
     return false;
   }
 
-  if (levels > 1 && type != Type::Texture)
+  if (levels > 1 && type == Type::DepthStencil)
   {
-    Error::SetStringView(error, "Mipmaps are not supported on targets.");
+    Error::SetStringView(error, "Mipmaps are not supported on depth stencil.");
     return false;
   }
 
diff --git a/src/util/vulkan_texture.cpp b/src/util/vulkan_texture.cpp
@@ -104,7 +104,6 @@ std::unique_ptr<VulkanTexture> VulkanTexture::Create(u32 width, u32 height, u32
 
     case Type::RenderTarget:
     {
-      DebugAssert(levels == 1);
       ici.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
                   VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
                   VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;

Original file line number	Diff line number	Diff line change
`@@ -344,9 +344,9 @@ bool GPUTexture::ValidateConfig(u32 width, u32 height, u32 layers, u32 levels, u`
`344`	`344`	`return false;`
`345`	`345`	`}`
`346`	`346`
`347`		`- if (levels > 1 && type != Type::Texture)`
	`347`	`+ if (levels > 1 && type == Type::DepthStencil)`
`348`	`348`	`{`
`349`		`- Error::SetStringView(error, "Mipmaps are not supported on targets.");`
	`349`	`+ Error::SetStringView(error, "Mipmaps are not supported on depth stencil.");`
`350`	`350`	`return false;`
`351`	`351`	`}`
`352`	`352`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ std::unique_ptr<VulkanTexture> VulkanTexture::Create(u32 width, u32 height, u32`
`104`	`104`
`105`	`105`	`case Type::RenderTarget:`
`106`	`106`	`{`
`107`		`- DebugAssert(levels == 1);`
`108`	`107`	`ici.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT \| VK_IMAGE_USAGE_TRANSFER_DST_BIT \|`
`109`	`108`	`VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT \| VK_IMAGE_USAGE_SAMPLED_BIT \|`
`110`	`109`	`VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;`