Skip to content

Commit 53aa954

Browse files
dave-juicelabsdave-juicelabs
committed
Removing Juice code
1 parent 09c4853 commit 53aa954

File tree

10 files changed

+18
-124
lines changed

10 files changed

+18
-124
lines changed

‎glslangValidator.exe

4.23 MB
Binary file not shown.

‎libs/vkd3d/breadcrumbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ HRESULT vkd3d_breadcrumb_tracer_init(struct vkd3d_breadcrumb_tracer *tracer, str
155155
resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE;
156156

157157
if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS,
158-
&resource_desc, "breadcrumb-host-buffer", VK_VKD3D_TYPE_TRACER_JUICE, &tracer->host_buffer)))
158+
&resource_desc, "breadcrumb-host-buffer", &tracer->host_buffer)))
159159
{
160160
goto err;
161161
}

‎libs/vkd3d/command.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11186,7 +11186,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(d3d12_comman
1118611186
UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views)
1118711187
{
1118811188
struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface);
11189-
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
1119011189
struct vkd3d_dynamic_state *dyn_state = &list->dynamic_state;
1119111190
const struct vkd3d_unique_resource *resource = NULL;
1119211191
uint32_t vbo_invalidate_mask;
@@ -11218,20 +11217,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(d3d12_comman
1121811217
{
1121911218
if ((resource = vkd3d_va_map_deref(&list->device->memory_allocator.va_map, views[i].BufferLocation)))
1122011219
{
11221-
1122211220
buffer = resource->vk_buffer;
1122311221
offset = views[i].BufferLocation - resource->va;
1122411222
stride = views[i].StrideInBytes;
1122511223
size = views[i].SizeInBytes;
11226-
11227-
/*bufferViewCreateInfo.sType = VK_STRUCTURE_TYPE_D3D12_BUFFER_VIEW_CREATE_INFO_JUICE;
11228-
bufferViewCreateInfo.pNext = NULL;
11229-
bufferViewCreateInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_VERTEX_BUFFER_JUICE;
11230-
bufferViewCreateInfo.buffer = buffer;
11231-
bufferViewCreateInfo.offset = offset;
11232-
bufferViewCreateInfo.size = size;
11233-
11234-
VK_CALL(vkCreateBufferViewJUICE(resource->allocation->device_allocation.vk_memory, &bufferViewCreateInfo));*/
1123511224
}
1123611225
else
1123711226
{
@@ -19466,7 +19455,7 @@ static HRESULT d3d12_command_signature_init_patch_commands_buffer(struct d3d12_c
1946619455
buffer_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
1946719456

1946819457
if (FAILED(hr = vkd3d_create_buffer(device, &heap_info, D3D12_HEAP_FLAG_NONE,
19469-
&buffer_desc, "dgc-state-template", VK_VKD3D_TYPE_COMMANDS_JUICE, &signature->state_template.dgc.buffer)))
19458+
&buffer_desc, "dgc-state-template", &signature->state_template.dgc.buffer)))
1947019459
return hr;
1947119460

1947219461
if (FAILED(hr = vkd3d_allocate_internal_buffer_memory(device, signature->state_template.dgc.buffer,

‎libs/vkd3d/debug_ring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ HRESULT vkd3d_shader_debug_ring_init(struct vkd3d_shader_debug_ring *ring,
394394
resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
395395

396396
if (FAILED(vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS,
397-
&resource_desc, "debug-ring-host", VK_VKD3D_TYPE_SHADER_DEBUG_RING_JUICE, &ring->host_buffer)))
397+
&resource_desc, "debug-ring-host", &ring->host_buffer)))
398398
goto err_free_buffers;
399399

400400
memory_props = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
@@ -425,7 +425,7 @@ HRESULT vkd3d_shader_debug_ring_init(struct vkd3d_shader_debug_ring *ring,
425425
heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
426426

427427
if (FAILED(vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS,
428-
&resource_desc, VK_VKD3D_TYPE_SHADER_DEBUG_RING_JUICE, &ring->device_atomic_buffer)))
428+
&resource_desc, "debug-ring-atomic", &ring->device_atomic_buffer)))
429429
goto err_free_buffers;
430430

431431
memory_props = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |

