Browse Source

Merge pull request #5188 from deadwanderer/master

[vendor:directx/d3d12] Fix RESOURCE_STATE_ALL_SHADER_RESOURCE flags and add new HEAP_TYPE
Jeroen van Rijn 3 months ago
parent
commit
4329f50d26
1 changed files with 6 additions and 5 deletions
  1. 6 5
      vendor/directx/d3d12/d3d12.odin

+ 6 - 5
vendor/directx/d3d12/d3d12.odin

@@ -1316,10 +1316,11 @@ RESOURCE_ALLOCATION_INFO1 :: struct {
 }
 
 HEAP_TYPE :: enum i32 {
-	DEFAULT  = 1,
-	UPLOAD   = 2,
-	READBACK = 3,
-	CUSTOM   = 4,
+	DEFAULT    = 1,
+	UPLOAD     = 2,
+	READBACK   = 3,
+	CUSTOM     = 4,
+	GPU_UPLOAD = 5,
 }
 
 CPU_PAGE_PROPERTY :: enum i32 {
@@ -1551,7 +1552,7 @@ RESOURCE_STATE_GENERIC_READ :: RESOURCE_STATES{
 	.VERTEX_AND_CONSTANT_BUFFER, .INDEX_BUFFER, .NON_PIXEL_SHADER_RESOURCE, .PIXEL_SHADER_RESOURCE, .INDIRECT_ARGUMENT, .COPY_SOURCE,
 }
 RESOURCE_STATE_ALL_SHADER_RESOURCE :: RESOURCE_STATES{
-	.SHADING_RATE_SOURCE, .INDEX_BUFFER,
+	.NON_PIXEL_SHADER_RESOURCE, .PIXEL_SHADER_RESOURCE,
 }
 
 RESOURCE_BARRIER_TYPE :: enum i32 {