Disabled usage of small alignment when tight alignment is enabled in AllocatorPimpl::GetResourceAllocationInfo

sawickiap · sawickiap · commit 90a230ac2b59 · 2025-11-13T21:13:08.000+01:00
Hopefully fixes #83 - thanks @rtryan98
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
@@ -7849,6 +7849,7 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
 
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT
     if (inOutResourceDesc.Alignment == 0 &&
+        !IsTightAlignmentEnabled() &&
         (inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE1D ||
             inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D ||
             inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) &&
diff --git a/src/D3D12Sample.cpp b/src/D3D12Sample.cpp
@@ -605,8 +605,8 @@ static void PrintAdapterInformation(IDXGIAdapter1* adapter)
         assert(0);
     }
 
-    wprintf(L"D3D12_FEATURE_DATA_D3D12_OPTIONS16:\n");
-    wprintf(L"    GPUUploadHeapSupported = %u\n", g_Allocator->IsGPUUploadHeapSupported() ? 1 : 0);
+    wprintf(L"GPUUploadHeapSupported = %u\n", g_Allocator->IsGPUUploadHeapSupported() ? 1 : 0);
+    wprintf(L"TightAlignmentSupported = %u\n", g_Allocator->IsTightAlignmentSupported() ? 1 : 0);
 
     ComPtr<IDXGIAdapter3> adapter3;
     if(SUCCEEDED(adapter->QueryInterface(IID_PPV_ARGS(&adapter3))))

Original file line number	Diff line number	Diff line change
`@@ -605,8 +605,8 @@ static void PrintAdapterInformation(IDXGIAdapter1* adapter)`
`605`	`605`	`assert(0);`
`606`	`606`	`}`
`607`	`607`
`608`		`- wprintf(L"D3D12_FEATURE_DATA_D3D12_OPTIONS16:\n");`
`609`		`- wprintf(L" GPUUploadHeapSupported = %u\n", g_Allocator->IsGPUUploadHeapSupported() ? 1 : 0);`
	`608`	`+ wprintf(L"GPUUploadHeapSupported = %u\n", g_Allocator->IsGPUUploadHeapSupported() ? 1 : 0);`
	`609`	`+ wprintf(L"TightAlignmentSupported = %u\n", g_Allocator->IsTightAlignmentSupported() ? 1 : 0);`
`610`	`610`
`611`	`611`	`ComPtr<IDXGIAdapter3> adapter3;`
`612`	`612`	`if(SUCCEEDED(adapter->QueryInterface(IID_PPV_ARGS(&adapter3))))`