‎libs/vkd3d/descriptor_debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ static HRESULT vkd3d_descriptor_debug_alloc_global_info_descriptors(
492492
heap_flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
493493

494494
if (FAILED(hr = vkd3d_create_buffer(device, &heap_info, heap_flags, &buffer_desc,
495-
"qa-buffer", VK_VKD3D_TYPE_DESCRIPTOR_DEBUG_JUICE, &global_info->vk_payload_buffer)))
495+
"qa-buffer", &global_info->vk_payload_buffer)))
496496
{
497497
vkd3d_descriptor_debug_free_global_info(global_info, device);
498498
return hr;

‎libs/vkd3d/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ static HRESULT vkd3d_create_global_buffer(struct d3d12_device *device, VkDeviceS
717717
heap_properties->Type != D3D12_HEAP_TYPE_READBACK)
718718
resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
719719

720-
return vkd3d_create_buffer(device, heap_properties, heap_flags, &resource_desc, "global-buffer", VK_VKD3D_TYPE_GLOBAL_MEMORY_BUFFER_JUICE, vk_buffer);
720+
return vkd3d_create_buffer(device, heap_properties, heap_flags, &resource_desc, "global-buffer", vk_buffer);
721721
}
722722

723723
static void vkd3d_report_memory_budget(struct d3d12_device *device)

‎libs/vkd3d/resource.c

Lines changed: 10 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -135,24 +135,19 @@ HRESULT vkd3d_create_buffer_explicit_usage(struct d3d12_device *device,
135135

136136
HRESULT vkd3d_create_buffer(struct d3d12_device *device,
137137
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
138-
const D3D12_RESOURCE_DESC1 *desc, const char *tag, VkVkd3dTypeJUICE vkd3dType, VkBuffer *vk_buffer)
138+
const D3D12_RESOURCE_DESC1 *desc, const char *tag, VkBuffer *vk_buffer)
139139
{
140140
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
141141
VkExternalMemoryBufferCreateInfo external_info;
142142
const bool sparse_resource = !heap_properties;
143143
VkBufferCreateInfo buffer_info;
144-
VkD3D12ResourceCreateInfoJUICE d3d12_info;
145144
D3D12_HEAP_TYPE heap_type;
146145
VkResult vr;
147146

148147
heap_type = heap_properties ? heap_properties->Type : D3D12_HEAP_TYPE_DEFAULT;
149148

150-
d3d12_info.sType = VK_STRUCTURE_TYPE_D3D12_RESOURCE_CREATE_INFO_JUICE;
151-
d3d12_info.pNext = NULL;
152-
d3d12_info.vkd3dType = vkd3dType;
153-
154149
buffer_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
155-
buffer_info.pNext = &d3d12_info;
150+
buffer_info.pNext = NULL;
156151
buffer_info.flags = 0;
157152
buffer_info.size = desc->Width;
158153

@@ -951,24 +946,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device,
951946
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
952947
const D3D12_RESOURCE_DESC1 *desc, struct d3d12_resource *resource,
953948
UINT num_castable_formats, const DXGI_FORMAT *castable_formats,
954-
VkVkd3dTypeJUICE type, VkVkd3dTypeJUICE type, VkImage *vk_image)
949+
VkImage *vk_image)
955950
{
956951
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
957952
struct vkd3d_image_create_info create_info;
958-
VkD3D12ResourceCreateInfoJUICE d3d12_info;
959953
VkResult vr;
960954
HRESULT hr;
961955

962956
if (FAILED(hr = vkd3d_get_image_create_info(device, heap_properties,
963957
heap_flags, desc, resource, num_castable_formats, castable_formats, &create_info)))
964958
return hr;
965959

966-
d3d12_info.sType = VK_STRUCTURE_TYPE_D3D12_RESOURCE_CREATE_INFO_JUICE;
967-
d3d12_info.vkd3dType = type;
968-
969-
d3d12_info.pNext = create_info.image_info.pNext;
970-
create_info.image_info.pNext = &d3d12_info;
971-
972960
/* In case we get address binding callbacks, ensure driver knows it's not a sparse bind that happens async. */
973961
vkd3d_address_binding_tracker_mark_user_thread();
974962

@@ -3291,9 +3279,9 @@ static HRESULT d3d12_resource_create_vk_resource(struct d3d12_resource *resource
32913279
if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
32923280
{
32933281
if (FAILED(hr = vkd3d_create_buffer(device, heap_properties,
3294-
D3D12_HEAP_FLAG_NONE, &resource->desc, &resource->res.vk_buffer)))
3282+
D3D12_HEAP_FLAG_NONE, &resource->desc,
32953283
(resource->flags & VKD3D_RESOURCE_RESERVED) ? "sparse-buffer" : "user-buffer",
3296-
VK_VKD3D_TYPE_NONE_JUICE, &resource->res.vk_buffer)))
3284+
&resource->res.vk_buffer)))
32973285
return hr;
32983286

32993287
if (vkd3d_address_binding_tracker_active(&device->address_binding_tracker))
@@ -3312,7 +3300,7 @@ static HRESULT d3d12_resource_create_vk_resource(struct d3d12_resource *resource
33123300
if (FAILED(hr = vkd3d_create_image(device, heap_properties,
33133301
D3D12_HEAP_FLAG_NONE, &resource->desc, resource,
33143302
num_castable_formats, castable_formats,
3315-
VK_VKD3D_TYPE_NONE_JUICE, &resource->res.vk_image)))
3303+
&resource->res.vk_image)))
33163304
return hr;
33173305

33183306
if (vkd3d_address_binding_tracker_active(&device->address_binding_tracker))
@@ -5422,8 +5410,6 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
54225410

54235411
if (desc->ViewDimension == D3D12_SRV_DIMENSION_RAYTRACING_ACCELERATION_STRUCTURE)
54245412
{
5425-
// damcclos: TODO
5426-
54275413
if (!desc->RaytracingAccelerationStructure.Location)
54285414
{
54295415
/* There is no concrete descriptor to use here,
@@ -5470,8 +5456,6 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
54705456

54715457
if (!resource)
54725458
{
5473-
// damcclos: TODO
5474-
54755459
if (mutable_uses_single_descriptor)
54765460
{
54775461
d3d12_descriptor_heap_write_null_descriptor_template(desc_va,
@@ -5526,7 +5510,6 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
55265510
}
55275511
else
55285512
{
5529-
//VkD3D12BufferViewCreateInfoJUICE bufferViewCreateInfo;
55305513
VkDeviceSize stride = desc->Format == DXGI_FORMAT_UNKNOWN
55315514
? desc->Buffer.StructureByteStride :
55325515
vkd3d_get_format(device, desc->Format, false)->byte_count;
@@ -5537,17 +5520,7 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
55375520

55385521
vkd3d_init_write_descriptor_set(&vk_write[vk_write_count], &d, binding,
55395522
vk_descriptor_type, &descriptor_info[vk_write_count]);
5540-
5541-
/*bufferViewCreateInfo.sType = VK_STRUCTURE_TYPE_D3D12_BUFFER_VIEW_CREATE_INFO_JUICE;
5542-
bufferViewCreateInfo.pNext = NULL;
5543-
bufferViewCreateInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_SHADER_RESOURCE_JUICE;
5544-
bufferViewCreateInfo.buffer = descriptor_info[vk_write_count].buffer.buffer;
5545-
bufferViewCreateInfo.offset = descriptor_info[vk_write_count].buffer.offset;
5546-
bufferViewCreateInfo.size = descriptor_info[vk_write_count].buffer.range;
5547-
5548-
VK_CALL(vkCreateBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bufferViewCreateInfo));*/
5549-
5550-
vk_write_count++;
5523+
vk_write_count++;
55515524
}
55525525
}
55535526

@@ -5598,19 +5571,7 @@ static void vkd3d_create_buffer_srv(vkd3d_cpu_descriptor_va_t desc_va,
55985571
descriptor_info[vk_write_count].buffer_view = view ? view->vk_buffer_view : VK_NULL_HANDLE;
55995572
vkd3d_init_write_descriptor_set(&vk_write[vk_write_count], &d, binding,
56005573
vk_descriptor_type, &descriptor_info[vk_write_count]);
5601-
5602-
/*if (descriptor_info[vk_write_count].buffer_view)
5603-
{
5604-
VkD3D12BindBufferViewInfoJUICE bindViewInfo;
5605-
bindViewInfo.sType = VK_STRUCTURE_TYPE_D3D12_BIND_BUFFER_VIEW_INFO_JUICE;
5606-
bindViewInfo.pNext = NULL;
5607-
bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_SHADER_RESOURCE_JUICE;
5608-
bindViewInfo.bufferView = descriptor_info[vk_write_count].buffer_view;
5609-
5610-
VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
5611-
}*/
5612-
5613-
vk_write_count++;
5574+
vk_write_count++;
56145575
}
56155576
}
56165577

@@ -5933,18 +5894,6 @@ static void vkd3d_create_texture_srv(vkd3d_cpu_descriptor_va_t desc_va,
59335894
{
59345895
vkd3d_init_write_descriptor_set(&vk_writes[vk_write_count++], &d, binding,
59355896
VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, &descriptor_info);
5936-
//VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, &vk_write, 0, NULL));
5937-
5938-
//if (descriptor_info.image.imageView)
5939-
//{
5940-
// VkD3D12BindImageViewInfoJUICE bindViewInfo;
5941-
// bindViewInfo.sType = VK_STRUCTURE_TYPE_D3D12_BIND_IMAGE_VIEW_INFO_JUICE;
5942-
// bindViewInfo.pNext = NULL;
5943-
// bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_SHADER_RESOURCE_JUICE;
5944-
// bindViewInfo.imageView = descriptor_info.image.imageView;
5945-
5946-
// VK_CALL(vkBindImageViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
5947-
//}
59485897
}
59495898

59505899
/* Clear out sibling typed descriptor if appropriate.
@@ -6203,8 +6152,6 @@ static void vkd3d_create_buffer_uav(vkd3d_cpu_descriptor_va_t desc_va, struct d3
62036152

62046153
if (!resource)
62056154
{
6206-
// damcclos: TODO
6207-
62086155
if (mutable_uses_single_descriptor)
62096156
{
62106157
d3d12_descriptor_heap_write_null_descriptor_template(desc_va,
@@ -6328,18 +6275,6 @@ static void vkd3d_create_buffer_uav(vkd3d_cpu_descriptor_va_t desc_va, struct d3
63286275

63296276
vkd3d_init_write_descriptor_set(&vk_write[vk_write_count], &d, binding,
63306277
vk_descriptor_type, &descriptor_info[vk_write_count]);
6331-
6332-
/*if (descriptor_info[vk_write_count].buffer_view)
6333-
{
6334-
VkD3D12BindBufferViewInfoJUICE bindViewInfo;
6335-
bindViewInfo.sType = VK_STRUCTURE_TYPE_D3D12_BIND_BUFFER_VIEW_INFO_JUICE;
6336-
bindViewInfo.pNext = NULL;
6337-
bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_UNORDERED_ACCESS_JUICE;
6338-
bindViewInfo.bufferView = descriptor_info[vk_write_count].buffer_view;
6339-
6340-
VK_CALL(vkBindBufferViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
6341-
}*/
6342-
63436278
vk_write_count++;
63446279
}
63456280
}
@@ -6488,18 +6423,6 @@ static void vkd3d_create_texture_uav(vkd3d_cpu_descriptor_va_t desc_va,
64886423
{
64896424
vkd3d_init_write_descriptor_set(&vk_writes[vk_write_count++], &d, binding,
64906425
VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, &descriptor_info);
6491-
//VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, &vk_write, 0, NULL));
6492-
6493-
//if (descriptor_info.image.imageView)
6494-
//{
6495-
// VkD3D12BindImageViewInfoJUICE bindViewInfo;
6496-
// bindViewInfo.sType = VK_STRUCTURE_TYPE_D3D12_BIND_IMAGE_VIEW_INFO_JUICE;
6497-
// bindViewInfo.pNext = NULL;
6498-
// bindViewInfo.d3d12Type = VK_D3D12_DESC_VIEW_TYPE_UNORDERED_ACCESS_JUICE;
6499-
// bindViewInfo.imageView = descriptor_info.image.imageView;
6500-
6501-
// VK_CALL(vkBindImageViewJUICE(resource->mem.device_allocation.vk_memory, &bindViewInfo));
6502-
//}
65036426
}
65046427

65056428
/* Clear out sibling typed descriptor if appropriate.
@@ -7774,7 +7697,7 @@ static HRESULT d3d12_descriptor_heap_init_data_buffer(struct d3d12_descriptor_he
77747697
heap_flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
77757698

77767699
if (FAILED(hr = vkd3d_create_buffer(device, &heap_info, heap_flags, &buffer_desc,
7777-
"descriptor-buffer", VK_VKD3D_TYPE_DESCRIPTOR_HEAP_SHADER_VISIBLE_JUICE, &descriptor_heap->vk_buffer)))
7700+
"descriptor-buffer", &descriptor_heap->vk_buffer)))
77787701
return hr;
77797702

77807703
property_flags = device->memory_info.descriptor_heap_memory_properties;
@@ -8574,7 +8497,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H
85748497
buffer_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
85758498

85768499
if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties,
8577-
D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS, &buffer_desc, "query-heap", VK_VKD3D_TYPE_QUERY_DATA_JUICE, &object->vk_buffer)))
8500+
D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS, &buffer_desc, "query-heap", &object->vk_buffer)))
85788501
{
85798502
vkd3d_free(object);
85808503
return hr;

‎libs/vkd3d/vkd3d_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ HRESULT vkd3d_allocate_internal_buffer_memory(struct d3d12_device *device, VkBuf
11291129
struct vkd3d_device_memory_allocation *allocation);
11301130
HRESULT vkd3d_create_buffer(struct d3d12_device *device,
11311131
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
1132-
const D3D12_RESOURCE_DESC1 *desc, const char *tag, VkVkd3dTypeJUICE vkd3dType, VkBuffer *vk_buffer);
1132+
const D3D12_RESOURCE_DESC1 *desc, const char *tag, VkBuffer *vk_buffer);
11331133
HRESULT vkd3d_create_buffer_explicit_usage(struct d3d12_device *device,
11341134
VkBufferUsageFlags vk_usage, VkDeviceSize vk_size, const char *tag, VkBuffer *vk_buffer);
11351135
HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,

‎libs/vkd3d/vulkan_procs.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -198,24 +198,6 @@ VK_DEVICE_PFN(vkWaitForFences)
198198
VK_DEVICE_PFN(vkWaitSemaphores)
199199
VK_DEVICE_PFN(vkCmdSetDepthWriteEnable)
200200

201-
VK_DEVICE_PFN(vkCreateBufferViewJUICE)
202-
VK_DEVICE_PFN(vkBindBufferViewJUICE)
203-
VK_DEVICE_PFN(vkBindImageViewJUICE)
204-
205-
///* VK_KHR_buffer_device_address */
206-
//VK_DEVICE_EXT_PFN(vkGetBufferDeviceAddressKHR)
207-
//VK_DEVICE_EXT_PFN(vkGetBufferOpaqueCaptureAddressKHR)
208-
//VK_DEVICE_EXT_PFN(vkGetDeviceMemoryOpaqueCaptureAddressKHR)
209-
//
210-
///* VK_KHR_timeline_semaphore */
211-
//VK_DEVICE_EXT_PFN(vkGetSemaphoreCounterValueKHR)
212-
//VK_DEVICE_EXT_PFN(vkWaitSemaphoresKHR)
213-
//VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR)
214-
//
215-
///* VK_KHR_draw_indirect_count */
216-
//VK_DEVICE_EXT_PFN(vkCmdDrawIndirectCountKHR)
217-
//VK_DEVICE_EXT_PFN(vkCmdDrawIndexedIndirectCountKHR)
218-
219201
/* VK_KHR_push_descriptor */
220202
VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR)
221203

‎meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if enable_tracy
6363
endif
6464
endif
6565

66-
vkd3d_external_includes = [ '../../common/vulkan/include', './subprojects/SPIRV-Headers/include' ]
66+
vkd3d_external_includes = [ './khronos/Vulkan-Headers/include', './khronos/SPIRV-Headers/include' ]
6767
vkd3d_public_includes = [ './include' ] + vkd3d_external_includes
6868
vkd3d_private_includes = [ './include/private' ] + vkd3d_public_includes
6969

0 commit comments

Comments
 (0)