June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] ole32/tests: Store GUIDs by reference.

by Huw Davies

On Tue, Jun 05, 2018 at 01:56:53PM +0200, Thomas Faber wrote: > Fixes MSVC build. > > Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> > --- > This is an alternative to "ole32/tests: Fix MSVC build.", suggested by Dmitry. Yes, much better. Thanks Dmitry! Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 5, 2018

[PATCH] ole32/tests: Store GUIDs by reference.

by Thomas Faber

Fixes MSVC build. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- This is an alternative to "ole32/tests: Fix MSVC build.", suggested by Dmitry. dlls/ole32/tests/marshal.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..39867394fb5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -560,12 +560,12 @@ static IPSFactoryBuffer PSFactoryBuffer = { &PSFactoryBufferVtbl }; struct host_object_data { IStream *stream; - IID iid; + const IID *iid; IUnknown *object; MSHLFLAGS marshal_flags; IMessageFilter *filter; IUnknown *register_object; - CLSID register_clsid; + const CLSID *register_clsid; HANDLE marshal_event; }; @@ -581,7 +581,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if(data->register_object) { - hr = CoRegisterClassObject(&data->register_clsid, data->register_object, + hr = CoRegisterClassObject(data->register_clsid, data->register_object, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &registration_key); ok(hr == S_OK, "CoRegisterClassObject failed: %08x\n", hr); } @@ -594,7 +594,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoRegisterMessageFilter); } - hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + hr = CoMarshalInterface(data->stream, data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ @@ -639,7 +639,7 @@ static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *th static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + struct host_object_data object_data = { stream, riid, object, marshal_flags }; return start_host_object2(&object_data, thread); } @@ -1254,9 +1254,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, &IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + &CLSID_WineTestPSFactoryBuffer }; cLocks = 0; external_connections = 0; @@ -2321,7 +2321,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4213,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

June 5, 2018

[PATCH vkd3d 4/4] demos: Get rid of code for compiling shaders using d3dcompiler.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> It's unused. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_win32.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index 3b61bcf8eeae..d2a54989e9a7 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -25,10 +25,6 @@ struct demo { - HMODULE d3dcompiler; - HRESULT (WINAPI *compile_from_file)(const WCHAR *filename, const void *defines, void *include, - const char *entry_point, const char *profile, UINT flags1, UINT flags2, - ID3DBlob **code, ID3DBlob **errors); size_t window_count; bool quit; @@ -198,11 +194,6 @@ static inline bool demo_init(struct demo *demo, void *user_data) { WNDCLASSEXW wc; - if (!(demo->d3dcompiler = LoadLibraryW(L"d3dcompiler_47"))) - return false; - if (!(demo->compile_from_file = (void *)GetProcAddress(demo->d3dcompiler, "D3DCompileFromFile"))) - goto fail; - wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = demo_window_proc; @@ -216,7 +207,7 @@ static inline bool demo_init(struct demo *demo, void *user_data) wc.lpszClassName = DEMO_WINDOW_CLASS_NAME; wc.hIconSm = LoadIconW(NULL, IDI_WINLOGO); if (!RegisterClassExW(&wc)) - goto fail; + return false; demo->window_count = 0; demo->quit = false; @@ -224,16 +215,11 @@ static inline bool demo_init(struct demo *demo, void *user_data) demo->idle_func = NULL; return true; - -fail: - FreeLibrary(demo->d3dcompiler); - return false; } static inline void demo_cleanup(struct demo *demo) { UnregisterClassW(DEMO_WINDOW_CLASS_NAME, GetModuleHandle(NULL)); - FreeLibrary(demo->d3dcompiler); } static inline void demo_set_idle_func(struct demo *demo, -- 2.16.4

June 5, 2018

[PATCH vkd3d 3/4] libs/vkd3d-shader: Factor out shader_dump_instruction().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 484 ++++++++++++++++++++++++---------------------- 1 file changed, 249 insertions(+), 235 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f987e3caa877..420ccea37f94 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1340,13 +1340,260 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, } } +static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_version *shader_version) +{ + unsigned int i; + + switch (ins->handler_idx) + { + case VKD3DSIH_DCL: + case VKD3DSIH_DCL_UAV_TYPED: + shader_dump_decl_usage(buffer, &ins->declaration.semantic, ins->flags, shader_version); + shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.reg); + shader_addline(buffer, " "); + shader_dump_dst_param(buffer, &ins->declaration.semantic.reg, shader_version); + break; + + case VKD3DSIH_DCL_CONSTANT_BUFFER: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_src_param(buffer, &ins->declaration.src, shader_version); + shader_addline(buffer, ", %s", + ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); + break; + + case VKD3DSIH_DCL_FUNCTION_BODY: + shader_addline(buffer, "%s fb%u", + shader_opcode_names[ins->handler_idx], ins->declaration.index); + break; + + case VKD3DSIH_DCL_FUNCTION_TABLE: + shader_addline(buffer, "%s ft%u = {...}", + shader_opcode_names[ins->handler_idx], ins->declaration.index); + break; + + case VKD3DSIH_DCL_GLOBAL_FLAGS: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_global_flags(buffer, ins->flags); + break; + + case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: + shader_addline(buffer, "%s %.8e", shader_opcode_names[ins->handler_idx], + ins->declaration.max_tessellation_factor); + break; + + case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: + shader_addline(buffer, "%s {\n", shader_opcode_names[ins->handler_idx]); + for (i = 0; i < ins->declaration.icb->vec4_count; ++i) + { + shader_addline(buffer, " {0x%08x, 0x%08x, 0x%08x, 0x%08x},\n", + ins->declaration.icb->data[4 * i + 0], + ins->declaration.icb->data[4 * i + 1], + ins->declaration.icb->data[4 * i + 2], + ins->declaration.icb->data[4 * i + 3]); + } + shader_addline(buffer, "}"); + break; + + case VKD3DSIH_DCL_INDEX_RANGE: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.index_range.first_register, shader_version); + shader_addline(buffer, " %u", ins->declaration.index_range.last_register); + break; + + case VKD3DSIH_DCL_INDEXABLE_TEMP: + shader_addline(buffer, "%s x[%u][%u], %u", shader_opcode_names[ins->handler_idx], + ins->declaration.indexable_temp.register_idx, + ins->declaration.indexable_temp.register_size, + ins->declaration.indexable_temp.component_count); + break; + + case VKD3DSIH_DCL_INPUT_PS: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_interpolation_mode(buffer, ins->flags); + shader_addline(buffer, " "); + shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + break; + + case VKD3DSIH_DCL_INPUT_PS_SGV: + case VKD3DSIH_DCL_INPUT_SGV: + case VKD3DSIH_DCL_INPUT_SIV: + case VKD3DSIH_DCL_OUTPUT_SIV: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.register_semantic.reg, shader_version); + shader_addline(buffer, ", "); + shader_dump_shader_input_sysval_semantic(buffer, ins->declaration.register_semantic.sysval_semantic); + break; + + case VKD3DSIH_DCL_INPUT_PS_SIV: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_interpolation_mode(buffer, ins->flags); + shader_addline(buffer, " "); + shader_dump_dst_param(buffer, &ins->declaration.register_semantic.reg, shader_version); + shader_addline(buffer, ", "); + shader_dump_shader_input_sysval_semantic(buffer, ins->declaration.register_semantic.sysval_semantic); + break; + + case VKD3DSIH_DCL_INPUT: + case VKD3DSIH_DCL_OUTPUT: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + break; + + case VKD3DSIH_DCL_INPUT_PRIMITIVE: + case VKD3DSIH_DCL_OUTPUT_TOPOLOGY: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_primitive_type(buffer, &ins->declaration.primitive_type); + break; + + case VKD3DSIH_DCL_INTERFACE: + shader_addline(buffer, "%s fp[%u][%u][%u] = {...}", + shader_opcode_names[ins->handler_idx], ins->declaration.fp.index, + ins->declaration.fp.array_size, ins->declaration.fp.body_count); + break; + + case VKD3DSIH_DCL_RESOURCE_RAW: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + break; + + case VKD3DSIH_DCL_RESOURCE_STRUCTURED: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); + shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + break; + + case VKD3DSIH_DCL_SAMPLER: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) + shader_addline(buffer, ", comparisonMode"); + break; + + case VKD3DSIH_DCL_TEMPS: + case VKD3DSIH_DCL_GS_INSTANCES: + case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: + case VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT: + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: + case VKD3DSIH_DCL_VERTICES_OUT: + shader_addline(buffer, "%s %u", shader_opcode_names[ins->handler_idx], ins->declaration.count); + break; + + case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_tessellator_domain(buffer, ins->declaration.tessellator_domain); + break; + + case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_tessellator_output_primitive(buffer, ins->declaration.tessellator_output_primitive); + break; + + case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_tessellator_partitioning(buffer, ins->declaration.tessellator_partitioning); + break; + + case VKD3DSIH_DCL_TGSM_RAW: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.tgsm_raw.reg, shader_version); + shader_addline(buffer, ", %u", ins->declaration.tgsm_raw.byte_count); + break; + + case VKD3DSIH_DCL_TGSM_STRUCTURED: + shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); + shader_dump_dst_param(buffer, &ins->declaration.tgsm_structured.reg, shader_version); + shader_addline(buffer, ", %u, %u", ins->declaration.tgsm_structured.byte_stride, + ins->declaration.tgsm_structured.structure_count); + break; + + case VKD3DSIH_DCL_THREAD_GROUP: + shader_addline(buffer, "%s %u, %u, %u", shader_opcode_names[ins->handler_idx], + ins->declaration.thread_group_size.x, + ins->declaration.thread_group_size.y, + ins->declaration.thread_group_size.z); + break; + + case VKD3DSIH_DCL_UAV_RAW: + shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); + shader_dump_uav_flags(buffer, ins->flags); + shader_addline(buffer, " "); + shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + break; + + case VKD3DSIH_DCL_UAV_STRUCTURED: + shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); + shader_dump_uav_flags(buffer, ins->flags); + shader_addline(buffer, " "); + shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); + shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + break; + + case VKD3DSIH_DEF: + shader_addline(buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", + shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), + ins->src[0].reg.u.immconst_float[0], ins->src[0].reg.u.immconst_float[1], + ins->src[0].reg.u.immconst_float[2], ins->src[0].reg.u.immconst_float[3]); + break; + + case VKD3DSIH_DEFI: + shader_addline(buffer, "defi i%u = %d, %d, %d, %d", ins->dst[0].reg.idx[0].offset, + ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], + ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); + break; + + case VKD3DSIH_DEFB: + shader_addline(buffer, "defb b%u = %s", + ins->dst[0].reg.idx[0].offset, ins->src[0].reg.u.immconst_uint[0] ? "true" : "false"); + break; + + default: + if (ins->predicate) + { + shader_addline(buffer, "("); + shader_dump_src_param(buffer, ins->predicate, shader_version); + shader_addline(buffer, ") "); + } + + /* PixWin marks instructions with the coissue flag with a '+' */ + if (ins->coissue) + shader_addline(buffer, "+"); + + shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); + + shader_dump_instruction_flags(buffer, ins, shader_version); + if (vkd3d_shader_instruction_has_texel_offset(ins)) + { + shader_addline(buffer, "(%d,%d,%d)", + ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); + } + + for (i = 0; i < ins->dst_count; ++i) + { + shader_dump_ins_modifiers(buffer, &ins->dst[i]); + shader_addline(buffer, !i ? " " : ", "); + shader_dump_dst_param(buffer, &ins->dst[i], shader_version); + } + + /* Other source tokens */ + for (i = ins->dst_count; i < (ins->dst_count + ins->src_count); ++i) + { + shader_addline(buffer, !i ? " " : ", "); + shader_dump_src_param(buffer, &ins->src[i - ins->dst_count], shader_version); + } + break; + } + + shader_addline(buffer, "\n"); +} + void vkd3d_shader_trace(void *data) { struct vkd3d_shader_version shader_version; struct vkd3d_string_buffer buffer; const char *p, *q; const DWORD *ptr; - DWORD i; if (!string_buffer_init(&buffer)) { @@ -1369,240 +1616,7 @@ void vkd3d_shader_trace(void *data) continue; } - if (ins.handler_idx == VKD3DSIH_DCL || ins.handler_idx == VKD3DSIH_DCL_UAV_TYPED) - { - shader_dump_decl_usage(&buffer, &ins.declaration.semantic, ins.flags, &shader_version); - shader_dump_ins_modifiers(&buffer, &ins.declaration.semantic.reg); - shader_addline(&buffer, " "); - shader_dump_dst_param(&buffer, &ins.declaration.semantic.reg, &shader_version); - } - else if (ins.handler_idx == VKD3DSIH_DCL_CONSTANT_BUFFER) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_src_param(&buffer, &ins.declaration.src, &shader_version); - shader_addline(&buffer, ", %s", - ins.flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); - } - else if (ins.handler_idx == VKD3DSIH_DCL_FUNCTION_BODY) - { - shader_addline(&buffer, "%s fb%u", - shader_opcode_names[ins.handler_idx], ins.declaration.index); - } - else if (ins.handler_idx == VKD3DSIH_DCL_FUNCTION_TABLE) - { - shader_addline(&buffer, "%s ft%u = {...}", - shader_opcode_names[ins.handler_idx], ins.declaration.index); - } - else if (ins.handler_idx == VKD3DSIH_DCL_GLOBAL_FLAGS) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_global_flags(&buffer, ins.flags); - } - else if (ins.handler_idx == VKD3DSIH_DCL_HS_MAX_TESSFACTOR) - { - shader_addline(&buffer, "%s %.8e", shader_opcode_names[ins.handler_idx], - ins.declaration.max_tessellation_factor); - } - else if (ins.handler_idx == VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) - { - shader_addline(&buffer, "%s {\n", shader_opcode_names[ins.handler_idx]); - for (i = 0; i < ins.declaration.icb->vec4_count; ++i) - { - shader_addline(&buffer, " {0x%08x, 0x%08x, 0x%08x, 0x%08x},\n", - ins.declaration.icb->data[4 * i + 0], - ins.declaration.icb->data[4 * i + 1], - ins.declaration.icb->data[4 * i + 2], - ins.declaration.icb->data[4 * i + 3]); - } - shader_addline(&buffer, "}"); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INDEX_RANGE) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.index_range.first_register, &shader_version); - shader_addline(&buffer, " %u", ins.declaration.index_range.last_register); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INDEXABLE_TEMP) - { - shader_addline(&buffer, "%s x[%u][%u], %u", shader_opcode_names[ins.handler_idx], - ins.declaration.indexable_temp.register_idx, - ins.declaration.indexable_temp.register_size, - ins.declaration.indexable_temp.component_count); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INPUT_PS) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_interpolation_mode(&buffer, ins.flags); - shader_addline(&buffer, " "); - shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INPUT_PS_SGV - || ins.handler_idx == VKD3DSIH_DCL_INPUT_SGV - || ins.handler_idx == VKD3DSIH_DCL_INPUT_SIV - || ins.handler_idx == VKD3DSIH_DCL_OUTPUT_SIV) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.register_semantic.reg, &shader_version); - shader_addline(&buffer, ", "); - shader_dump_shader_input_sysval_semantic(&buffer, ins.declaration.register_semantic.sysval_semantic); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INPUT_PS_SIV) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_interpolation_mode(&buffer, ins.flags); - shader_addline(&buffer, " "); - shader_dump_dst_param(&buffer, &ins.declaration.register_semantic.reg, &shader_version); - shader_addline(&buffer, ", "); - shader_dump_shader_input_sysval_semantic(&buffer, ins.declaration.register_semantic.sysval_semantic); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INPUT - || ins.handler_idx == VKD3DSIH_DCL_OUTPUT) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INPUT_PRIMITIVE - || ins.handler_idx == VKD3DSIH_DCL_OUTPUT_TOPOLOGY) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_primitive_type(&buffer, &ins.declaration.primitive_type); - } - else if (ins.handler_idx == VKD3DSIH_DCL_INTERFACE) - { - shader_addline(&buffer, "%s fp[%u][%u][%u] = {...}", - shader_opcode_names[ins.handler_idx], ins.declaration.fp.index, - ins.declaration.fp.array_size, ins.declaration.fp.body_count); - } - else if (ins.handler_idx == VKD3DSIH_DCL_RESOURCE_RAW) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); - } - else if (ins.handler_idx == VKD3DSIH_DCL_RESOURCE_STRUCTURED) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.structured_resource.reg, &shader_version); - shader_addline(&buffer, ", %u", ins.declaration.structured_resource.byte_stride); - } - else if (ins.handler_idx == VKD3DSIH_DCL_SAMPLER) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); - if (ins.flags == VKD3DSI_SAMPLER_COMPARISON_MODE) - shader_addline(&buffer, ", comparisonMode"); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TEMPS - || ins.handler_idx == VKD3DSIH_DCL_GS_INSTANCES - || ins.handler_idx == VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT - || ins.handler_idx == VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT - || ins.handler_idx == VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT - || ins.handler_idx == VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT - || ins.handler_idx == VKD3DSIH_DCL_VERTICES_OUT) - { - shader_addline(&buffer, "%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TESSELLATOR_DOMAIN) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_tessellator_domain(&buffer, ins.declaration.tessellator_domain); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_tessellator_output_primitive(&buffer, ins.declaration.tessellator_output_primitive); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TESSELLATOR_PARTITIONING) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TGSM_RAW) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); - shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); - } - else if (ins.handler_idx == VKD3DSIH_DCL_TGSM_STRUCTURED) - { - shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); - shader_dump_dst_param(&buffer, &ins.declaration.tgsm_structured.reg, &shader_version); - shader_addline(&buffer, ", %u, %u", ins.declaration.tgsm_structured.byte_stride, - ins.declaration.tgsm_structured.structure_count); - } - else if (ins.handler_idx == VKD3DSIH_DCL_THREAD_GROUP) - { - shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], - ins.declaration.thread_group_size.x, - ins.declaration.thread_group_size.y, - ins.declaration.thread_group_size.z); - } - else if (ins.handler_idx == VKD3DSIH_DCL_UAV_RAW) - { - shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - shader_dump_uav_flags(&buffer, ins.flags); - shader_addline(&buffer, " "); - shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); - } - else if (ins.handler_idx == VKD3DSIH_DCL_UAV_STRUCTURED) - { - shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - shader_dump_uav_flags(&buffer, ins.flags); - shader_addline(&buffer, " "); - shader_dump_dst_param(&buffer, &ins.declaration.structured_resource.reg, &shader_version); - shader_addline(&buffer, ", %u", ins.declaration.structured_resource.byte_stride); - } - else if (ins.handler_idx == VKD3DSIH_DEF) - { - shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", - shader_get_float_offset(ins.dst[0].reg.type, ins.dst[0].reg.idx[0].offset), - ins.src[0].reg.u.immconst_float[0], ins.src[0].reg.u.immconst_float[1], - ins.src[0].reg.u.immconst_float[2], ins.src[0].reg.u.immconst_float[3]); - } - else if (ins.handler_idx == VKD3DSIH_DEFI) - { - shader_addline(&buffer, "defi i%u = %d, %d, %d, %d", ins.dst[0].reg.idx[0].offset, - ins.src[0].reg.u.immconst_uint[0], ins.src[0].reg.u.immconst_uint[1], - ins.src[0].reg.u.immconst_uint[2], ins.src[0].reg.u.immconst_uint[3]); - } - else if (ins.handler_idx == VKD3DSIH_DEFB) - { - shader_addline(&buffer, "defb b%u = %s", - ins.dst[0].reg.idx[0].offset, ins.src[0].reg.u.immconst_uint[0] ? "true" : "false"); - } - else - { - if (ins.predicate) - { - shader_addline(&buffer, "("); - shader_dump_src_param(&buffer, ins.predicate, &shader_version); - shader_addline(&buffer, ") "); - } - - /* PixWin marks instructions with the coissue flag with a '+' */ - if (ins.coissue) - shader_addline(&buffer, "+"); - - shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - - shader_dump_instruction_flags(&buffer, &ins, &shader_version); - if (vkd3d_shader_instruction_has_texel_offset(&ins)) - shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); - - for (i = 0; i < ins.dst_count; ++i) - { - shader_dump_ins_modifiers(&buffer, &ins.dst[i]); - shader_addline(&buffer, !i ? " " : ", "); - shader_dump_dst_param(&buffer, &ins.dst[i], &shader_version); - } - - /* Other source tokens */ - for (i = ins.dst_count; i < (ins.dst_count + ins.src_count); ++i) - { - shader_addline(&buffer, !i ? " " : ", "); - shader_dump_src_param(&buffer, &ins.src[i - ins.dst_count], &shader_version); - } - } - shader_addline(&buffer, "\n"); + shader_dump_instruction(&buffer, &ins, &shader_version); } for (p = buffer.buffer; *p; p = q) -- 2.16.4

June 5, 2018

[PATCH vkd3d 2/4] libs/vkd3d-shader: Factor out shader_dump_instruction_flags().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 126 ++++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_private.h | 12 +-- 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ce8db46b6f21..f987e3caa877 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1274,6 +1274,72 @@ static void shader_dump_version(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); } +static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_version *shader_version) +{ + switch (ins->handler_idx) + { + case VKD3DSIH_BREAKP: + case VKD3DSIH_CONTINUEP: + case VKD3DSIH_IF: + case VKD3DSIH_RETP: + case VKD3DSIH_TEXKILL: + switch (ins->flags) + { + case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(buffer, "_nz"); break; + case VKD3D_SHADER_CONDITIONAL_OP_Z: shader_addline(buffer, "_z"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); break; + } + break; + + case VKD3DSIH_IFC: + case VKD3DSIH_BREAKC: + switch (ins->flags) + { + case VKD3D_SHADER_REL_OP_GT: shader_addline(buffer, "_gt"); break; + case VKD3D_SHADER_REL_OP_EQ: shader_addline(buffer, "_eq"); break; + case VKD3D_SHADER_REL_OP_GE: shader_addline(buffer, "_ge"); break; + case VKD3D_SHADER_REL_OP_LT: shader_addline(buffer, "_lt"); break; + case VKD3D_SHADER_REL_OP_NE: shader_addline(buffer, "_ne"); break; + case VKD3D_SHADER_REL_OP_LE: shader_addline(buffer, "_le"); break; + default: shader_addline(buffer, "_(%u)", ins->flags); + } + break; + + case VKD3DSIH_RESINFO: + switch (ins->flags) + { + case VKD3DSI_NONE: break; + case VKD3DSI_RESINFO_RCP_FLOAT: shader_addline(buffer, "_rcpFloat"); break; + case VKD3DSI_RESINFO_UINT: shader_addline(buffer, "_uint"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); + } + break; + + case VKD3DSIH_SAMPLE_INFO: + switch (ins->flags) + { + case VKD3DSI_NONE: break; + case VKD3DSI_SAMPLE_INFO_UINT: shader_addline(buffer, "_uint"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); + } + break; + + case VKD3DSIH_SYNC: + shader_dump_sync_flags(buffer, ins->flags); + break; + + case VKD3DSIH_TEX: + if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + shader_addline(buffer, "p"); + break; + + default: + shader_dump_precise_flags(buffer, ins->flags); + break; + } +} + void vkd3d_shader_trace(void *data) { struct vkd3d_shader_version shader_version; @@ -1518,65 +1584,7 @@ void vkd3d_shader_trace(void *data) shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - if (ins.handler_idx == VKD3DSIH_BREAKP - || ins.handler_idx == VKD3DSIH_CONTINUEP - || ins.handler_idx == VKD3DSIH_IF - || ins.handler_idx == VKD3DSIH_RETP - || ins.handler_idx == VKD3DSIH_TEXKILL) - { - switch (ins.flags) - { - case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(&buffer, "_nz"); break; - case VKD3D_SHADER_CONDITIONAL_OP_Z: shader_addline(&buffer, "_z"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); break; - } - } - else if (ins.handler_idx == VKD3DSIH_IFC - || ins.handler_idx == VKD3DSIH_BREAKC) - { - switch (ins.flags) - { - case VKD3D_SHADER_REL_OP_GT: shader_addline(&buffer, "_gt"); break; - case VKD3D_SHADER_REL_OP_EQ: shader_addline(&buffer, "_eq"); break; - case VKD3D_SHADER_REL_OP_GE: shader_addline(&buffer, "_ge"); break; - case VKD3D_SHADER_REL_OP_LT: shader_addline(&buffer, "_lt"); break; - case VKD3D_SHADER_REL_OP_NE: shader_addline(&buffer, "_ne"); break; - case VKD3D_SHADER_REL_OP_LE: shader_addline(&buffer, "_le"); break; - default: shader_addline(&buffer, "_(%u)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_TEX - && shader_version.major >= 2 - && (ins.flags & VKD3DSI_TEXLD_PROJECT)) - { - shader_addline(&buffer, "p"); - } - else if (ins.handler_idx == VKD3DSIH_RESINFO && ins.flags) - { - switch (ins.flags) - { - case VKD3DSI_RESINFO_RCP_FLOAT: shader_addline(&buffer, "_rcpFloat"); break; - case VKD3DSI_RESINFO_UINT: shader_addline(&buffer, "_uint"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_SAMPLE_INFO && ins.flags) - { - switch (ins.flags) - { - case VKD3DSI_SAMPLE_INFO_UINT: shader_addline(&buffer, "_uint"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_SYNC) - { - shader_dump_sync_flags(&buffer, ins.flags); - } - else - { - shader_dump_precise_flags(&buffer, ins.flags); - } - + shader_dump_instruction_flags(&buffer, &ins, &shader_version); if (vkd3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8ed700be3756..7fc42627f820 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -480,12 +480,12 @@ enum vkd3d_tessellator_partitioning }; -#define VKD3DSI_TEXLD_PROJECT 0x1 - -#define VKD3DSI_INDEXED_DYNAMIC 0x4 -#define VKD3DSI_RESINFO_RCP_FLOAT 0x1 -#define VKD3DSI_RESINFO_UINT 0x2 -#define VKD3DSI_SAMPLE_INFO_UINT 0x1 +#define VKD3DSI_NONE 0x0 +#define VKD3DSI_TEXLD_PROJECT 0x1 +#define VKD3DSI_INDEXED_DYNAMIC 0x4 +#define VKD3DSI_RESINFO_RCP_FLOAT 0x1 +#define VKD3DSI_RESINFO_UINT 0x2 +#define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 #define VKD3DSI_PRECISE_X 0x100 -- 2.16.4

June 5, 2018

[PATCH vkd3d 1/4] libs/vkd3d-shader: Factor out shader_dump_version().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 58 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index faa009e03a4c..ce8db46b6f21 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1234,58 +1234,62 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -void vkd3d_shader_trace(void *data) +static void shader_dump_version(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_version *shader_version) { - struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *type_prefix; - const char *p, *q; - const DWORD *ptr; - DWORD i; + const char *prefix; - if (!string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return; - } - - shader_sm4_read_header(data, &ptr, &shader_version); - - TRACE("Parsing %p.\n", ptr); - - switch (shader_version.type) + switch (shader_version->type) { case VKD3D_SHADER_TYPE_VERTEX: - type_prefix = "vs"; + prefix = "vs"; break; case VKD3D_SHADER_TYPE_HULL: - type_prefix = "hs"; + prefix = "hs"; break; case VKD3D_SHADER_TYPE_DOMAIN: - type_prefix = "ds"; + prefix = "ds"; break; case VKD3D_SHADER_TYPE_GEOMETRY: - type_prefix = "gs"; + prefix = "gs"; break; case VKD3D_SHADER_TYPE_PIXEL: - type_prefix = "ps"; + prefix = "ps"; break; case VKD3D_SHADER_TYPE_COMPUTE: - type_prefix = "cs"; + prefix = "cs"; break; default: - FIXME("Unhandled shader type %#x.\n", shader_version.type); - type_prefix = "unknown"; + FIXME("Unhandled shader type %#x.\n", shader_version->type); + prefix = "unknown"; break; } - shader_addline(&buffer, "%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor); + shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); +} + +void vkd3d_shader_trace(void *data) +{ + struct vkd3d_shader_version shader_version; + struct vkd3d_string_buffer buffer; + const char *p, *q; + const DWORD *ptr; + DWORD i; + + if (!string_buffer_init(&buffer)) + { + ERR("Failed to initialize string buffer.\n"); + return; + } + + shader_sm4_read_header(data, &ptr, &shader_version); + shader_dump_version(&buffer, &shader_version); while (!shader_sm4_is_end(data, &ptr)) { -- 2.16.4

June 5, 2018

Re: [PATCH] ole32/tests: Fix MSVC build.

by Thomas Faber

On 2018-06-05 13:28, Dmitry Timoshkov wrote: > Thomas Faber <thomas.faber(a)reactos.org> wrote: > >> - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, >> + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, >> MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, >> - CLSID_WineTestPSFactoryBuffer }; >> + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; > > Did you consider pass GUID by reference instead? I had not. But looking at the code, that indeed makes sense. I'll send the other version too, so Huw/Alexandre can pick whichever they prefer. Thanks! -Thomas

June 5, 2018

[PATCH v2] ole32/tests: Fix MSVC build.

by Thomas Faber

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- v2: Add change in start_host_object that I missed the first time. dlls/ole32/tests/marshal.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..ba4b68a9970 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -60,6 +60,8 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -639,7 +641,7 @@ static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *th static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + struct host_object_data object_data = { stream, GUID_MEMBERS(*riid), object, marshal_flags }; return start_host_object2(&object_data, thread); } @@ -1254,9 +1256,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; cLocks = 0; external_connections = 0; @@ -2321,7 +2323,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4215,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

June 5, 2018

Re: [PATCH 1/5] wined3d: Slightly improve formatting of generated GLSL shader interfaces.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 5, 2018

Re: [PATCH 4/5] wined3d: Compare interpolation mode VS compilation arguments.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 5, 2018

Re: [PATCH 3/5] wined3d: Initialize glMinSampleShading() function pointer.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 5, 2018

Re: [PATCH 2/5] dxgi: Get rid of DXGI_FRAME_LATENCY_DEFAULT.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 5, 2018

Re: [PATCH] ole32/tests: Fix MSVC build.

by Dmitry Timoshkov

Thomas Faber <thomas.faber(a)reactos.org> wrote: > - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, > + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, > MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, > - CLSID_WineTestPSFactoryBuffer }; > + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; Did you consider pass GUID by reference instead? -- Dmitry.

June 5, 2018

Re: [PATCH 4/4] winevulkan: Update Vulkan support to 1.0.76.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>

June 5, 2018

Re: [PATCH 2/4] winevulkan: Parse forward declared struct members.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>

June 5, 2018

Re: [PATCH 1/4] winevulkan: Fix parsing of const function pointer members.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>

June 5, 2018

Re: [PATCH 3/4] winevulkan: Parse extension require sections one by one.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>

June 5, 2018

[PATCH] ole32/tests: Fix MSVC build.

by Thomas Faber

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/ole32/tests/marshal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..b989c746c16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -60,6 +60,8 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -1254,9 +1256,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; cLocks = 0; external_connections = 0; @@ -2321,7 +2323,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4215,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

June 5, 2018

[PATCH] testbot: Make Step::FileName and FileType optional.

by Francois Gouget

Some steps don't have an input filename (like the Reconfig tasks) so it makes no sense to force setting FileName or FileType to a dummy value. However enum fields cannot be left undefined so add a 'none' value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the database schema and then restarting the TestBot Engine and website. testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/ddl/update35.sql | 5 +++++ testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 11 +++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- testbot/web/JobDetails.pl | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update35.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a79f60c71..f41148f12 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,8 +251,7 @@ sub AddReconfigJob() my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); $NewStep->Type("reconfig"); - $NewStep->FileName("-"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("none"); $NewStep->InStaging(!1); # Add a task for the build VM diff --git a/testbot/ddl/update35.sql b/testbot/ddl/update35.sql new file mode 100644 index 000000000..3ca3023f3 --- /dev/null +++ b/testbot/ddl/update35.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileName VARCHAR(100) NULL, + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9ec428c04..9a28385a9 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -132,8 +132,8 @@ CREATE TABLE Steps PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, - FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileName VARCHAR(100) NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 977419474..aea1aee04 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -89,6 +89,7 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); + $self->FileType("none"); $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -117,6 +118,10 @@ sub Validate($) { return ("PreviousNo", "The previous step number must be less than this one's."); } + if (defined $self->FileName and $self->FileType eq "none") + { + return ("FileType", "A file has been specified but no FileType"); + } return $self->SUPER::Validate(); } @@ -146,6 +151,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -256,8 +263,8 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index b9f70d768..84c5a005f 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -44,6 +44,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -189,7 +191,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6bf4a12e8..3e638f717 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -486,7 +486,7 @@ sub GenerateDataCell($$$$$) elsif ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); - if (-r $FileName) + if ($FileName and -r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo); -- 2.17.0

June 5, 2018

[PATCH] testbot: Log errors that happen when updating a Job's status.

by Francois Gouget

Such errors are important as they can prevent the Jobs from ever being marked as completed. So trace them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This helps diagnose issues where the database schema and the TestBot's ORM database model are out of sync. testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b1ffd3e48..13a389586 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -243,7 +243,12 @@ sub UpdateStatus($) { $self->Ended(time); } - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if (defined $ErrMessage) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not update job status: $ErrMessage\n"); + } last; } } -- 2.17.0

June 5, 2018

[PATCH] testbot: Add proper command line options to CheckForWinetestUpdate.pl.

by Francois Gouget

The options make it possible to test a specific job/task creation without having to way for a new WineTest binary download each time. Also it is now possible to specify the exact task type to create and if none is given the script will now handle all of them. This way the crontab commands don't need to be updated when new task types are added. Also the script now prints the error messages to stderr by default to make it easier to figure things out when running it on the command line. The --log-only option can be used when that's not desired. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the crontab entries. Typically they can both be replaced with a single command that will create all the relevant jobs: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only testbot/bin/CheckForWinetestUpdate.pl | 273 +++++++++++++++++++------- testbot/doc/INSTALL.txt | 3 +- 2 files changed, 199 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 20eacec63..a79f60c71 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,6 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp +# Copyright 2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Basename; use File::Compare; @@ -60,11 +63,112 @@ my %WineTestUrls = ( 64 => "http://test.winehq.org/builds/winetest64-latest.exe" ); +my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1); + + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +=pod +=over 12 + +=item C<UpdateWineTest()> + +Downloads the latest WineTest executable. + +Returns 1 if the executable was updated, 0 if it was not, and -1 if an +error occurred. + +=back +=cut + +sub UpdateWineTest($$) +{ + my ($OptCreate, $Bits) = @_; + + my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + if ($OptCreate) + { + return (1, $LatestBaseName) if (-r $LatestFileName); + Debug("$LatestBaseName is missing\n"); + } + + # See if the online WineTest executable is newer + my $UA = LWP::UserAgent->new(); + $UA->agent("WineTestBot"); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + if (-r $LatestFileName) + { + my $Since = gmtime((stat $LatestFileName)[9]); + $Request->header("If-Modified-Since" => "$Since GMT"); + } + Debug("Checking $WineTestUrls{$Bits}\n"); + my $Response = $UA->request($Request); + if ($Response->code == RC_NOT_MODIFIED) + { + Debug("$LatestBaseName is already up to date\n"); + return (0, $LatestBaseName); # Already up to date + } + if ($Response->code != RC_OK) + { + Error "Unexpected HTTP response code ", $Response->code, "\n"; + return (-1, undef); + } + + # Download the WineTest executable + Debug("Downloading $LatestBaseName\n"); + umask 002; + mkdir "$DataDir/staging"; + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) + { + Error "Could not create staging file: $!\n"; + return (-1, undef); + } + print $fh $Response->decoded_content(); + close($fh); + + if (-r $LatestFileName and compare($StagingFileName, $LatestFileName) == 0) + { + Debug("$LatestBaseName did not change\n"); + unlink($StagingFileName); + return (0, $LatestBaseName); # No change after all + } + + # Save the WineTest executable to the latest directory for the next round + mkdir "$DataDir/latest"; + if (!move($StagingFileName, $LatestFileName)) + { + Error "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + return (-1, undef); + } + utime time, $Response->last_modified, $LatestFileName; + + return (1, $LatestBaseName); +} sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + $Remarks = "WineTest: $Remarks VMs"; + Debug("Creating the '$Remarks' job\n"); + my $VMs = CreateVMs(); if ($Bits == 64) { @@ -84,6 +188,7 @@ sub AddJob($$$) if ($VMs->GetItemsCount() == 0) { # There is nothing to do + Debug(" Found no VM\n"); return 1; } @@ -97,9 +202,7 @@ sub AddJob($$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); - $NewJob->Remarks("WineTest: " . - ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . - " VMs"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -114,6 +217,7 @@ sub AddJob($$$) my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { + Debug(" $VMKey\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -123,7 +227,7 @@ sub AddJob($$$) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save job: $ErrMessage\n"; + Error "Failed to save job: $ErrMessage\n"; unlink($StagingFileName); return 0; } @@ -133,12 +237,15 @@ sub AddJob($$$) sub AddReconfigJob() { + my $Remarks = "Update Wine to latest git"; + Debug("Creating the '$Remarks' job\n"); + # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3); - $NewJob->Remarks("Update Wine to latest git"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -153,6 +260,7 @@ sub AddReconfigJob() $VMs->AddFilter("Type", ["build"]); $VMs->AddFilter("Role", ["base"]); my $BuildVM = ${$VMs->GetItems()}[0]; + Debug(" ", $BuildVM->GetKey(), "\n"); my $Task = $NewStep->Tasks->Add(); $Task->VM($BuildVM); $Task->Timeout($ReconfigTimeout); @@ -161,97 +269,112 @@ sub AddReconfigJob() my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save reconfig job: $ErrMessage\n"; + Error "Failed to save reconfig job: $ErrMessage\n"; return 0; } } -my $Bits = $ARGV[0]; -if (!$Bits) -{ - die "Usage: CheckForWinetestUpdate.pl <bits>"; -} -if ($Bits =~ m/^(32|64)$/) + +# +# Command line processing +# + +my ($OptCreate, %OptTypes, $Usage); +while (@ARGV) { - $Bits = $1; + my $Arg = shift @ARGV; + if ($Arg eq "--create") + { + $OptCreate = 1; + } + elsif ($TaskTypes{$Arg}) + { + $OptTypes{$Arg} = 1; + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } } -else + +# Check parameters +if (!defined $Usage) { - die "Invalid number of bits $Bits"; + map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); } -my $BitsSuffix = ($Bits == 64 ? "64" : ""); - -# Download the winetest executable if new -my $UA = LWP::UserAgent->new(); -$UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); -my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; -my $LatestFileName = "$DataDir/latest/$LatestBaseName"; -if (-r $LatestFileName) +if (defined $Usage) { - my $Since = gmtime((stat $LatestFileName)[9]); - $Request->header("If-Modified-Since" => "$Since GMT"); + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "\n"; + print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + exit $Usage; } -my $Response = $UA->request($Request); -if ($Response->code != RC_OK) + + +# +# Create the 32 bit tasks +# + +my $Rc = 0; +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32}) { - if ($Response->code != RC_NOT_MODIFIED) + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + if ($Create < 0) { - LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; - exit 1; + $Rc = 1; + } + elsif ($Create == 1) + { + # A new executable means there have been commits so update Wine. Create + # this job first purely to make the WineTestBot job queue look nice, and + # arbitrarily do it only for 32-bit executables to avoid redundant updates. + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob()); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); } - exit 0; } -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# verify that it truly is new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -umask 002; -mkdir "$DataDir/staging"; -my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); -if (!$fh) -{ - LogMsg "Could not create staging file: $!\n"; - exit 1; -} -print $fh $Response->decoded_content(); -close($fh); -my $NewFile = 1; -if (-r $LatestFileName) -{ - $NewFile = compare($StagingFileName, $LatestFileName) != 0; -} -if (!$NewFile) -{ - # Nothing to do - unlink($StagingFileName); - exit 0; -} +# +# Create the 64 bit tasks +# -# Save the WineTest executable in the latest directory for the next round -mkdir "$DataDir/latest"; -if (!move($StagingFileName, $LatestFileName)) +if ($OptTypes{all64}) { - LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; - unlink($StagingFileName); - exit 1; + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + if ($Create < 0) + { + $Rc = 1; + } + elsif ($Create == 1) + { + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + } } -utime time, $Response->last_modified, $LatestFileName; - -# A new executable means there have been commits so update Wine. Create this -# job first purely to make the WineTestBot job queue look nice, and arbitrarily -# do it only for 32-bit executables to avoid redundant updates. -my $rc = 0; -$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - -$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); -$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit $rc; +exit $Rc; diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 8827c227d..cb7c31b97 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -86,8 +86,7 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. -- 2.17.0

June 5, 2018

[PATCH v2 2/2] wbemdisp/tests: Add ISWbemSecurity tests

by Hans Leidekker

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Add more tests for default settings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/tests/wbemdisp.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91edb4..1ce045697a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum imp_level; + WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,34 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); + + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + todo_wine { + ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); + } + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); + ok( hr == S_OK, "got %x\n", hr ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +349,18 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 2.11.0

June 5, 2018

[PATCH v2 1/2] wbemdisp: Add ISWbemSecurity stub interface.

by Hans Leidekker

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f523..cdc0ab4479 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.11.0

June 5, 2018

Re: [PATCH 3/3] msi/tests: Test deferral of WriteRegistryValues.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 5, 2018

Re: [PATCH 2/3] msi/tests: Simplify and clarify WriteRegistryValues and RemoveRegistryValues tests.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 5, 2018

Re: [PATCH 1/3] msi: Only delete empty registry keys in delete_key().

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 5, 2018

Re: [PATCH v2 2/2] widl: Generate correct size and alignment for all types.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 5, 2018

Re: [PATCH v2 1/2] stdole2.idl: Use more accurate sizes for Automation types.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 5, 2018

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.

by Zhiyi Zhang

On Tue 6 5 14:39, Hua Meng wrote: > Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> > --- > dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 117 insertions(+), 3 deletions(-) > mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c Hi, I don't think you need to change the file permission from 644 to 755. And there are some style inconsistencies. Thanks, Zhiyi Zhang > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > old mode 100644 > new mode 100755 > index dfd2d06..84e20bd > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -35,6 +35,7 @@ struct expect_struct { > DEFINE_EXPECT(queue_char__Move_item); > DEFINE_EXPECT(queue_char__Copy_item); > DEFINE_EXPECT(queue_char__Assign_and_destroy_item); > + DEFINE_EXPECT(concurrent_vector_int_alloc); > }; > > #define SET_EXPECT(func) \ > @@ -105,6 +106,8 @@ struct thiscall_thunk > > static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); > static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); > +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, > + const void *b ); > > static void init_thiscall_thunk(void) > { > @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) > thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ > call_thiscall_func1 = (void *)thunk; > call_thiscall_func2 = (void *)thunk; > + call_thiscall_func3 = (void *)thunk; > } > > #define call_func1(func,_this) call_thiscall_func1(func,_this) > #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) > - > +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ > + (const void*)(b)) > #else > > #define init_thiscall_thunk() > #define call_func1(func,_this) func(_this) > #define call_func2(func,_this,a) func(_this,a) > - > +#define call_func3(func,_this,a,b) func(_this,a,b) > #endif /* __i386__ */ > > static inline float __port_infinity(void) > @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo > static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); > static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); > > +typedef struct vector_base_v4 > +{ > + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); > + void *storage[3]; > + size_t first_block; > + size_t early_size; > + void **segment; > +} vector_base_v4; > + > +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); > +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); > +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); > + > static HMODULE msvcp; > #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) > #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) > @@ -493,7 +511,13 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAA_NPEAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAAXXZ"); > - } else { > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBA_KXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z"); > +} else { > SET(p_tr2_sys__File_size, > "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); > SET(p_tr2_sys__File_size_wchar, > @@ -596,6 +620,12 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAE_NPAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z"); > #else > SET(p__Thrd_current, > "_Thrd_current"); > @@ -627,6 +657,12 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAA_NPAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAAXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAA(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIAAI(a)Z"); > #endif > } > SET(p__Thrd_equal, > @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) > return 0; > } > > +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) > +{ > + CHECK_EXPECT(concurrent_vector_int_alloc); > + return malloc(n*sizeof(int)); > +} > + > +static void concurrent_vector_int_ctor(vector_base_v4 *this) > +{ > + memset(this, 0, sizeof(*this)); > + this->allocator = concurrent_vector_int_alloc; > + this->segment = &this->storage[0]; > +} > + > +static void test_vector_base_v4(void) > +{ > + vector_base_v4 vector; > + size_t idx; > + size_t size; > + int *data; > + > + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ > + concurrent_vector_int_ctor(&vector); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + if(!data){ > + skip("_Internal_capacity not yet implemented\n"); > + return; > + } > + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); > + *data = 1; > + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); > + *data = 2; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); > + *data = 3; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); > + > + call_func1(p_vector_base_v4_dtor, &vector); > +} > static void test_queue_base_v4(void) > { > queue_base_v4 queue; > @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) > > test_vector_base_v4__Segment_index_of(); > test_queue_base_v4(); > + test_vector_base_v4(); > > test_vbtable_size_exports(); > >

June 5, 2018

Re: [PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38963 Your paranoid android. === wxppro (32 bit access) === 0b40:access: unhandled exception c0000005 at 004025C6 === w2003std (32 bit access) === 06ac:access: unhandled exception c0000005 at 004025C6 === wvistau64 (32 bit access) === 073c:access: unhandled exception c0000005 at 004025C6 === wvistau64_zh_CN (32 bit access) === 0bbc:access: unhandled exception c0000005 at 004025C6 === wvistau64_fr (32 bit access) === 06a8:access: unhandled exception c0000005 at 004025C6 === wvistau64_he (32 bit access) === 0be8:access: unhandled exception c0000005 at 004025C6 === w2008s64 (32 bit access) === 086c:access: unhandled exception c0000005 at 004025C6 === w7u (32 bit access) === 0130:access: unhandled exception c0000005 at 004025C6 === w7pro64 (32 bit access) === 0adc:access: unhandled exception c0000005 at 004025C6 === w8 (32 bit access) === 0d30:access: unhandled exception c0000005 at 004025C6 === w864 (32 bit access) === 0154:access: unhandled exception c0000005 at 004025C6 === w1064 (32 bit access) === 0eb8:access: unhandled exception c0000005 at 004025C6 === wvistau64 (64 bit access) === 073c:access: unhandled exception c0000005 at 00000000004022FB === w2008s64 (64 bit access) === 086c:access: unhandled exception c0000005 at 00000000004022FB === w7pro64 (64 bit access) === 0a9c:access: unhandled exception c0000005 at 00000000004022FB The previous 1 run(s) terminated abnormally === w864 (64 bit access) === 0ad8:access: unhandled exception c0000005 at 00000000004022FB === w1064 (64 bit access) === 0e04:access: unhandled exception c0000005 at 00000000004022FB

June 5, 2018

Re: netapi32/tests: Fix a memory leak

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38962 Your paranoid android. === build (build) === Patch failed to apply

June 5, 2018

Re: netapi32: NetUserGetInfo should return Admin priviledge - wine users run as Administrators

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38961 Your paranoid android. === wxppro (32 bit access) === 0b40:access: unhandled exception c0000005 at 004025C6 === w2003std (32 bit access) === 06ac:access: unhandled exception c0000005 at 004025C6 === wvistau64 (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_zh_CN (32 bit access) === 0bbc:access: unhandled exception c0000005 at 004025C6 === wvistau64_fr (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_he (32 bit access) === 0bd8:access: unhandled exception c0000005 at 004025C6 === w2008s64 (32 bit access) === 086c:access: unhandled exception c0000005 at 004025C6 === w7u (32 bit access) === 0e48:access: unhandled exception c0000005 at 004025C6 === w7pro64 (32 bit access) === 0be0:access: unhandled exception c0000005 at 004025C6 === w8 (32 bit access) === 0d48:access: unhandled exception c0000005 at 004025C6 === w864 (32 bit access) === 0ad8:access: unhandled exception c0000005 at 004025C6 === w1064 (32 bit access) === 0784:access: unhandled exception c0000005 at 004025C6 === wvistau64 (64 bit access) === 073c:access: unhandled exception c0000005 at 00000000004022FB === w2008s64 (64 bit access) === 086c:access: unhandled exception c0000005 at 00000000004022FB === w7pro64 (64 bit access) === 0ab4:access: unhandled exception c0000005 at 00000000004022FB The previous 1 run(s) terminated abnormally === w864 (64 bit access) === 0264:access: unhandled exception c0000005 at 00000000004022FB === w1064 (64 bit access) === 0138:access: unhandled exception c0000005 at 00000000004022FB

June 5, 2018

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38960 Your paranoid android. === wvistau64_zh_CN (32 bit msvcp120) === msvcp120.c:846: Test failed: cvtvec.isleadbyte[16] = fe msvcp120.c:846: Test failed: cvtvec.isleadbyte[17] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[18] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[19] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[20] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[21] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[22] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[23] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[24] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[25] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[26] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[27] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[28] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[29] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[30] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[31] = 7f

June 5, 2018

[PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.

by Hua Meng

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c old mode 100644 new mode 100755 index dfd2d06..84e20bd --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -35,6 +35,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Move_item); DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item); + DEFINE_EXPECT(concurrent_vector_int_alloc); }; #define SET_EXPECT(func) \ @@ -105,6 +106,8 @@ struct thiscall_thunk static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, + const void *b ); static void init_thiscall_thunk(void) { @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; + call_thiscall_func3 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) - +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ + (const void*)(b)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) - +#define call_func3(func,_this,a,b) func(_this,a,b) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); +typedef struct vector_base_v4 +{ + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); + void *storage[3]; + size_t first_block; + size_t early_size; + void **segment; +} vector_base_v4; + +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -493,7 +511,13 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAA_NPEAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAAXXZ"); - } else { + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBA_KXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z"); +} else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); SET(p_tr2_sys__File_size_wchar, @@ -596,6 +620,12 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAE_NPAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -627,6 +657,12 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAA_NPAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAAXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAA(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIAAI(a)Z"); #endif } SET(p__Thrd_equal, @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) return 0; } +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) +{ + CHECK_EXPECT(concurrent_vector_int_alloc); + return malloc(n*sizeof(int)); +} + +static void concurrent_vector_int_ctor(vector_base_v4 *this) +{ + memset(this, 0, sizeof(*this)); + this->allocator = concurrent_vector_int_alloc; + this->segment = &this->storage[0]; +} + +static void test_vector_base_v4(void) +{ + vector_base_v4 vector; + size_t idx; + size_t size; + int *data; + + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ + concurrent_vector_int_ctor(&vector); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + if(!data){ + skip("_Internal_capacity not yet implemented\n"); + return; + } + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); + *data = 1; + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); + *data = 2; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); + *data = 3; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); + + call_func1(p_vector_base_v4_dtor, &vector); +} static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) test_vector_base_v4__Segment_index_of(); test_queue_base_v4(); + test_vector_base_v4(); test_vbtable_size_exports(); -- 2.11.0

June 5, 2018

[PATCH 2/2] wbemdisp/tests: Add ISWbemSecurity tests

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/tests/wbemdisp.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91e..b8cd5c8 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum level; + WbemAuthenticationLevelEnum authenication; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,21 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelImpersonate ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelPktPrivacy ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +336,16 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 1.9.1

June 5, 2018

[PATCH 1/2] wbemdisp: Add ISWbemSecurity stub interface.

by Alistair Leslie-Hughes

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f..cdc0ab4 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 1.9.1

June 5, 2018

[PATCH v2 2/2] widl: Generate correct size and alignment for all types.

by Zebediah Figura

Using type_memsize_and_alignment() directly instead of reimplementing it. Also fix the generated tests in oleaut32 to reflect correct sizes for 64-bit typelibs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 107 ++++++++++++++++++++++++++---------------- tools/widl/typegen.c | 5 +- tools/widl/typegen.h | 1 + tools/widl/write_msft.c | 95 ++++++++----------------------------- 4 files changed, 89 insertions(+), 119 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f4ad8f9..4d5314e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3951,8 +3951,46 @@ static char *print_size(BSTR name, TYPEATTR *attr) sprintf(buf, "sizeof(union %s)", dump_string(name)); break; - case TKIND_ENUM: case TKIND_ALIAS: + sprintf(buf, "sizeof(%s)", dump_string(name)); + break; + + case TKIND_ENUM: + sprintf(buf, "4"); + break; + + default: + assert(0); + return NULL; + } + + return buf; +} + +static char *print_align(BSTR name, TYPEATTR *attr) +{ + static char buf[256]; + + switch (attr->typekind) + { + case TKIND_DISPATCH: + case TKIND_INTERFACE: + sprintf(buf, "TYPE_ALIGNMENT(%s*)", dump_string(name)); + break; + + case TKIND_RECORD: + sprintf(buf, "TYPE_ALIGNMENT(struct %s)", dump_string(name)); + break; + + case TKIND_UNION: + sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name)); + break; + + case TKIND_ALIAS: + sprintf(buf, "TYPE_ALIGNMENT(%s)", dump_string(name)); + break; + + case TKIND_ENUM: sprintf(buf, "4"); break; @@ -4072,10 +4110,10 @@ static void test_dump_typelib(const char *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); - printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n" + printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), - attr->cbAlignment, print_size(name, attr), + print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs); @@ -4175,13 +4213,13 @@ static const type_info info[] = { { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4203,7 +4241,7 @@ static const type_info info[] = { { "parent_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4225,7 +4263,7 @@ static const type_info info[] = { { "child_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, { { @@ -4245,43 +4283,43 @@ static const type_info info[] = { { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { "n", "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "nn", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "m", "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { "mm", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", - /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4, /*size*/ sizeof(IDualIface*), + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, { { @@ -4423,7 +4461,7 @@ static const type_info info[] = { { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ISimpleIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, { { @@ -4443,25 +4481,25 @@ static const type_info info[] = { { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "t_INT", "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "a", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4491,7 +4529,7 @@ static const type_info info[] = { { "c", "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4509,7 +4547,7 @@ static const type_info info[] = { { "d", "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4527,43 +4565,43 @@ static const type_info info[] = { { "e", "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "_e", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct _e), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct ee), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "f", "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "_f", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union _f), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union ff), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, { { @@ -4686,21 +4724,8 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); expect_int(typeattr->typekind, ti->type); expect_hex(typeattr->wTypeFlags, ti->wTypeFlags); - /* FIXME: remove once widl is fixed */ - if (typeattr->typekind == TKIND_ALIAS && typeattr->cbAlignment != ti->cbAlignment) - { -todo_wine /* widl generates broken typelib and typeattr just reflects that */ - ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1), - "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment); -todo_wine /* widl generates broken typelib and typeattr just reflects that */ - ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0), - "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance); - } - else - { expect_int(typeattr->cbAlignment, ti->cbAlignment); expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance); - } expect_int(help_ctx, ti->help_ctx); expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version); expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9f62589..38cbfa0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -84,7 +84,6 @@ static const unsigned short IsSimpleRef = 0x0100; static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); -static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align); static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, unsigned int *typestring_offset); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); @@ -1841,7 +1840,7 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) return maxs; } -static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) +unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) { unsigned int size = 0; @@ -1910,6 +1909,7 @@ static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *al size = union_memsize(type_union_get_cases(t), align); break; case TYPE_POINTER: + case TYPE_INTERFACE: assert( pointer_size ); size = pointer_size; if (size > *align) *align = size; @@ -1933,7 +1933,6 @@ static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *al if (size > *align) *align = size; } break; - case TYPE_INTERFACE: case TYPE_ALIAS: case TYPE_VOID: case TYPE_COCLASS: diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index b6540e2..95ad601 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -100,3 +100,4 @@ unsigned char get_basic_fc(const type_t *type); unsigned char get_pointer_fc(const type_t *type, const attr_list_t *attrs, int toplevel_param); unsigned char get_struct_fc(const type_t *type); enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *attrs, unsigned int flags); +unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f7e53e4..b1f467d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -52,6 +52,7 @@ #include "hash.h" #include "typetree.h" #include "parser.h" +#include "typegen.h" enum MSFT_segment_index { MSFT_SEG_TYPEINFO = 0, /* type information */ @@ -780,8 +781,6 @@ static int encode_type( int vt, /* [I] vt to encode */ type_t *type, /* [I] type */ int *encoded_type, /* [O] The encoded type description. */ - int *width, /* [O] The width of the type, or NULL. */ - int *alignment, /* [O] The alignment of the type, or NULL. */ int *decoded_size) /* [O] The total size of the unencoded TYPEDESCs, including nested descs. */ { int default_type; @@ -794,8 +793,6 @@ static int encode_type( chat("encode_type vt %d type %p\n", vt, type); default_type = 0x80000000 | (vt << 16) | vt; - if (!width) width = &scratch; - if (!alignment) alignment = &scratch; if (!decoded_size) decoded_size = &scratch; *decoded_size = 0; @@ -804,38 +801,20 @@ static int encode_type( case VT_I1: case VT_UI1: *encoded_type = default_type; - *width = 1; - *alignment = 1; break; case VT_INT: *encoded_type = 0x80000000 | (VT_I4 << 16) | VT_INT; - if ((typelib->typelib_header.varflags & 0x0f) == SYS_WIN16) { - *width = 2; - *alignment = 2; - } else { - *width = 4; - *alignment = 4; - } break; case VT_UINT: *encoded_type = 0x80000000 | (VT_UI4 << 16) | VT_UINT; - if ((typelib->typelib_header.varflags & 0x0f) == SYS_WIN16) { - *width = 2; - *alignment = 2; - } else { - *width = 4; - *alignment = 4; - } break; case VT_UI2: case VT_I2: case VT_BOOL: *encoded_type = default_type; - *width = 2; - *alignment = 2; break; case VT_I4: @@ -844,56 +823,40 @@ static int encode_type( case VT_ERROR: case VT_HRESULT: *encoded_type = default_type; - *width = 4; - *alignment = 4; break; case VT_R8: case VT_I8: case VT_UI8: *encoded_type = default_type; - *width = 8; - *alignment = 8; break; case VT_CY: case VT_DATE: *encoded_type = default_type; - *width = 8; - *alignment = 8; break; case VT_DECIMAL: *encoded_type = default_type; - *width = 16; - *alignment = 8; break; case VT_VOID: *encoded_type = 0x80000000 | (VT_EMPTY << 16) | vt; - *width = 0; - *alignment = 1; break; case VT_UNKNOWN: case VT_DISPATCH: case VT_BSTR: *encoded_type = default_type; - *width = pointer_size; - *alignment = 4; break; case VT_VARIANT: *encoded_type = default_type; - *width = 8 + 2 * pointer_size; - *alignment = 8; break; case VT_LPSTR: case VT_LPWSTR: *encoded_type = 0xfffe0000 | vt; - *width = pointer_size; - *alignment = 4; break; case VT_PTR: @@ -909,14 +872,12 @@ static int encode_type( next_vt = VT_VOID; encode_type(typelib, next_vt, type_pointer_get_ref(type), - &target_type, NULL, NULL, &child_size); + &target_type, &child_size); /* these types already have an implicit pointer, so we don't need to * add another */ if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; - *width = pointer_size; - *alignment = 4; *decoded_size = child_size; break; } @@ -945,8 +906,6 @@ static int encode_type( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } @@ -956,7 +915,8 @@ static int encode_type( type_t *element_type = type_alias_get_aliasee(type_array_get_element(type)); int next_vt = get_type_vt(element_type); - encode_type(typelib, next_vt, type_alias_get_aliasee(type_array_get_element(type)), &target_type, NULL, NULL, &child_size); + encode_type(typelib, next_vt, type_alias_get_aliasee(type_array_get_element(type)), + &target_type, &child_size); for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; @@ -982,8 +942,6 @@ static int encode_type( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } @@ -1053,16 +1011,12 @@ static int encode_type( } *encoded_type = typeoffset; - *width = 0; - *alignment = 1; break; } default: error("encode_type: unrecognized type %d.\n", vt); *encoded_type = default_type; - *width = 0; - *alignment = 1; break; } @@ -1079,8 +1033,6 @@ static int encode_var( type_t *type, /* [I] The type description to encode. */ var_t *var, /* [I] The var to encode. */ int *encoded_type, /* [O] The encoded type description. */ - int *width, /* [O] The width of the type, or NULL. */ - int *alignment, /* [O] The alignment of the type, or NULL. */ int *decoded_size) /* [O] The total size of the unencoded TYPEDESCs, including nested descs. */ { int typeoffset; @@ -1090,8 +1042,6 @@ static int encode_var( int vt; int scratch; - if (!width) width = &scratch; - if (!alignment) alignment = &scratch; if (!decoded_size) decoded_size = &scratch; *decoded_size = 0; @@ -1110,7 +1060,7 @@ static int encode_var( ++num_dims; chat("array with %d dimensions\n", num_dims); - encode_var(typelib, atype, var, &target_type, width, alignment, NULL); + encode_var(typelib, atype, var, &target_type, NULL); arrayoffset = ctl2_alloc_segment(typelib, MSFT_SEG_ARRAYDESC, (2 + 2 * num_dims) * sizeof(int), 0); arraydata = (void *)&typelib->typelib_segment_data[MSFT_SEG_ARRAYDESC][arrayoffset]; @@ -1136,7 +1086,6 @@ static int encode_var( typedata[1] = arrayoffset; *encoded_type = typeoffset; - *width = *width * elements; *decoded_size = 20 /*sizeof(ARRAYDESC)*/ + (num_dims - 1) * 8 /*sizeof(SAFEARRAYBOUND)*/; return 0; } @@ -1145,15 +1094,12 @@ static int encode_var( if (vt == VT_PTR) { type_t *ref = is_ptr(type) ? type_pointer_get_ref(type) : type_array_get_element(type); - int skip_ptr = encode_var(typelib, ref, var, - &target_type, NULL, NULL, &child_size); + int skip_ptr = encode_var(typelib, ref, var, &target_type, &child_size); if(skip_ptr == 2) { chat("encode_var: skipping ptr\n"); *encoded_type = target_type; *decoded_size = child_size; - *width = pointer_size; - *alignment = 4; return 0; } @@ -1184,15 +1130,13 @@ static int encode_var( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; return 0; } dump_type(type); - encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); + encode_type(typelib, vt, type, encoded_type, decoded_size); /* these types already have an implicit pointer, so we don't need to * add another */ if(vt == VT_DISPATCH || vt == VT_UNKNOWN) return 2; @@ -1504,7 +1448,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) /* fill out the basic type information */ typedata[0] = typedata_size | (index << 16); - encode_var(typeinfo->typelib, type_function_get_rettype(func->type), func, &typedata[1], NULL, NULL, &decoded_size); + encode_var(typeinfo->typelib, type_function_get_rettype(func->type), func, + &typedata[1], &decoded_size); typedata[2] = funcflags; typedata[3] = ((52 /*sizeof(FUNCDESC)*/ + decoded_size) << 16) | typeinfo->typeinfo->cbSizeVft; typedata[4] = (next_idx << 16) | (callconv << 8) | (invokekind << 3) | funckind; @@ -1541,7 +1486,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) if(defaultdata) *defaultdata = -1; - encode_var(typeinfo->typelib, arg->type, arg, paramdata, NULL, NULL, &decoded_size); + encode_var(typeinfo->typelib, arg->type, arg, paramdata, &decoded_size); if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { switch(attr->type) { case ATTR_DEFAULTVALUE: @@ -1667,8 +1612,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) int offset, id; unsigned int typedata_size; INT *typedata; - int var_datawidth; - int var_alignment; + unsigned int var_datawidth, var_alignment = 0; int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; @@ -1770,8 +1714,8 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typeinfo->var_offsets[var_num] = offset; /* figure out type widths and whatnot */ - encode_var(typeinfo->typelib, var->type, var, &typedata[1], &var_datawidth, - &var_alignment, &var_type_size); + var_datawidth = type_memsize_and_alignment(var->type, &var_alignment); + encode_var(typeinfo->typelib, var->type, var, &typedata[1], &var_type_size); /* pad out starting position to data width */ typeinfo->datawidth += var_alignment - 1; @@ -1795,7 +1739,6 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ typeinfo->datawidth = pointer_size; - var_alignment = 4; break; default: error("add_var_desc: unhandled type kind %d\n", typeinfo->typekind); @@ -2073,7 +2016,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte dispinterface->attrs); msft_typeinfo->typeinfo->size = pointer_size; - msft_typeinfo->typeinfo->typekind |= 0x2100; + msft_typeinfo->typeinfo->typekind |= pointer_size << 11 | pointer_size << 6; msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ add_dispatch(typelib); @@ -2162,7 +2105,8 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); msft_typeinfo->typeinfo->size = pointer_size; - msft_typeinfo->typeinfo->typekind |= 0x2200; + msft_typeinfo->typeinfo->typekind |= 0x0200; + msft_typeinfo->typeinfo->typekind |= pointer_size << 11; for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) if (derived->name && !strcmp(derived->name, "IDispatch")) @@ -2247,7 +2191,8 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; - int alignment, datatype1, datatype2, size, duplicate = 0; + int datatype1, datatype2, duplicate = 0; + unsigned int size, alignment = 0; type_t *type; if (-1 < tdef->typelib_idx) @@ -2263,8 +2208,8 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) else duplicate = 1; - encode_type(typelib, get_type_vt(type), type, - &datatype1, &size, &alignment, &datatype2); + encode_type(typelib, get_type_vt(type), type, &datatype1, &datatype2); + size = type_memsize_and_alignment(type, &alignment); if (msft_typeinfo) { -- 2.7.4

June 4, 2018

[PATCH v2 1/2] stdole2.idl: Use more accurate sizes for Automation types.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/stdole2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 18c402a..d372384 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -32,15 +32,15 @@ ] library stdole { - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - + /* These typedefs need to have the same size as their real counterparts. */ typedef short VARIANT_BOOL; - typedef long BSTR; + typedef void *BSTR; typedef double CURRENCY; typedef unsigned long HRESULT; - typedef void *VARIANT; + typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; + } VARIANT; typedef unsigned long SCODE; typedef struct GUID { -- 2.7.4

June 4, 2018

Re: [PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Zebediah Figura

On 04/06/18 04:02, Huw Davies wrote: > On Sun, Jun 03, 2018 at 02:51:11PM -0500, Zebediah Figura wrote: >> On 03/06/18 13:58, Marvin wrote: >>> Hi, >>> >>> While running your changed tests on Windows, I think I found new failures. >>> Being a bot and all I'm not very good at pattern recognition, so I might be >>> wrong, but could you please double-check? >>> Full results can be found at >>> https://testbot.winehq.org/JobDetails.pl?Key=38913 >>> >>> Your paranoid android. >>> >>> >>> === wvistau64 (64 bit typelib) === >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 >>> >> These failures are shortcomings in widl exposed by these patches; they >> are fixed in patch 4/4. > > You'll probably have to merge some of the patches in this series > to avoid test failures at intermediate stages. > > Huw. > > Thanks; I'll resend it with the widl and oleaut32 patches merged.

June 4, 2018

[PATCH 2/2] d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[]

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The formatting of the array initialization was inconsistent. So I've made it consitent by placing the arrays and their size on one line. All lines are below < 120 chars in length. Initially I've tried to just stick to a line length of 100 or 120 but that made the data look ugly. To verify that the diff is a no-op I have added 77 empty lines as padding after the whole registerset_data array initialization. That produced the exact same object file as without this patch. dlls/d3dx9_36/tests/shader.c | 383 +++++++++++++++++-------------------------- 1 file changed, 153 insertions(+), 230 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c2b41cfdc7..1086e5e9d6 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5675,267 +5675,190 @@ static const struct registerset_data[] = { /* scalar */ - {"float", "f", 0, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_float, - sizeof(registerset_test_scalar_float) / sizeof(*registerset_test_scalar_float), - registerset_constants_scalar_float, - sizeof(registerset_constants_scalar_float) / sizeof(*registerset_constants_scalar_float)}, - {"int", "n", 0, D3DXRS_INT4, registerset_blob_scalar, registerset_test_scalar_int, - sizeof(registerset_test_scalar_int) / sizeof(*registerset_test_scalar_int), - registerset_constants_scalar_int, - sizeof(registerset_constants_scalar_int) / sizeof(*registerset_constants_scalar_int)}, - {"int float", "nf", 4, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_int_float, - sizeof(registerset_test_scalar_int_float) / sizeof(*registerset_test_scalar_int_float), - registerset_constants_scalar_int_float, - sizeof(registerset_constants_scalar_int_float) / sizeof(*registerset_constants_scalar_int_float)}, - {"bool float", "bf", 8, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_bool_float, - sizeof(registerset_test_scalar_bool_float) / sizeof(*registerset_test_scalar_bool_float), - registerset_constants_scalar_bool_float, - sizeof(registerset_constants_scalar_bool_float) / sizeof(*registerset_constants_scalar_bool_float)}, - {"bool", "b", 0, D3DXRS_BOOL, registerset_blob_scalar, registerset_test_scalar_bool, - sizeof(registerset_test_scalar_bool) / sizeof(*registerset_test_scalar_bool), - registerset_constants_scalar_bool, - sizeof(registerset_constants_scalar_bool) / sizeof(*registerset_constants_scalar_bool)}, + {"float", "f", 0, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_float, ARRAY_SIZE(registerset_test_scalar_float), + registerset_constants_scalar_float, ARRAY_SIZE(registerset_constants_scalar_float)}, + {"int", "n", 0, D3DXRS_INT4, registerset_blob_scalar, + registerset_test_scalar_int, ARRAY_SIZE(registerset_test_scalar_int), + registerset_constants_scalar_int, ARRAY_SIZE(registerset_constants_scalar_int)}, + {"int float", "nf", 4, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_int_float, ARRAY_SIZE(registerset_test_scalar_int_float), + registerset_constants_scalar_int_float, ARRAY_SIZE(registerset_constants_scalar_int_float)}, + {"bool float", "bf", 8, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_bool_float, ARRAY_SIZE(registerset_test_scalar_bool_float), + registerset_constants_scalar_bool_float, ARRAY_SIZE(registerset_constants_scalar_bool_float)}, + {"bool", "b", 0, D3DXRS_BOOL, registerset_blob_scalar, + registerset_test_scalar_bool, ARRAY_SIZE(registerset_test_scalar_bool), + registerset_constants_scalar_bool, ARRAY_SIZE(registerset_constants_scalar_bool)}, /* scalar array */ - {"float [2]", "af", 0, D3DXRS_FLOAT4, registerset_blob_scalar_array, registerset_test_scalar_array_float, - sizeof(registerset_test_scalar_array_float) / sizeof(*registerset_test_scalar_array_float), - registerset_constants_scalar_array_float, - sizeof(registerset_constants_scalar_array_float) / sizeof(*registerset_constants_scalar_array_float)}, - {"int [2]", "an", 0, D3DXRS_INT4, registerset_blob_scalar_array, registerset_test_scalar_array_int, - sizeof(registerset_test_scalar_array_int) / sizeof(*registerset_test_scalar_array_int), - registerset_constants_scalar_array_int, - sizeof(registerset_constants_scalar_array_int) / sizeof(*registerset_constants_scalar_array_int)}, - {"bool [2]", "ab", 0, D3DXRS_BOOL, registerset_blob_scalar_array, registerset_test_scalar_array_bool, - sizeof(registerset_test_scalar_array_bool) / sizeof(*registerset_test_scalar_array_bool), - registerset_constants_scalar_array_bool, - sizeof(registerset_constants_scalar_array_bool) / sizeof(*registerset_constants_scalar_array_bool)}, + {"float [2]", "af", 0, D3DXRS_FLOAT4, registerset_blob_scalar_array, + registerset_test_scalar_array_float, ARRAY_SIZE(registerset_test_scalar_array_float), + registerset_constants_scalar_array_float, ARRAY_SIZE(registerset_constants_scalar_array_float)}, + {"int [2]", "an", 0, D3DXRS_INT4, registerset_blob_scalar_array, + registerset_test_scalar_array_int, ARRAY_SIZE(registerset_test_scalar_array_int), + registerset_constants_scalar_array_int, ARRAY_SIZE(registerset_constants_scalar_array_int)}, + {"bool [2]", "ab", 0, D3DXRS_BOOL, registerset_blob_scalar_array, + registerset_test_scalar_array_bool, ARRAY_SIZE(registerset_test_scalar_array_bool), + registerset_constants_scalar_array_bool, ARRAY_SIZE(registerset_constants_scalar_array_bool)}, {"int float [2]", "anf", 8, D3DXRS_FLOAT4, registerset_blob_scalar_array, - registerset_test_scalar_array_int_float, - sizeof(registerset_test_scalar_array_int_float) / sizeof(*registerset_test_scalar_array_int_float), - registerset_constants_scalar_array_int_float, - sizeof(registerset_constants_scalar_array_int_float) / sizeof(*registerset_constants_scalar_array_int_float)}, + registerset_test_scalar_array_int_float, ARRAY_SIZE(registerset_test_scalar_array_int_float), + registerset_constants_scalar_array_int_float, ARRAY_SIZE(registerset_constants_scalar_array_int_float)}, {"bool float [2]", "abf", 16, D3DXRS_FLOAT4, registerset_blob_scalar_array, - registerset_test_scalar_array_bool_float, - sizeof(registerset_test_scalar_array_bool_float) / sizeof(*registerset_test_scalar_array_bool_float), - registerset_constants_scalar_array_bool_float, - sizeof(registerset_constants_scalar_array_bool_float) / sizeof(*registerset_constants_scalar_array_bool_float)}, + registerset_test_scalar_array_bool_float, ARRAY_SIZE(registerset_test_scalar_array_bool_float), + registerset_constants_scalar_array_bool_float, ARRAY_SIZE(registerset_constants_scalar_array_bool_float)}, /* vector */ - {"float 3", "vf", 0, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_float, - sizeof(registerset_test_vector_float) / sizeof(*registerset_test_vector_float), - registerset_constants_vector_float, - sizeof(registerset_constants_vector_float) / sizeof(*registerset_constants_vector_float)}, - {"int 3", "vn", 0, D3DXRS_INT4, registerset_blob_vector, registerset_test_vector_int, - sizeof(registerset_test_vector_int) / sizeof(*registerset_test_vector_int), - registerset_constants_vector_int, - sizeof(registerset_constants_vector_int) / sizeof(*registerset_constants_vector_int)}, - {"bool 3", "vb", 0, D3DXRS_BOOL, registerset_blob_vector, registerset_test_vector_bool, - sizeof(registerset_test_vector_bool) / sizeof(*registerset_test_vector_bool), - registerset_constants_vector_bool, - sizeof(registerset_constants_vector_bool) / sizeof(*registerset_constants_vector_bool)}, - {"bool float 3", "vbf", 8, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_bool_float, - sizeof(registerset_test_vector_bool_float) / sizeof(*registerset_test_vector_bool_float), - registerset_constants_vector_bool_float, - sizeof(registerset_constants_vector_bool_float) / sizeof(*registerset_constants_vector_bool_float)}, - {"int float 3", "vnf", 4, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_int_float, - sizeof(registerset_test_vector_int_float) / sizeof(*registerset_test_vector_int_float), - registerset_constants_vector_int_float, - sizeof(registerset_constants_vector_int_float) / sizeof(*registerset_constants_vector_int_float)}, + {"float 3", "vf", 0, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_float, ARRAY_SIZE(registerset_test_vector_float), + registerset_constants_vector_float, ARRAY_SIZE(registerset_constants_vector_float)}, + {"int 3", "vn", 0, D3DXRS_INT4, registerset_blob_vector, + registerset_test_vector_int, ARRAY_SIZE(registerset_test_vector_int), + registerset_constants_vector_int, ARRAY_SIZE(registerset_constants_vector_int)}, + {"bool 3", "vb", 0, D3DXRS_BOOL, registerset_blob_vector, + registerset_test_vector_bool, ARRAY_SIZE(registerset_test_vector_bool), + registerset_constants_vector_bool, ARRAY_SIZE(registerset_constants_vector_bool)}, + {"bool float 3", "vbf", 8, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_bool_float, ARRAY_SIZE(registerset_test_vector_bool_float), + registerset_constants_vector_bool_float, ARRAY_SIZE(registerset_constants_vector_bool_float)}, + {"int float 3", "vnf", 4, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_int_float, ARRAY_SIZE(registerset_test_vector_int_float), + registerset_constants_vector_int_float, ARRAY_SIZE(registerset_constants_vector_int_float)}, /* vector array */ - {"float 3 [2]", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_vector_array, registerset_test_vector_array_float, - sizeof(registerset_test_vector_array_float) / sizeof(*registerset_test_vector_array_float), - registerset_constants_vector_array_float, - sizeof(registerset_constants_vector_array_float) / sizeof(*registerset_constants_vector_array_float)}, - {"int 3 [2]", "van", 0, D3DXRS_INT4, registerset_blob_vector_array, registerset_test_vector_array_int, - sizeof(registerset_test_vector_array_int) / sizeof(*registerset_test_vector_array_int), - registerset_constants_vector_array_int, - sizeof(registerset_constants_vector_array_int) / sizeof(*registerset_constants_vector_array_int)}, - {"bool 3 [2]", "vab", 0, D3DXRS_BOOL, registerset_blob_vector_array, registerset_test_vector_array_bool, - sizeof(registerset_test_vector_array_bool) / sizeof(*registerset_test_vector_array_bool), - registerset_constants_vector_array_bool, - sizeof(registerset_constants_vector_array_bool) / sizeof(*registerset_constants_vector_array_bool)}, + {"float 3 [2]", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_vector_array, + registerset_test_vector_array_float, ARRAY_SIZE(registerset_test_vector_array_float), + registerset_constants_vector_array_float, ARRAY_SIZE(registerset_constants_vector_array_float)}, + {"int 3 [2]", "van", 0, D3DXRS_INT4, registerset_blob_vector_array, + registerset_test_vector_array_int, ARRAY_SIZE(registerset_test_vector_array_int), + registerset_constants_vector_array_int, ARRAY_SIZE(registerset_constants_vector_array_int)}, + {"bool 3 [2]", "vab", 0, D3DXRS_BOOL, registerset_blob_vector_array, + registerset_test_vector_array_bool, ARRAY_SIZE(registerset_test_vector_array_bool), + registerset_constants_vector_array_bool, ARRAY_SIZE(registerset_constants_vector_array_bool)}, {"bool float 3 [2]", "vabf", 16, D3DXRS_FLOAT4, registerset_blob_vector_array, - registerset_test_vector_array_bool_float, - sizeof(registerset_test_vector_array_bool_float) / sizeof(*registerset_test_vector_array_bool_float), - registerset_constants_vector_array_bool_float, - sizeof(registerset_constants_vector_array_bool_float) / sizeof(*registerset_constants_vector_array_bool_float)}, + registerset_test_vector_array_bool_float, ARRAY_SIZE(registerset_test_vector_array_bool_float), + registerset_constants_vector_array_bool_float, ARRAY_SIZE(registerset_constants_vector_array_bool_float)}, {"int float 3 [2]", "vanf", 8, D3DXRS_FLOAT4, registerset_blob_vector_array, - registerset_test_vector_array_int_float, - sizeof(registerset_test_vector_array_int_float) / sizeof(*registerset_test_vector_array_int_float), - registerset_constants_vector_array_int_float, - sizeof(registerset_constants_vector_array_int_float) / sizeof(*registerset_constants_vector_array_int_float)}, + registerset_test_vector_array_int_float, ARRAY_SIZE(registerset_test_vector_array_int_float), + registerset_constants_vector_array_int_float, ARRAY_SIZE(registerset_constants_vector_array_int_float)}, /* matrix column */ - {"float c3x2", "cf", 0, D3DXRS_FLOAT4, registerset_blob_column, registerset_test_column_float, - sizeof(registerset_test_column_float) / sizeof(*registerset_test_column_float), - registerset_constants_column_float, - sizeof(registerset_constants_column_float) / sizeof(*registerset_constants_column_float)}, - {"int c3x2", "cn", 0, D3DXRS_INT4, registerset_blob_column, registerset_test_column_int, - sizeof(registerset_test_column_int) / sizeof(*registerset_test_column_int), - registerset_constants_column_int, - sizeof(registerset_constants_column_int) / sizeof(*registerset_constants_column_int)}, - {"bool c3x2", "cb", 0, D3DXRS_BOOL, registerset_blob_column, registerset_test_column_bool, - sizeof(registerset_test_column_bool) / sizeof(*registerset_test_column_bool), - registerset_constants_column_bool, - sizeof(registerset_constants_column_bool) / sizeof(*registerset_constants_column_bool)}, + {"float c3x2", "cf", 0, D3DXRS_FLOAT4, registerset_blob_column, + registerset_test_column_float, ARRAY_SIZE(registerset_test_column_float), + registerset_constants_column_float, ARRAY_SIZE(registerset_constants_column_float)}, + {"int c3x2", "cn", 0, D3DXRS_INT4, registerset_blob_column, + registerset_test_column_int, ARRAY_SIZE(registerset_test_column_int), + registerset_constants_column_int, ARRAY_SIZE(registerset_constants_column_int)}, + {"bool c3x2", "cb", 0, D3DXRS_BOOL, registerset_blob_column, + registerset_test_column_bool, ARRAY_SIZE(registerset_test_column_bool), + registerset_constants_column_bool, ARRAY_SIZE(registerset_constants_column_bool)}, {"bool float c3x2", "cbf", 8, D3DXRS_FLOAT4, registerset_blob_column, - registerset_test_column_bool_float, - sizeof(registerset_test_column_bool_float) / sizeof(*registerset_test_column_bool_float), - registerset_constants_column_bool_float, - sizeof(registerset_constants_column_bool_float) / sizeof(*registerset_constants_column_bool_float)}, + registerset_test_column_bool_float, ARRAY_SIZE(registerset_test_column_bool_float), + registerset_constants_column_bool_float, ARRAY_SIZE(registerset_constants_column_bool_float)}, {"int float c3x2", "cnf", 16, D3DXRS_FLOAT4, registerset_blob_column, - registerset_test_column_int_float, - sizeof(registerset_test_column_int_float) / sizeof(*registerset_test_column_int_float), - registerset_constants_column_int_float, - sizeof(registerset_constants_column_int_float) / sizeof(*registerset_constants_column_int_float)}, + registerset_test_column_int_float, ARRAY_SIZE(registerset_test_column_int_float), + registerset_constants_column_int_float, ARRAY_SIZE(registerset_constants_column_int_float)}, /* matrix column array */ - {"float c3x2 [2]", "caf", 0, D3DXRS_FLOAT4, registerset_blob_column_array, registerset_test_column_array_float, - sizeof(registerset_test_column_array_float) / sizeof(*registerset_test_column_array_float), - registerset_constants_column_array_float, - sizeof(registerset_constants_column_array_float) / sizeof(*registerset_constants_column_array_float)}, - {"int c3x2 [2]", "can", 0, D3DXRS_INT4, registerset_blob_column_array, registerset_test_column_array_int, - sizeof(registerset_test_column_array_int) / sizeof(*registerset_test_column_array_int), - registerset_constants_column_array_int, - sizeof(registerset_constants_column_array_int) / sizeof(*registerset_constants_column_array_int)}, - {"bool c3x2 [2]", "cab", 0, D3DXRS_BOOL, registerset_blob_column_array, registerset_test_column_array_bool, - sizeof(registerset_test_column_array_bool) / sizeof(*registerset_test_column_array_bool), - registerset_constants_column_array_bool, - sizeof(registerset_constants_column_array_bool) / sizeof(*registerset_constants_column_array_bool)}, + {"float c3x2 [2]", "caf", 0, D3DXRS_FLOAT4, registerset_blob_column_array, + registerset_test_column_array_float, ARRAY_SIZE(registerset_test_column_array_float), + registerset_constants_column_array_float, ARRAY_SIZE(registerset_constants_column_array_float)}, + {"int c3x2 [2]", "can", 0, D3DXRS_INT4, registerset_blob_column_array, + registerset_test_column_array_int, ARRAY_SIZE(registerset_test_column_array_int), + registerset_constants_column_array_int, ARRAY_SIZE(registerset_constants_column_array_int)}, + {"bool c3x2 [2]", "cab", 0, D3DXRS_BOOL, registerset_blob_column_array, + registerset_test_column_array_bool, ARRAY_SIZE(registerset_test_column_array_bool), + registerset_constants_column_array_bool, ARRAY_SIZE(registerset_constants_column_array_bool)}, {"bool float c3x2 [2]", "cabf", 16, D3DXRS_FLOAT4, registerset_blob_column_array, - registerset_test_column_array_bool_float, - sizeof(registerset_test_column_array_bool_float) / sizeof(*registerset_test_column_array_bool_float), - registerset_constants_column_array_bool_float, - sizeof(registerset_constants_column_array_bool_float) / sizeof(*registerset_constants_column_array_bool_float)}, + registerset_test_column_array_bool_float, ARRAY_SIZE(registerset_test_column_array_bool_float), + registerset_constants_column_array_bool_float, ARRAY_SIZE(registerset_constants_column_array_bool_float)}, {"int float c3x2 [2]", "canf", 32, D3DXRS_FLOAT4, registerset_blob_column_array, - registerset_test_column_array_int_float, - sizeof(registerset_test_column_array_int_float) / sizeof(*registerset_test_column_array_int_float), - registerset_constants_column_array_int_float, - sizeof(registerset_constants_column_array_int_float) / sizeof(*registerset_constants_column_array_int_float)}, + registerset_test_column_array_int_float, ARRAY_SIZE(registerset_test_column_array_int_float), + registerset_constants_column_array_int_float, ARRAY_SIZE(registerset_constants_column_array_int_float)}, /* matrix row */ - {"float r3x2", "rf", 0, D3DXRS_FLOAT4, registerset_blob_row, registerset_test_row_float, - sizeof(registerset_test_row_float) / sizeof(*registerset_test_row_float), - registerset_constants_row_float, - sizeof(registerset_constants_row_float) / sizeof(*registerset_constants_row_float)}, - {"int r3x2", "rn", 0, D3DXRS_INT4, registerset_blob_row, registerset_test_row_int, - sizeof(registerset_test_row_int) / sizeof(*registerset_test_row_int), - registerset_constants_row_int, - sizeof(registerset_constants_row_int) / sizeof(*registerset_constants_row_int)}, - {"bool r3x2", "rb", 0, D3DXRS_BOOL, registerset_blob_row, registerset_test_row_bool, - sizeof(registerset_test_row_bool) / sizeof(*registerset_test_row_bool), - registerset_constants_row_bool, - sizeof(registerset_constants_row_bool) / sizeof(*registerset_constants_row_bool)}, + {"float r3x2", "rf", 0, D3DXRS_FLOAT4, registerset_blob_row, + registerset_test_row_float, ARRAY_SIZE(registerset_test_row_float), + registerset_constants_row_float, ARRAY_SIZE(registerset_constants_row_float)}, + {"int r3x2", "rn", 0, D3DXRS_INT4, registerset_blob_row, + registerset_test_row_int, ARRAY_SIZE(registerset_test_row_int), + registerset_constants_row_int, ARRAY_SIZE(registerset_constants_row_int)}, + {"bool r3x2", "rb", 0, D3DXRS_BOOL, registerset_blob_row, + registerset_test_row_bool, ARRAY_SIZE(registerset_test_row_bool), + registerset_constants_row_bool, ARRAY_SIZE(registerset_constants_row_bool)}, {"bool float r3x2", "rbf", 12, D3DXRS_FLOAT4, registerset_blob_row, - registerset_test_row_bool_float, - sizeof(registerset_test_row_bool_float) / sizeof(*registerset_test_row_bool_float), - registerset_constants_row_bool_float, - sizeof(registerset_constants_row_bool_float) / sizeof(*registerset_constants_row_bool_float)}, + registerset_test_row_bool_float, ARRAY_SIZE(registerset_test_row_bool_float), + registerset_constants_row_bool_float, ARRAY_SIZE(registerset_constants_row_bool_float)}, {"int float r3x2", "rnf", 24, D3DXRS_FLOAT4, registerset_blob_row, - registerset_test_row_int_float, - sizeof(registerset_test_row_int_float) / sizeof(*registerset_test_row_int_float), - registerset_constants_row_int_float, - sizeof(registerset_constants_row_int_float) / sizeof(*registerset_constants_row_int_float)}, + registerset_test_row_int_float, ARRAY_SIZE(registerset_test_row_int_float), + registerset_constants_row_int_float, ARRAY_SIZE(registerset_constants_row_int_float)}, /* matrix row array */ - {"float 3x2 [2]", "raf", 0, D3DXRS_FLOAT4, registerset_blob_row_array, registerset_test_row_array_float, - sizeof(registerset_test_row_array_float) / sizeof(*registerset_test_row_array_float), - registerset_constants_row_array_float, - sizeof(registerset_constants_row_array_float) / sizeof(*registerset_constants_row_array_float)}, - {"int 3x2 [2]", "ran", 0, D3DXRS_INT4, registerset_blob_row_array, registerset_test_row_array_int, - sizeof(registerset_test_row_array_int) / sizeof(*registerset_test_row_array_int), - registerset_constants_row_array_int, - sizeof(registerset_constants_row_array_int) / sizeof(*registerset_constants_row_array_int)}, - {"bool 3x2 [2]", "rab", 0, D3DXRS_BOOL, registerset_blob_row_array, registerset_test_row_array_bool, - sizeof(registerset_test_row_array_bool) / sizeof(*registerset_test_row_array_bool), - registerset_constants_row_array_bool, - sizeof(registerset_constants_row_array_bool) / sizeof(*registerset_constants_row_array_bool)}, + {"float 3x2 [2]", "raf", 0, D3DXRS_FLOAT4, registerset_blob_row_array, + registerset_test_row_array_float, ARRAY_SIZE(registerset_test_row_array_float), + registerset_constants_row_array_float, ARRAY_SIZE(registerset_constants_row_array_float)}, + {"int 3x2 [2]", "ran", 0, D3DXRS_INT4, registerset_blob_row_array, + registerset_test_row_array_int, ARRAY_SIZE(registerset_test_row_array_int), + registerset_constants_row_array_int, ARRAY_SIZE(registerset_constants_row_array_int)}, + {"bool 3x2 [2]", "rab", 0, D3DXRS_BOOL, registerset_blob_row_array, + registerset_test_row_array_bool, ARRAY_SIZE(registerset_test_row_array_bool), + registerset_constants_row_array_bool, ARRAY_SIZE(registerset_constants_row_array_bool)}, {"bool float 3x2 [2]", "rabf", 24, D3DXRS_FLOAT4, registerset_blob_row_array, - registerset_test_row_array_bool_float, - sizeof(registerset_test_row_array_bool_float) / sizeof(*registerset_test_row_array_bool_float), - registerset_constants_row_array_bool_float, - sizeof(registerset_constants_row_array_bool_float) / sizeof(*registerset_constants_row_array_bool_float)}, + registerset_test_row_array_bool_float, ARRAY_SIZE(registerset_test_row_array_bool_float), + registerset_constants_row_array_bool_float, ARRAY_SIZE(registerset_constants_row_array_bool_float)}, {"int float 3x2 [2]", "ranf", 48, D3DXRS_FLOAT4, registerset_blob_row_array, - registerset_test_row_array_int_float, - sizeof(registerset_test_row_array_int_float) / sizeof(*registerset_test_row_array_int_float), - registerset_constants_row_array_int_float, - sizeof(registerset_constants_row_array_int_float) / sizeof(*registerset_constants_row_array_int_float)}, + registerset_test_row_array_int_float, ARRAY_SIZE(registerset_test_row_array_int_float), + registerset_constants_row_array_int_float, ARRAY_SIZE(registerset_constants_row_array_int_float)}, /* struct */ - {"struct float", "sf", 0, D3DXRS_FLOAT4, registerset_blob_struct, registerset_test_struct_float, - sizeof(registerset_test_struct_float) / sizeof(*registerset_test_struct_float), - registerset_constants_struct_float, - sizeof(registerset_constants_struct_float) / sizeof(*registerset_constants_struct_float)}, - {"struct int", "sn", 0, D3DXRS_INT4, registerset_blob_struct, registerset_test_struct_int, - sizeof(registerset_test_struct_int) / sizeof(*registerset_test_struct_int), - registerset_constants_struct_int, - sizeof(registerset_constants_struct_int) / sizeof(*registerset_constants_struct_int)}, - {"struct bool", "sb", 0, D3DXRS_BOOL, registerset_blob_struct, registerset_test_struct_bool, - sizeof(registerset_test_struct_bool) / sizeof(*registerset_test_struct_bool), - registerset_constants_struct_bool, - sizeof(registerset_constants_struct_bool) / sizeof(*registerset_constants_struct_bool)}, + {"struct float", "sf", 0, D3DXRS_FLOAT4, registerset_blob_struct, + registerset_test_struct_float, ARRAY_SIZE(registerset_test_struct_float), + registerset_constants_struct_float, ARRAY_SIZE(registerset_constants_struct_float)}, + {"struct int", "sn", 0, D3DXRS_INT4, registerset_blob_struct, + registerset_test_struct_int, ARRAY_SIZE(registerset_test_struct_int), + registerset_constants_struct_int, ARRAY_SIZE(registerset_constants_struct_int)}, + {"struct bool", "sb", 0, D3DXRS_BOOL, registerset_blob_struct, + registerset_test_struct_bool, ARRAY_SIZE(registerset_test_struct_bool), + registerset_constants_struct_bool, ARRAY_SIZE(registerset_constants_struct_bool)}, {"struct bool float", "sbf", 16, D3DXRS_FLOAT4, registerset_blob_struct, - registerset_test_struct_bool_float, - sizeof(registerset_test_struct_bool_float) / sizeof(*registerset_test_struct_bool_float), - registerset_constants_struct_bool_float, - sizeof(registerset_constants_struct_bool_float) / sizeof(*registerset_constants_struct_bool_float)}, + registerset_test_struct_bool_float, ARRAY_SIZE(registerset_test_struct_bool_float), + registerset_constants_struct_bool_float, ARRAY_SIZE(registerset_constants_struct_bool_float)}, {"struct int float", "snf", 8, D3DXRS_FLOAT4, registerset_blob_struct, - registerset_test_struct_int_float, - sizeof(registerset_test_struct_int_float) / sizeof(*registerset_test_struct_int_float), - registerset_constants_struct_int_float, - sizeof(registerset_constants_struct_int_float) / sizeof(*registerset_constants_struct_int_float)}, + registerset_test_struct_int_float, ARRAY_SIZE(registerset_test_struct_int_float), + registerset_constants_struct_int_float, ARRAY_SIZE(registerset_constants_struct_int_float)}, /* struct array */ - {"struct float [2]", "saf", 0, D3DXRS_FLOAT4, registerset_blob_struct_array, registerset_test_struct_array_float, - sizeof(registerset_test_struct_array_float) / sizeof(*registerset_test_struct_array_float), - registerset_constants_struct_array_float, - sizeof(registerset_constants_struct_array_float) / sizeof(*registerset_constants_struct_array_float)}, - {"struct int [2]", "san", 0, D3DXRS_INT4, registerset_blob_struct_array, registerset_test_struct_array_int, - sizeof(registerset_test_struct_array_int) / sizeof(*registerset_test_struct_array_int), - registerset_constants_struct_array_int, - sizeof(registerset_constants_struct_array_int) / sizeof(*registerset_constants_struct_array_int)}, - {"struct bool [2]", "sab", 0, D3DXRS_BOOL, registerset_blob_struct_array, registerset_test_struct_array_bool, - sizeof(registerset_test_struct_array_bool) / sizeof(*registerset_test_struct_array_bool), - registerset_constants_struct_array_bool, - sizeof(registerset_constants_struct_array_bool) / sizeof(*registerset_constants_struct_array_bool)}, + {"struct float [2]", "saf", 0, D3DXRS_FLOAT4, registerset_blob_struct_array, + registerset_test_struct_array_float, ARRAY_SIZE(registerset_test_struct_array_float), + registerset_constants_struct_array_float, ARRAY_SIZE(registerset_constants_struct_array_float)}, + {"struct int [2]", "san", 0, D3DXRS_INT4, registerset_blob_struct_array, + registerset_test_struct_array_int, ARRAY_SIZE(registerset_test_struct_array_int), + registerset_constants_struct_array_int, ARRAY_SIZE(registerset_constants_struct_array_int)}, + {"struct bool [2]", "sab", 0, D3DXRS_BOOL, registerset_blob_struct_array, + registerset_test_struct_array_bool, ARRAY_SIZE(registerset_test_struct_array_bool), + registerset_constants_struct_array_bool, ARRAY_SIZE(registerset_constants_struct_array_bool)}, {"struct bool float [2]", "sabf", 32, D3DXRS_FLOAT4, registerset_blob_struct_array, - registerset_test_struct_array_bool_float, - sizeof(registerset_test_struct_array_bool_float) / sizeof(*registerset_test_struct_array_bool_float), - registerset_constants_struct_array_bool_float, - sizeof(registerset_constants_struct_array_bool_float) / sizeof(*registerset_constants_struct_array_bool_float)}, + registerset_test_struct_array_bool_float, ARRAY_SIZE(registerset_test_struct_array_bool_float), + registerset_constants_struct_array_bool_float, ARRAY_SIZE(registerset_constants_struct_array_bool_float)}, {"struct int float [2]", "sanf", 16, D3DXRS_FLOAT4, registerset_blob_struct_array, - registerset_test_struct_array_int_float, - sizeof(registerset_test_struct_array_int_float) / sizeof(*registerset_test_struct_array_int_float), - registerset_constants_struct_array_int_float, - sizeof(registerset_constants_struct_array_int_float) / sizeof(*registerset_constants_struct_array_int_float)}, + registerset_test_struct_array_int_float, ARRAY_SIZE(registerset_test_struct_array_int_float), + registerset_constants_struct_array_int_float, ARRAY_SIZE(registerset_constants_struct_array_int_float)}, /* struct struct */ - {"struct struct float", "ssf", 0, D3DXRS_FLOAT4, registerset_blob_struct_struct, registerset_test_struct_struct_float, - sizeof(registerset_test_struct_struct_float) / sizeof(*registerset_test_struct_struct_float), - registerset_constants_struct_struct_float, - sizeof(registerset_constants_struct_struct_float) / sizeof(*registerset_constants_struct_struct_float)}, - {"struct struct int", "ssn", 0, D3DXRS_INT4, registerset_blob_struct_struct, registerset_test_struct_struct_int, - sizeof(registerset_test_struct_struct_int) / sizeof(*registerset_test_struct_struct_int), - registerset_constants_struct_struct_int, - sizeof(registerset_constants_struct_struct_int) / sizeof(*registerset_constants_struct_struct_int)}, - {"struct struct bool", "ssb", 0, D3DXRS_BOOL, registerset_blob_struct_struct, registerset_test_struct_struct_bool, - sizeof(registerset_test_struct_struct_bool) / sizeof(*registerset_test_struct_struct_bool), - registerset_constants_struct_struct_bool, - sizeof(registerset_constants_struct_struct_bool) / sizeof(*registerset_constants_struct_struct_bool)}, + {"struct struct float", "ssf", 0, D3DXRS_FLOAT4, registerset_blob_struct_struct, + registerset_test_struct_struct_float, ARRAY_SIZE(registerset_test_struct_struct_float), + registerset_constants_struct_struct_float, ARRAY_SIZE(registerset_constants_struct_struct_float)}, + {"struct struct int", "ssn", 0, D3DXRS_INT4, registerset_blob_struct_struct, + registerset_test_struct_struct_int, ARRAY_SIZE(registerset_test_struct_struct_int), + registerset_constants_struct_struct_int, ARRAY_SIZE(registerset_constants_struct_struct_int)}, + {"struct struct bool", "ssb", 0, D3DXRS_BOOL, registerset_blob_struct_struct, + registerset_test_struct_struct_bool, ARRAY_SIZE(registerset_test_struct_struct_bool), + registerset_constants_struct_struct_bool, ARRAY_SIZE(registerset_constants_struct_struct_bool)}, {"struct struct bool float", "ssbf", 32, D3DXRS_FLOAT4, registerset_blob_struct_struct, - registerset_test_struct_struct_bool_float, - sizeof(registerset_test_struct_struct_bool_float) / sizeof(*registerset_test_struct_struct_bool_float), - registerset_constants_struct_struct_bool_float, - sizeof(registerset_constants_struct_struct_bool_float) / sizeof(*registerset_constants_struct_struct_bool_float)}, + registerset_test_struct_struct_bool_float, ARRAY_SIZE(registerset_test_struct_struct_bool_float), + registerset_constants_struct_struct_bool_float, ARRAY_SIZE(registerset_constants_struct_struct_bool_float)}, {"struct struct int float", "ssnf", 16, D3DXRS_FLOAT4, registerset_blob_struct_struct, - registerset_test_struct_struct_int_float, - sizeof(registerset_test_struct_struct_int_float) / sizeof(*registerset_test_struct_struct_int_float), - registerset_constants_struct_struct_int_float, - sizeof(registerset_constants_struct_struct_int_float) / sizeof(*registerset_constants_struct_struct_int_float)}, + registerset_test_struct_struct_int_float, ARRAY_SIZE(registerset_test_struct_struct_int_float), + registerset_constants_struct_struct_int_float, ARRAY_SIZE(registerset_constants_struct_struct_int_float)}, /* special */ {"int ran", "ran", 0, D3DXRS_INT4, registerset_blob_special_int, NULL, 0, - registerset_constants_special_int, - sizeof(registerset_constants_special_int) / sizeof(*registerset_constants_special_int)}, - {"bigvec", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_bigvec, registerset_test_bigvec_float, - sizeof(registerset_test_bigvec_float) / sizeof(*registerset_test_bigvec_float), - registerset_constants_bigvec_float, - sizeof(registerset_constants_bigvec_float) / sizeof(*registerset_constants_bigvec_float)}, + registerset_constants_special_int, ARRAY_SIZE(registerset_constants_special_int)}, + {"bigvec", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_bigvec, + registerset_test_bigvec_float, ARRAY_SIZE(registerset_test_bigvec_float), + registerset_constants_bigvec_float, ARRAY_SIZE(registerset_constants_bigvec_float)}, {"cf", "cf", 0, D3DXRS_FLOAT4, registerset_blob_matrix_column_clamp, - registerset_test_matrix_column_clamp, - sizeof(registerset_test_matrix_column_clamp) / sizeof(*registerset_test_matrix_column_clamp), - registerset_constants_matrix_column_clamp, - sizeof(registerset_constants_matrix_column_clamp) / sizeof(*registerset_constants_matrix_column_clamp)}, + registerset_test_matrix_column_clamp, ARRAY_SIZE(registerset_test_matrix_column_clamp), + registerset_constants_matrix_column_clamp, ARRAY_SIZE(registerset_constants_matrix_column_clamp)}, }; static void registerset_clear(IDirect3DDevice9 *device) -- 2.14.4

June 4, 2018

[PATCH 1/2] d3dx9/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This is the trivial in-place stuff. The generated object files with or without this patch are identical. dlls/d3dx9_36/tests/core.c | 8 ++++---- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/shader.c | 22 +++++++++++----------- dlls/d3dx9_36/tests/surface.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 90b678fdf7..75d33c1e0d 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -552,7 +552,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); - for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(texture_tests); i++) { HDC hdc; DWORD ret; HRESULT hr; @@ -617,7 +617,7 @@ static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = D3DXCreateRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, &render); @@ -1024,7 +1024,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, TRUE); check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, FALSE); @@ -1052,7 +1052,7 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } }; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f26b63a13..d9ff11eaea 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -991,7 +991,7 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_spe test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ test_effect_parameter_value_result_ ## x,\ - sizeof(test_effect_parameter_value_result_ ## x)/sizeof(*test_effect_parameter_value_result_ ## x),\ + ARRAY_SIZE(test_effect_parameter_value_result_ ## x),\ } static const struct diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46e42..c2b41cfdc7 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -649,17 +649,17 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, static void test_constant_tables(void) { test_constant_table("test_basic", ctab_basic, ctab_basic_expected, - sizeof(ctab_basic_expected)/sizeof(*ctab_basic_expected)); + ARRAY_SIZE(ctab_basic_expected)); test_constant_table("test_matrices", ctab_matrices, ctab_matrices_expected, - sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); + ARRAY_SIZE(ctab_matrices_expected)); test_constant_table("test_matrices2", ctab_matrices2, ctab_matrices2_expected, - sizeof(ctab_matrices2_expected)/sizeof(*ctab_matrices2_expected)); + ARRAY_SIZE(ctab_matrices2_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, - sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + ARRAY_SIZE(ctab_arrays_expected)); test_constant_table("test_default_values", ctab_with_default_values, ctab_with_default_values_expected, - sizeof(ctab_with_default_values_expected)/sizeof(*ctab_with_default_values_expected)); + ARRAY_SIZE(ctab_with_default_values_expected)); test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, - sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); + ARRAY_SIZE(ctab_samplers_expected)); } static void test_setting_basic_table(IDirect3DDevice9 *device) @@ -1844,7 +1844,7 @@ static void test_get_shader_constant_variables(void) ctab = ID3DXConstantTable_GetBufferPointer(ctable); ok(ctab[0] == test_get_shader_constant_variables_blob[3], "ID3DXConstantTable_GetBufferPointer failed\n"); - for (i = 0; i < sizeof(test_get_shader_constant_variables_data) / sizeof(*test_get_shader_constant_variables_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_get_shader_constant_variables_data); ++i) { const char *fullname = test_get_shader_constant_variables_data[i].fullname; const D3DXCONSTANT_DESC *expected_desc = &test_get_shader_constant_variables_data[i].desc; @@ -6025,7 +6025,7 @@ static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXRE D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; UINT err = 0, i; - for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + for (i = 0; i < ARRAY_SIZE(regsets); i++) { if (regset == regsets[i]) err += registerset_compare(device, is_vs, regset, start, in_count, expected); @@ -6137,7 +6137,7 @@ static void test_registerset(void) return; } - for (k = 0; k < sizeof(registerset_data) / sizeof(*registerset_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_data); ++k) { const char *tablename = registerset_data[k].name; const char *name = registerset_data[k].var; @@ -6442,7 +6442,7 @@ static void test_registerset_defaults(void) return; } - for (k = 0; k < sizeof(registerset_defaults_data) / sizeof(*registerset_defaults_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_defaults_data); ++k) { const char *tablename = registerset_defaults_data[k].name; ID3DXConstantTable *ctable; @@ -6616,7 +6616,7 @@ static void test_shader_semantics(void) hr = D3DXGetShaderInputSemantics(vs_1_1, semantics, NULL); ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const DWORD *shader = tests[i].shader; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 324e2af3eb..37c488b5ad 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -398,7 +398,7 @@ static void test_dds_header_handling(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size; assert(file_size <= sizeof(*dds)); -- 2.14.4

June 4, 2018

[PATCH 5/5] msvcrt: Don't reimplement call_unwind_func().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 42212c9..301c169 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -59,7 +59,7 @@ typedef struct __catchblock_info UINT flags; /* flags (see below) */ const type_info *type_info; /* C++ type caught by this block */ int offset; /* stack offset to copy exception object to */ - void (*handler)(void);/* catch block handler code */ + int (*handler)(void);/* catch block handler code */ } catchblock_info; #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -79,7 +79,7 @@ typedef struct __tryblock_info typedef struct __unwind_info { int prev; /* prev trylevel unwind handler, to run after this one */ - void (*handler)(void);/* unwind handler */ + int (*handler)(void);/* unwind handler */ } unwind_info; /* descriptor of all try blocks of a given function */ @@ -137,22 +137,6 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; -/* call a function with a given ebp */ -static inline void *call_ebp_func( void *func, void *ebp ) -{ - void *ret; - int dummy; - __asm__ __volatile__ ("pushl %%ebx\n\t" - "pushl %%ebp\n\t" - "movl %4,%%ebp\n\t" - "call *%%eax\n\t" - "popl %%ebp\n\t" - "popl %%ebx" - : "=a" (ret), "=S" (dummy), "=D" (dummy) - : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); - return ret; -} - /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -326,7 +310,7 @@ static void copy_exception( void *object, cxx_exception_frame *frame, /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { - void (*handler)(void); + int (*handler)(void); int trylevel = frame->trylevel; while (trylevel != last_level) @@ -341,7 +325,7 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des { TRACE( "calling unwind handler %p trylevel %d last %d ebp %p\n", handler, trylevel, last_level, &frame->ebp ); - call_ebp_func( handler, &frame->ebp ); + call_unwind_func( handler, &frame->ebp ); } trylevel = descr->unwind_table[trylevel].prev; } @@ -478,7 +462,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.trylevel = nested_trylevel + 1; __wine_push_frame( &nested_frame.frame ); - addr = call_ebp_func( catchblock->handler, &frame->ebp ); + addr = (void *)call_unwind_func( catchblock->handler, &frame->ebp ); __wine_pop_frame( &nested_frame.frame ); ((DWORD*)frame)[-1] = save_esp; -- 2.7.4

June 4, 2018

[PATCH 4/5] msvcrt: Avoid using inline assembly in call_unwind_func().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 29540cd..42212c9 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -198,24 +198,20 @@ __ASM_GLOBAL_FUNC( call_filter, "popl %ebp\n\t" "ret" ); -static inline int call_unwind_func( int (*func)(void), void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl %%esi\n\t" - "pushl %%edi\n\t" - "movl %2,%%ebp\n\t" - "call *%0\n\t" - "popl %%edi\n\t" - "popl %%esi\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp) - : "ecx", "edx", "memory" ); - return ret; -} +extern int call_unwind_func( int (*func)(void), void *ebp ); + +__ASM_GLOBAL_FUNC( call_unwind_func, + "pushl %ebp\n\t" + "pushl %ebx\n\t" + "pushl %esi\n\t" + "pushl %edi\n\t" + "movl 24(%esp), %ebp\n\t" + "call *20(%esp)\n\t" + "popl %edi\n\t" + "popl %esi\n\t" + "popl %ebx\n\t" + "popl %ebp\n\t" + "ret" ); static inline void dump_type( const cxx_type_info *type ) { -- 2.7.4

June 4, 2018

[PATCH 3/5] msvcrt: Avoid using inline assembly in call_filter().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 508e2ee..29540cd 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -187,15 +187,16 @@ __ASM_GLOBAL_FUNC( call_finally_block, "movl 8(%esp), %ebp\n\t" "jmp *4(%esp)" ); -static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp), "r" (arg) - : "ecx", "edx", "memory" ); - return ret; -} +extern int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ); + +__ASM_GLOBAL_FUNC( call_filter, + "pushl %ebp\n\t" + "pushl 12(%esp)\n\t" + "movl 20(%esp), %ebp\n\t" + "call *12(%esp)\n\t" + "popl %ebp\n\t" + "popl %ebp\n\t" + "ret" ); static inline int call_unwind_func( int (*func)(void), void *ebp ) { -- 2.7.4

June 4, 2018

[PATCH 2/5] msvcrt: Avoid using inline assembly in call_finally_block().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 2c845b2..508e2ee 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -181,11 +181,11 @@ __ASM_GLOBAL_FUNC( continue_after_catch, "leal 12(%edx), %ebp\n\t" "jmp *%eax" ); -static inline void call_finally_block( void *code_block, void *base_ptr ) -{ - __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" - : : "a" (code_block), "g" (base_ptr)); -} +extern void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr ); + +__ASM_GLOBAL_FUNC( call_finally_block, + "movl 8(%esp), %ebp\n\t" + "jmp *4(%esp)" ); static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) { @@ -938,7 +938,6 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, frame->trylevel = pScopeTable[trylevel].previousTryLevel; TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler); call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp); - ERR("Returned from __finally block - expect crash!\n"); } } trylevel = pScopeTable[trylevel].previousTryLevel; @@ -1012,7 +1011,6 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), frame->trylevel = scope_table->entries[trylevel].previousTryLevel; TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); - ERR("Returned from __finally block - expect crash!\n"); } } trylevel = scope_table->entries[trylevel].previousTryLevel; -- 2.7.4

June 4, 2018

[PATCH 1/5] msvcrt: Avoid using inline assembly in continue_after_catch().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index ee12fb6..2c845b2 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -172,12 +172,14 @@ __ASM_GLOBAL_FUNC( call_copy_ctor, "ret" ); /* continue execution to the specified address after exception is caught */ -static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -{ - __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" - : : "r" (frame), "a" (addr) ); - for (;;) ; /* unreached */ -} +extern void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ); + +__ASM_GLOBAL_FUNC( continue_after_catch, + "movl 4(%esp), %edx\n\t" + "movl 8(%esp), %eax\n\t" + "movl -4(%edx), %esp\n\t" + "leal 12(%edx), %ebp\n\t" + "jmp *%eax" ); static inline void call_finally_block( void *code_block, void *base_ptr ) { -- 2.7.4

June 4, 2018

[PATCH 5/5] dbghelp: Read the r_debug and link_map structs corresponding to the target's architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 110 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index c43d108..32ce345 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -78,6 +78,15 @@ struct r_debug }; #endif /* HAVE_STRUCT_R_DEBUG */ +struct r_debug32 +{ + int r_version; + DWORD r_map; + Elf32_Addr r_brk; + int r_state; + Elf32_Addr r_ldbase; +}; + #ifndef HAVE_STRUCT_LINK_MAP struct link_map { @@ -88,6 +97,14 @@ struct link_map }; #endif /* HAVE_STRUCT_LINK_MAP */ +struct link_map32 +{ + Elf32_Addr l_addr; + DWORD l_name; + DWORD l_ld; + DWORD l_next, l_prev; +}; + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info @@ -1648,36 +1665,77 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, const WCHAR* main_name, enum_elf_modules_cb cb, void* user) { - struct r_debug dbg_hdr; - void* lm_addr; - struct link_map lm; - char bufstr[256]; - WCHAR bufstrW[MAX_PATH]; + WCHAR bufstrW[MAX_PATH]; + char bufstr[256]; + void *lm_addr; - if (!pcs->dbg_hdr_addr || - !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, - &dbg_hdr, sizeof(dbg_hdr), NULL)) - return FALSE; - - /* Now walk the linked list. In all known ELF implementations, - * the dynamic loader maintains this linked list for us. In some - * cases the first entry doesn't appear with a name, in other cases it - * does. - */ - for (lm_addr = (void*)dbg_hdr.r_map; lm_addr; lm_addr = (void*)lm.l_next) + if (pcs->is_64bit) { - if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) - return FALSE; + struct r_debug dbg_hdr; + struct link_map lm; - if (lm.l_prev != NULL && /* skip first entry, normally debuggee itself */ - lm.l_name != NULL && - ReadProcessMemory(pcs->handle, lm.l_name, bufstr, sizeof(bufstr), NULL)) + if (!pcs->dbg_hdr_addr || + !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, + &dbg_hdr, sizeof(dbg_hdr), NULL)) + return FALSE; + + /* Now walk the linked list. In all known ELF implementations, + * the dynamic loader maintains this linked list for us. In some + * cases the first entry doesn't appear with a name, in other cases it + * does. + */ + for (lm_addr = (void*)dbg_hdr.r_map; lm_addr; lm_addr = (void*)lm.l_next) { - bufstr[sizeof(bufstr) - 1] = '\0'; - MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, sizeof(bufstrW) / sizeof(WCHAR)); - if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); - if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) break; - } + if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + return FALSE; + + if (lm.l_prev != NULL && /* skip first entry, normally debuggee itself */ + lm.l_name != NULL && + ReadProcessMemory(pcs->handle, lm.l_name, bufstr, sizeof(bufstr), NULL)) + { + bufstr[sizeof(bufstr) - 1] = '\0'; + MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, + sizeof(bufstrW) / sizeof(WCHAR)); + if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) + break; + } + } + } + else + { + struct r_debug32 dbg_hdr; + struct link_map32 lm; + + if (!pcs->dbg_hdr_addr || + !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, + &dbg_hdr, sizeof(dbg_hdr), NULL)) + return FALSE; + + /* Now walk the linked list. In all known ELF implementations, + * the dynamic loader maintains this linked list for us. In some + * cases the first entry doesn't appear with a name, in other cases it + * does. + */ + for (lm_addr = (void *)(DWORD_PTR)dbg_hdr.r_map; lm_addr; + lm_addr = (void *)(DWORD_PTR)lm.l_next) + { + if (!ReadProcessMemory(pcs->handle, lm_addr, &lm, sizeof(lm), NULL)) + return FALSE; + + if (lm.l_prev && /* skip first entry, normally debuggee itself */ + lm.l_name && + ReadProcessMemory(pcs->handle, (void *)(DWORD_PTR)lm.l_name, + bufstr, sizeof(bufstr), NULL)) + { + bufstr[sizeof(bufstr) - 1] = '\0'; + MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, + sizeof(bufstrW) / sizeof(WCHAR)); + if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) + break; + } + } } #ifdef AT_SYSINFO_EHDR -- 2.7.4

June 4, 2018

[PATCH 4/5] dbghelp: Translate the 32-bit ELF symbol struct to the 64-bit one.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 87 +++++++++++++++++++++++++++----------------- dlls/dbghelp/image_private.h | 9 +---- 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 0cbeb98..c43d108 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -101,7 +101,7 @@ struct elf_info struct symtab_elt { struct hash_table_elt ht_elt; - const Elf_Sym* symp; + Elf64_Sym sym; struct symt_compiland* compiland; unsigned used; }; @@ -548,13 +548,13 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, const char* symname; struct symt_compiland* compiland = NULL; const char* ptr; - const Elf_Sym* symp; struct symtab_elt* ste; struct image_section_map ism, ism_str; + const char *symtab; if (!elf_find_section(fmap, ".symtab", SHT_SYMTAB, &ism) && !elf_find_section(fmap, ".dynsym", SHT_DYNSYM, &ism)) return; - if ((symp = (const Elf_Sym*)image_map_section(&ism)) == IMAGE_NO_MAP) return; + if ((symtab = image_map_section(&ism)) == IMAGE_NO_MAP) return; ism_str.fmap = ism.fmap; ism_str.sidx = fmap->u.elf.sect[ism.sidx].shdr.sh_link; if ((strp = image_map_section(&ism_str)) == IMAGE_NO_MAP) @@ -563,33 +563,50 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, return; } - nsym = image_get_map_size(&ism) / sizeof(*symp); + nsym = image_get_map_size(&ism) / + (fmap->addr_size == 32 ? sizeof(Elf32_Sym) : sizeof(Elf64_Sym)); for (j = 0; thunks[j].symname; j++) thunks[j].rva_start = thunks[j].rva_end = 0; - for (i = 0; i < nsym; i++, symp++) + for (i = 0; i < nsym; i++) { + Elf64_Sym sym; + + if (fmap->addr_size == 32) + { + Elf32_Sym *sym32 = &((Elf32_Sym *)symtab)[i]; + + sym.st_name = sym32->st_name; + sym.st_value = sym32->st_value; + sym.st_size = sym32->st_size; + sym.st_info = sym32->st_info; + sym.st_other = sym32->st_other; + sym.st_shndx = sym32->st_shndx; + } + else + sym = ((Elf64_Sym *)symtab)[i]; + /* Ignore certain types of entries which really aren't of that much * interest. */ - if ((ELF32_ST_TYPE(symp->st_info) != STT_NOTYPE && - ELF32_ST_TYPE(symp->st_info) != STT_FILE && - ELF32_ST_TYPE(symp->st_info) != STT_OBJECT && - ELF32_ST_TYPE(symp->st_info) != STT_FUNC) || - symp->st_shndx == SHN_UNDEF) + if ((ELF32_ST_TYPE(sym.st_info) != STT_NOTYPE && + ELF32_ST_TYPE(sym.st_info) != STT_FILE && + ELF32_ST_TYPE(sym.st_info) != STT_OBJECT && + ELF32_ST_TYPE(sym.st_info) != STT_FUNC) || + sym.st_shndx == SHN_UNDEF) { continue; } - symname = strp + symp->st_name; + symname = strp + sym.st_name; /* handle some specific symtab (that we'll throw away when done) */ - switch (ELF32_ST_TYPE(symp->st_info)) + switch (ELF32_ST_TYPE(sym.st_info)) { case STT_FILE: if (symname) - compiland = symt_new_compiland(module, symp->st_value, + compiland = symt_new_compiland(module, sym.st_value, source_new(module, NULL, symname)); else compiland = NULL; @@ -600,8 +617,8 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, { if (!strcmp(symname, thunks[j].symname)) { - thunks[j].rva_start = symp->st_value; - thunks[j].rva_end = symp->st_value + symp->st_size; + thunks[j].rva_start = sym.st_value; + thunks[j].rva_end = sym.st_value + sym.st_size; break; } } @@ -635,7 +652,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, ste->ht_elt.name = n; } } - ste->symp = symp; + ste->sym = sym; ste->compiland = compiland; ste->used = 0; hash_table_add(ht_symtab, &ste->ht_elt); @@ -651,7 +668,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, * * lookup a symbol by name in our internal hash table for the symtab */ -static const Elf_Sym* elf_lookup_symtab(const struct module* module, +static const Elf64_Sym *elf_lookup_symtab(const struct module* module, const struct hash_table* ht_symtab, const char* name, const struct symt* compiland) { @@ -698,8 +715,8 @@ static const Elf_Sym* elf_lookup_symtab(const struct module* module, { FIXME("Already found symbol %s (%s) in symtab %s @%08x and %s @%08x\n", name, compiland_name, - source_get(module, result->compiland->source), (unsigned int)result->symp->st_value, - source_get(module, ste->compiland->source), (unsigned int)ste->symp->st_value); + source_get(module, result->compiland->source), (unsigned int)result->sym.st_value, + source_get(module, ste->compiland->source), (unsigned int)ste->sym.st_value); } else { @@ -713,7 +730,7 @@ static const Elf_Sym* elf_lookup_symtab(const struct module* module, debugstr_w(module->module.ModuleName), name); return NULL; } - return result->symp; + return &result->sym; } /****************************************************************** @@ -727,7 +744,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table struct hash_table_iter hti; void* ptr; struct symt_ht* sym; - const Elf_Sym* symp; + const Elf64_Sym* symp; struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; hash_table_iter_init(&module->ht_symbols, &hti, NULL); @@ -748,9 +765,10 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table { if (((struct symt_function*)sym)->address != elf_info->elf_addr && ((struct symt_function*)sym)->address != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + FIXME("Changing address for %p/%s!%s from %08lx to %s\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + ((struct symt_function*)sym)->address, + wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value)); if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size) FIXME("Changing size for %p/%s!%s from %08lx to %08x\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, @@ -776,9 +794,10 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table { if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + FIXME("Changing address for %p/%s!%s from %08lx to %s\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + ((struct symt_function*)sym)->address, + wine_dbgstr_longlong(elf_info->elf_addr + symp->st_value)); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal; @@ -817,13 +836,13 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h { if (ste->used) continue; - addr = module->reloc_delta + ste->symp->st_value; + addr = module->reloc_delta + ste->sym.st_value; - j = elf_is_in_thunk_area(ste->symp->st_value, thunks); + j = elf_is_in_thunk_area(ste->sym.st_value, thunks); if (j >= 0) /* thunk found */ { symt_new_thunk(module, ste->compiland, ste->ht_elt.name, thunks[j].ordinal, - addr, ste->symp->st_size); + addr, ste->sym.st_size); } else { @@ -839,19 +858,19 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h * used yet (ie we have no debug information on them) * That's the case, for example, of the .spec.c files */ - switch (ELF32_ST_TYPE(ste->symp->st_info)) + switch (ELF32_ST_TYPE(ste->sym.st_info)) { case STT_FUNC: symt_new_function(module, ste->compiland, ste->ht_elt.name, - addr, ste->symp->st_size, NULL); + addr, ste->sym.st_size, NULL); break; case STT_OBJECT: loc.kind = loc_absolute; loc.reg = 0; loc.offset = addr; symt_new_global_variable(module, ste->compiland, ste->ht_elt.name, - ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL, - loc, ste->symp->st_size, NULL); + ELF32_ST_BIND(ste->sym.st_info) == STB_LOCAL, + loc, ste->sym.st_size, NULL); break; default: FIXME("Shouldn't happen\n"); @@ -891,8 +910,8 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table while ((ste = hash_table_iter_up(&hti))) { symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->reloc_delta + ste->symp->st_value, - ste->symp->st_size); + module->reloc_delta + ste->sym.st_value, + ste->sym.st_size); } return TRUE; } diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index e95d0d1..b12cacb 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -56,14 +56,7 @@ typedef struct section macho_section; #define IMAGE_NO_MAP ((void*)-1) -#ifdef __ELF__ - -#ifdef _WIN64 -#define Elf_Sym Elf64_Sym -#else -#define Elf_Sym Elf32_Sym -#endif -#else +#ifndef __ELF__ #ifndef SHT_NULL #define SHT_NULL 0 #endif -- 2.7.4

June 4, 2018

[PATCH 3/5] dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 30 ++++++++++++++++++++++++------ dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 2b444f8..0cbeb98 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1522,7 +1522,6 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l void* addr; void* str; void* str_max; - Elf_auxv_t auxv; si->SizeOfStruct = sizeof(*si); si->MaxNameLen = MAX_SYM_NAME; @@ -1548,14 +1547,33 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL) addr = (void*)((DWORD_PTR)addr + sizeof(str)); - while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + if (pcs->is_64bit) { - if (auxv.a_type == type) + Elf64_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) { - *val = auxv.a_un.a_val; - return TRUE; + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); + } + } + else + { + Elf32_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + { + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } - addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } return FALSE; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index a0df390..e95d0d1 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -60,10 +60,8 @@ typedef struct section macho_section; #ifdef _WIN64 #define Elf_Sym Elf64_Sym -#define Elf_auxv_t Elf64_auxv_t #else #define Elf_Sym Elf32_Sym -#define Elf_auxv_t Elf32_auxv_t #endif #else #ifndef SHT_NULL -- 2.7.4

June 4, 2018

[PATCH 2/5] dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 59 ++++++++++++++++++++++++++++++++------------ dlls/dbghelp/image_private.h | 2 -- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f84df83..2b444f8 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1270,29 +1270,56 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { - Elf_Dyn dyn; char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; if (load_offset) ptr += load_offset - fmap->u.elf.elf_start; - do + if (fmap->addr_size == 32) { - if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || - len != sizeof(dyn)) - return ret; - if (dyn.d_tag == DT_DEBUG) + Elf32_Dyn dyn; + + do { - elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; - if (load_offset == 0 && dyn_addr == 0) /* likely the case */ - /* Assume this module (the Wine loader) has been loaded at its preferred address */ - dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; - break; - } - ptr += sizeof(dyn); - } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) return ret; - } + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + else + { + Elf64_Dyn dyn; + + do + { + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + } elf_end_find(fmap); } diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 3951464..a0df390 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,11 +59,9 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t #endif -- 2.7.4

June 4, 2018

[PATCH 1/5] dbghelp: Read the ELF program header corresponding to the target's architecture.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 31 ++++++++++++++++++++++++------- dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8049210..f84df83 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -332,7 +332,6 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; unsigned int i; - Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; @@ -429,13 +428,31 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + if (fmap->addr_size == 32) { - tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; - if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; - if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + Elf32_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } + } + else + { + Elf64_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } } } /* if non relocatable ELF, then remove fixed address from computation diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 42781e4..3951464 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,12 +59,10 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t -- 2.7.4

June 4, 2018

Re: [PATCH] jscript: Fix MSVC build.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

June 4, 2018

Re: [PATCH 5/5] wined3d: Invalidate shaders when interpolation qualifiers might change.

by Matteo Bruni

2018-06-04 21:11 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > On Mon, Jun 4, 2018 at 8:32 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> >> --- >> dlls/wined3d/cs.c | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c >> index 3f1ca8ce658..e5ae7f478f8 100644 >> --- a/dlls/wined3d/cs.c >> +++ b/dlls/wined3d/cs.c >> @@ -1444,10 +1444,21 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type >> >> static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) >> { >> + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; >> const struct wined3d_cs_set_shader *op = data; >> >> cs->state.shader[op->type] = op->shader; >> device_invalidate_state(cs->device, STATE_SHADER(op->type)); >> + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info) && op->type == WINED3D_SHADER_TYPE_PIXEL >> + && op->shader && op->shader->reg_maps.shader_version.major >= 4) >> + { >> + if (cs->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]) >> + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)); >> + else if (cs->state.shader[WINED3D_SHADER_TYPE_DOMAIN]) >> + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); >> + else if (cs->state.shader[WINED3D_SHADER_TYPE_VERTEX]) >> + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX)); >> + } >> if (op->type != WINED3D_SHADER_TYPE_COMPUTE) >> device_invalidate_state(cs->device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); >> else >> -- >> 2.16.1 >> >> >> > > Is this really needed? See glsl_vertex_pipe_pixel_shader(). Indeed, it should be redundant.

June 4, 2018

[PATCH] dism: add stub program

by Austin English

For https://bugs.winehq.org/show_bug.cgi?id=43509 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + programs/dism/Makefile.in | 4 ++++ programs/dism/dism.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 programs/dism/Makefile.in create mode 100644 programs/dism/dism.c diff --git a/configure.ac b/configure.ac index 600cb63b9f..469fa8d729 100644 --- a/configure.ac +++ b/configure.ac @@ -3869,6 +3869,7 @@ WINE_CONFIG_MAKEFILE(programs/cmd/tests) WINE_CONFIG_MAKEFILE(programs/conhost) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) +WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in new file mode 100644 index 0000000000..834d1439a8 --- /dev/null +++ b/programs/dism/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dism.exe +APPMODE = -mconsole -municode + +C_SRCS = dism.c diff --git a/programs/dism/dism.c b/programs/dism/dism.c new file mode 100644 index 0000000000..86d5d2e6a3 --- /dev/null +++ b/programs/dism/dism.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dism); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.16.1

June 4, 2018

Re: [PATCH 5/5] wined3d: Invalidate shaders when interpolation qualifiers might change.

by Józef Kucia

On Mon, Jun 4, 2018 at 8:32 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/wined3d/cs.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c > index 3f1ca8ce658..e5ae7f478f8 100644 > --- a/dlls/wined3d/cs.c > +++ b/dlls/wined3d/cs.c > @@ -1444,10 +1444,21 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type > > static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) > { > + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; > const struct wined3d_cs_set_shader *op = data; > > cs->state.shader[op->type] = op->shader; > device_invalidate_state(cs->device, STATE_SHADER(op->type)); > + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info) && op->type == WINED3D_SHADER_TYPE_PIXEL > + && op->shader && op->shader->reg_maps.shader_version.major >= 4) > + { > + if (cs->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]) > + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)); > + else if (cs->state.shader[WINED3D_SHADER_TYPE_DOMAIN]) > + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); > + else if (cs->state.shader[WINED3D_SHADER_TYPE_VERTEX]) > + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX)); > + } > if (op->type != WINED3D_SHADER_TYPE_COMPUTE) > device_invalidate_state(cs->device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); > else > -- > 2.16.1 > > > Is this really needed? See glsl_vertex_pipe_pixel_shader().

June 4, 2018

[PATCH 5/5] wined3d: Invalidate shaders when interpolation qualifiers might change.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/cs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3f1ca8ce658..e5ae7f478f8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1444,10 +1444,21 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) { + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; device_invalidate_state(cs->device, STATE_SHADER(op->type)); + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info) && op->type == WINED3D_SHADER_TYPE_PIXEL + && op->shader && op->shader->reg_maps.shader_version.major >= 4) + { + if (cs->state.shader[WINED3D_SHADER_TYPE_GEOMETRY]) + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)); + else if (cs->state.shader[WINED3D_SHADER_TYPE_DOMAIN]) + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); + else if (cs->state.shader[WINED3D_SHADER_TYPE_VERTEX]) + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX)); + } if (op->type != WINED3D_SHADER_TYPE_COMPUTE) device_invalidate_state(cs->device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); else -- 2.16.1

June 4, 2018

[PATCH 4/5] wined3d: Compare interpolation mode VS compilation arguments.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Fix for bug 45127. dlls/wined3d/glsl_shader.c | 10 +++++++--- dlls/wined3d/shader.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6615d7c605..a99762b151f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8537,8 +8537,10 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { - if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE; - if((stored->clip_enabled) != new->clip_enabled) return FALSE; + if ((stored->swizzle_map & use_map) != new->swizzle_map) + return FALSE; + if ((stored->clip_enabled) != new->clip_enabled) + return FALSE; if (stored->point_size != new->point_size) return FALSE; if (stored->per_vertex_point_size != new->per_vertex_point_size) @@ -8549,7 +8551,9 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str return FALSE; if (stored->next_shader_input_count != new->next_shader_input_count) return FALSE; - return stored->fog_src == new->fog_src; + if (stored->fog_src != new->fog_src) + return FALSE; + return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); } static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8a6307a3edb..20d4f0773dd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3532,7 +3532,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; args->point_size = state->gl_primitive_type == GL_POINTS; args->per_vertex_point_size = shader->reg_maps.point_size; - args->next_shader_type = hull_shader? WINED3D_SHADER_TYPE_HULL + args->next_shader_type = hull_shader ? WINED3D_SHADER_TYPE_HULL : geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL; if (shader->reg_maps.shader_version.major >= 4) args->next_shader_input_count = hull_shader ? hull_shader->limits->packed_input -- 2.16.1

June 4, 2018

[PATCH 3/5] wined3d: Initialize glMinSampleShading() function pointer.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3ca389e0363..afb97184e39 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3279,6 +3279,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glMinSampleShading) /* OpenGL 4.0 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */ -- 2.16.1

June 4, 2018

[PATCH 2/5] dxgi: Get rid of DXGI_FRAME_LATENCY_DEFAULT.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index c8dc67f3117..c05a0e81e7e 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -44,7 +44,6 @@ enum dxgi_frame_latency { - DXGI_FRAME_LATENCY_DEFAULT = 3, DXGI_FRAME_LATENCY_MAX = 16, }; -- 2.16.1

June 4, 2018

[PATCH 1/5] wined3d: Slightly improve formatting of generated GLSL shader interfaces.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3692a276518..d6615d7c605 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2174,9 +2174,9 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte switch (mode) { case WINED3DSIM_CONSTANT: - return "flat"; + return "flat "; case WINED3DSIM_LINEAR_NOPERSPECTIVE: - return "noperspective"; + return "noperspective "; default: FIXME("Unhandled interpolation mode %#x.\n", mode); case WINED3DSIM_NONE: @@ -2207,7 +2207,7 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i for (i = 0; i < element_count; ++i) { mode = wined3d_extract_interpolation_mode(interpolation_mode, i); - shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); + shader_addline(buffer, " %svec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2242,7 +2242,7 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ mode = wined3d_extract_interpolation_mode(interpolation_mode, i); interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); } - shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); + shader_addline(buffer, " %svec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); } -- 2.16.1

June 4, 2018

[PATCH 2/2] testbot: Optimize the validation of enum properties.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index d8f0d391b..084667372 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -42,6 +42,7 @@ sub _initialize($$) $self->{Class} = "Enum"; $self->{Values} = $Values; + map { $self->{Allowed}->{$_} = 1 } @{$Values}; if (!$self->{IsRequired}) { die "Optional enum properties are not supported\n"; @@ -68,18 +69,14 @@ sub ValidateValue($$$) { my ($self, $Value, $IsNew) = @_; - if ($self->GetIsRequired()) - { - if (!$IsNew && (!defined($Value) || $Value eq "")) - { - return $self->GetDisplayName() . ": Must be entered"; - } - } + return undef if (defined $Value and $self->{Allowed}->{$Value}); - foreach my $V (@{$self->{Values}}) + if ($self->GetIsRequired() and !$IsNew and + (!defined $Value or $Value eq "")) { - return undef if ($V eq $Value); + return $self->GetDisplayName() . ": Must be entered"; } + return $self->GetDisplayName() . ": Is not valid"; } -- 2.17.0

June 4, 2018

[PATCH 1/2] testbot: Make sure optional enum properties are not used.

by Francois Gouget

They are not supported and trying to set them to an undefined value will trigger errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index d5850698e..d8f0d391b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -42,6 +42,10 @@ sub _initialize($$) $self->{Class} = "Enum"; $self->{Values} = $Values; + if (!$self->{IsRequired}) + { + die "Optional enum properties are not supported\n"; + } $self->SUPER::_initialize(); } -- 2.17.0

June 4, 2018

[PATCH] jscript: Fix MSVC build.

by Thomas Faber

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9b47368cf89..65ca47a5151 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1793,6 +1793,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) { - property_desc_t prop_desc = { flags, flags, TRUE, value }; + property_desc_t prop_desc = { flags, flags, TRUE }; + prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); } -- 2.16.1.windows.2

June 4, 2018

[PATCH] user32: add stub for RegisterPointerDeviceNotifications

by Louis Lenders

See https://bugs.winehq.org/show_bug.cgi?id=45284 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 895ccce312..be4b71a4bc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -837,6 +837,15 @@ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UIN return ERROR_NOT_SUPPORTED; } +/********************************************************************** + * RegisterPointerDeviceNotifications [USER32.@] + */ +BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) +{ + FIXME("(%p %d): stub\n", hwnd, notifyrange); + return FALSE; +} + static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index eb71e3b00b..2e5b203a85 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -598,6 +598,7 @@ @ stdcall RegisterLogonProcess(long long) # @ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities +@ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) diff --git a/include/winuser.h b/include/winuser.h index 8e9e91bf65..648efbe0e2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4004,6 +4004,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD); WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); #define RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification) WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); -- 2.17.0

June 4, 2018

Re: [PATCH 2/2] user32: Respect margins more in DrawTextExW().

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

Re: [PATCH 1/2] user32: Return 1 in DrawTextEx() when calculated offset is 0.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

Re: [PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Mon, Jun 04, 2018 at 01:07:44AM +0200, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/mmdevapi/tests/render.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c > index 9d3e8617b9..a4e94b15e0 100644 > --- a/dlls/mmdevapi/tests/render.c > +++ b/dlls/mmdevapi/tests/render.c > @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { > {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, > {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} > }; > -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) > > #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) > > @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) > fmt.wFormatTag = WAVE_FORMAT_PCM; > fmt.cbSize = 0; > > - for(i = 0; i < NB_WIN_FORMATS; i++) { > + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { > hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, > NULL, (void**)&ac); > ok(hr == S_OK, "Activation failed with %08x\n", hr); > -- > 2.14.4 > > >

June 4, 2018

[PATCH 2/2] user32: Respect margins more in DrawTextExW().

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 286c4f52d0..118dbeb559 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -943,6 +943,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, { lmargin = dtp->iLeftMargin; rmargin = dtp->iRightMargin; + width -= lmargin + rmargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */ @@ -978,9 +979,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip); - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; + if (flags & DT_CENTER) + x = (rect->left + lmargin + rect->right - rmargin - size.cx) / 2; + else if (flags & DT_RIGHT) + x = rect->right - size.cx - rmargin; if (flags & DT_SINGLELINE) { -- 2.17.0

June 4, 2018

[PATCH 1/2] user32: Return 1 in DrawTextEx() when calculated offset is 0.

by Zhiyi Zhang

The return value 0 in DrawTextEx() indicates failure. Should the offset from the bottom of the drawn text to top of the rectangle happens to be 0, return 1 instead. So that it doesn't indicate failure incidentally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 15 +++++++++++++++ dlls/user32/text.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..c5bcd50716 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -277,6 +277,21 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); + /* When offset to top is zero, return 1 */ + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRect(&rect, 0, 100, 0, 100); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_TOP, NULL); + /* Set top to text height and bottom zero, so bottom of drawn text to top is zero when DT_VCENTER is used */ + SetRect(&rect, 0, textheight, 0, 0); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_VCENTER, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); /* invalid dtp size test */ dtp.cbSize = -1; /* Invalid */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 8a2c247d8d..286c4f52d0 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1064,6 +1064,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) memcpy(str, retstr, size_retstr); ret = y - rect->top; + if (ret == 0) ret = 1; done: heap_free(retstr); return ret; -- 2.17.0

June 4, 2018

[PATCH] testbot: Improve Job file storage.

by Francois Gouget

So far files needed by a Step were stored in that Step's directory. This means the files produced by a Step are stored in the directory of the Step that needs them. Since multiple Steps may need the same file this can result in duplication (and also in retrieving the same file multiple times). This duplication is also needed for staging files if they are needed by more than one Step. This patch changes file storage so that files produced by a Step are stored in that Step's directory. Conversely files needed by a Step are found in the PreviousNo Step's directory, or in the Job's directory if PreviousNo is not set. This avoids duplication both when retrieving files from a VM and for staged files. To simplify the code Step::GetFullFileName() converts Step::FileName to an absolute path pointing to the Step's file. To ensure backward compatibility with existing Jobs it supports both the old and the new schemes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 13 ++++++------- testbot/bin/WineRunTask.pl | 5 ++--- testbot/lib/WineTestBot/Steps.pm | 25 +++++++++++++++++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 18 ++++++++++++++++++ testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 2 +- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 27b8be0e0..7a474e76d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -354,11 +354,10 @@ if (!defined $BaseName) # Run the build # -my $StepDir = $Step->GetDir(); -my $FileName = $Step->FileName; +my $FileName = $Step->GetFullFileName(); my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", "staging/patch.diff", 0)) +Debug(Elapsed($Start), " Sending '$FileName'\n"); +if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) { FatalTAError($TA, "Could not copy the patch to the VM"); } @@ -461,6 +460,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Don't try copying the test executables if the build step failed if ($NewStatus eq "completed") { + my $StepDir = $Step->CreateDir(); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { next if ($OtherStep->No == $StepNo); @@ -480,12 +480,11 @@ if ($NewStatus eq "completed") } Debug(Elapsed($Start), " Retrieving '$OtherFileName'\n"); - my $OtherStepDir = $OtherStep->CreateDir(); - if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) + if (!$TA->GetFile($TestExecutable, "$StepDir/$OtherFileName")) { FatalTAError($TA, "Could not retrieve '$OtherFileName'"); } - chmod 0664, "$OtherStepDir/$OtherFileName"; + chmod 0664, "$StepDir/$OtherFileName"; } } $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 231f34e0c..d75741757 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -388,10 +388,9 @@ if ($FileType ne "exe32" && $FileType ne "exe64") { FatalError("Unexpected file type $FileType found\n"); } -my $StepDir = $Step->GetDir(); my $FileName = $Step->FileName; -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", $FileName, 0)) +Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); +if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) { FatalTAError($TA, "Could not copy the test executable to the VM"); } diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 4dc45690e..977419474 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -57,6 +57,12 @@ the Step was running, and to skipped if it was queued. =back +If FileName is set it identifies a file that the Step needs for its operation. +That file will either be in the directory of the PreviousNo Step that produced +it, or in the directory of the job if it was provided by the user. +Conversely a Step's Task(s) may produce one or more files. These are all stored +in that Step's directory and may be used by one or more Steps. + Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, or to reset their PreviousNo fields beforehand. @@ -136,6 +142,21 @@ sub RmTree($) rmtree($Dir); } +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub HandleStaging($$) { my ($self) = @_; @@ -150,13 +171,13 @@ sub HandleStaging($$) return "Can't split staging filename"; } my $BaseName = $1; + $self->FileName($BaseName); my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, "$StepDir/$BaseName")) + if (!move($StagingFileName, $self->GetFullFileName())) { return "Could not move the staging file: $!"; } - $self->FileName($BaseName); $self->InStaging(!1); my ($ErrProperty, $ErrMessage) = $self->Save(); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index db0cc0667..b9f70d768 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -39,6 +39,22 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } +# See WineTestBot::Step::GetFullFileName() +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub GetTaskDir($) { my ($self) = @_; @@ -121,6 +137,7 @@ sub _initialize($$) my $StepTask = $self->CreateItem(); $StepTask->Id(100 * $Step->No + $Task->No); $StepTask->StepNo($Step->No); + $StepTask->PreviousNo($Step->PreviousNo); $StepTask->TaskNo($Task->No); $StepTask->Type($Step->Type); $StepTask->Status($Task->Status); @@ -166,6 +183,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a178cca42..7e274a8bf 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -52,7 +52,7 @@ sub GetFile($$$) return !1; } - my $FileName = $Step->GetDir() ."/". $Step->FileName; + my $FileName = $Step->GetFullFileName(); if (! sysopen(FILE, $FileName, O_RDONLY)) { return !1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 4d9a77a57..6bf4a12e8 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -485,7 +485,7 @@ sub GenerateDataCell($$$$$) } elsif ($PropertyName eq "FileName") { - my $FileName = $StepTask->GetStepDir() ."/". $StepTask->FileName; + my $FileName = $StepTask->GetFullFileName(); if (-r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . -- 2.17.0

June 4, 2018

Re: [PATCH 1/4 v4] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Huw Davies

On Tue, May 29, 2018 at 12:12:06PM +0800, Jactry Zeng wrote: > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/riched20/tests/Makefile.in | 2 +- > dlls/riched20/tests/txtsrv.c | 189 ++++++++++++++++++++++++++-------------- > 2 files changed, 126 insertions(+), 65 deletions(-) > > diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in > index 34c00afa7c..ca381d9dc2 100644 > --- a/dlls/riched20/tests/Makefile.in > +++ b/dlls/riched20/tests/Makefile.in > @@ -1,5 +1,5 @@ > TESTDLL = riched20.dll > -IMPORTS = ole32 oleaut32 user32 gdi32 > +IMPORTS = ole32 oleaut32 user32 gdi32 usp10 > > C_SRCS = \ > editor.c \ > diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c > index 88b5adf13c..76b4eb34f6 100644 > --- a/dlls/riched20/tests/txtsrv.c > +++ b/dlls/riched20/tests/txtsrv.c > @@ -37,6 +37,7 @@ > #include <wine/test.h> > #include <oleauto.h> > #include <limits.h> > +#include <usp10.h> > > static HMODULE hmoduleRichEdit; > static IID *pIID_ITextServices; > @@ -697,81 +698,141 @@ static void test_TxSetText(void) > ITextHost_Release(host); > } > > +static void hf_from_cf(HFONT *hf, CHARFORMAT2W cf) > +{ > + LOGFONTW lf; > + > + memset(&lf, 0, sizeof(lf)); > + lstrcpyW(lf.lfFaceName, cf.szFaceName); > + lf.lfHeight = MulDiv(-cf.yHeight, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 1440); > + lf.lfWeight = FW_NORMAL; > + if (cf.dwEffects & cf.dwMask & CFM_BOLD) > + lf.lfWeight = FW_BOLD; > + if (cf.dwMask & CFM_WEIGHT) > + lf.lfWeight = cf.wWeight; > + if (cf.dwEffects & cf.dwMask & CFM_ITALIC) > + lf.lfItalic = TRUE; > + if ((cf.dwEffects & cf.dwMask & CFM_UNDERLINE) && > + !(cf.dwEffects & CFE_LINK) && > + cf.bUnderlineType == CFU_CF1UNDERLINE) > + lf.lfUnderline = TRUE; > + if (cf.dwEffects & cf.dwMask & CFM_STRIKEOUT) > + lf.lfStrikeOut = TRUE; > + if (cf.dwEffects & cf.dwMask & (CFM_SUBSCRIPT | CFM_SUPERSCRIPT)) > + lf.lfHeight = (lf.lfHeight * 2) / 3; > + if (cf.dwMask & CFM_FACE) > + lf.lfPitchAndFamily = cf.bPitchAndFamily; > + if (cf.dwMask & CFM_CHARSET) > + lf.lfCharSet = cf.bCharSet; > + *hf = CreateFontIndirectW(&lf); > +} > + > +static LONG get_max_width(HDC hdc, LPCWSTR string, LONG avail_width, LONG *lines) > +{ > + SCRIPT_ITEM buf[16], *items = buf; > + LONG items_passed = sizeof(buf) / sizeof(buf[0]), num_items; > + SCRIPT_CONTROL control = {LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, > + FALSE, FALSE, 0}; > + SCRIPT_STATE state = {0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0}; > + SCRIPT_CACHE script_cache = NULL; > + LONG max_glyphs = 1.5 * lstrlenW(string) + 16; > + LONG max_clusters = lstrlenW(string) * 2; > + WORD *clusters = HeapAlloc(GetProcessHeap(), 0, max_clusters * sizeof(WORD)); > + WORD *glyphs = HeapAlloc(GetProcessHeap(), 0, max_glyphs * > + (sizeof(WORD) + sizeof(SCRIPT_VISATTR) + sizeof(LONG) + sizeof(GOFFSET))); > + SCRIPT_VISATTR *vis_attrs = (SCRIPT_VISATTR *)((char *)glyphs + max_glyphs * sizeof(WORD)); > + GOFFSET *offsets = (GOFFSET *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR) > + + sizeof(LONG))); > + LONG num_glyphs = 0; > + LONG *advances = (LONG *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR))); > + LONG i, width = 0, max_width = 0; > + > + ScriptItemize(string, lstrlenW(string), items_passed, &control, &state, items, &num_items); > + ScriptShape(hdc, &script_cache, string, lstrlenW(string), max_glyphs, &items[0].a, glyphs, > + clusters, vis_attrs, &num_glyphs); > + ScriptPlace(hdc, &script_cache, glyphs, num_glyphs, vis_attrs, &items[0].a, advances, offsets, > + NULL); > + > + *lines = 1; > + for (i = 0; i < num_glyphs; i++) > + { > + width += advances[i]; > + if (width >= avail_width) > + { > + (*lines)++; > + width -= advances[i]; > + if (width > max_width) > + max_width = width; > + width = advances[i]; > + } > + if (width > max_width) > + max_width = width; > + } Since we'll probably just use ascii characters for this test, you could avoid using uniscribe here and just use gdi32 directly. > + HeapFree(GetProcessHeap(), 0, clusters); > + HeapFree(GetProcessHeap(), 0, glyphs); > + return max_width; > +} > + > +#define CHECK_TXGETNATURALSIZE(res,width,height,expected_width,expected_height) \ > + _check_txgetnaturalsize(res, width, height, expected_width, expected_height, __LINE__) > +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, LONG expected_width, > + LONG expected_height, int line) > +{ > + ok_(__FILE__,line)(res == S_OK, "TxGetNaturalSize failed: 0x%08x.\n", res); > + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, > + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); > + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", > + height, expected_height); > +} > + > static void test_TxGetNaturalSize(void) > { > ITextServices *txtserv; > ITextHost *host; > HRESULT result; > - BOOL ret; > - > - /* This value is used when calling TxGetNaturalSize. MSDN says > - that this is not supported however a null pointer cannot be > - used as it will cause a segmentation violation. The values in > - the structure being pointed to are required to be INT_MAX > - otherwise calculations can give wrong values. */ > - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; > - > - static const WCHAR oneA[] = {'A',0}; > - > - /* Results of measurements */ > - LONG xdim, ydim; > - > - /* The device context to do the tests in */ > + SIZEL psizelExtent = {-1,-1}; > + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; > + LONG width, height, expected_width, expected_height, lines; > HDC hdcDraw; > - > - /* Variables with the text metric information */ > - INT charwidth_caps_text[26]; > - TEXTMETRICA tmInfo_text; > + HWND hwnd; > + RECT rect; > + CHARFORMAT2W cf; > + LRESULT lresult; > + HFONT hf, old_hf; > + TEXTMETRICA tm; > > if (!init_texthost(&txtserv, &host)) > return; > > - hdcDraw = GetDC(NULL); > - SaveDC(hdcDraw); > - > - /* Populate the metric strucs */ > - SetMapMode(hdcDraw,MM_TEXT); > - GetTextMetricsA(hdcDraw, &tmInfo_text); > - SetLastError(0xdeadbeef); > - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); > - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { > - win_skip("GetCharWidth32 is not available\n"); > - goto cleanup; > - } > - > - /* Make measurements in MM_TEXT */ > + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, > + 0, 0, 100, 100, 0, 0, 0, NULL); > + hdcDraw = GetDC(hwnd); > SetMapMode(hdcDraw,MM_TEXT); > - xdim = 0; ydim = 0; > - > - result = ITextServices_TxSetText(txtserv, oneA); > - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); > - if (result != S_OK) { > - skip("Could not set text\n"); > - goto cleanup; > - } > - > - SetLastError(0xdeadbeef); > - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, > - hdcDraw, NULL, NULL, > - TXTNS_FITTOCONTENT, &psizelExtent, > - &xdim, &ydim); > - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ > - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); > - if (result == S_OK) { > - todo_wine ok(ydim == tmInfo_text.tmHeight, > - "Height calculated incorrectly (expected %d, got %d)\n", > - tmInfo_text.tmHeight, ydim); > - /* The native DLL adds one pixel extra when calculating widths. */ > - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, > - "Width calculated incorrectly (expected %d {+1}, got %d)\n", > - charwidth_caps_text[0], xdim); > - } else > - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", > - xdim, ydim, result, GetLastError()); > - > -cleanup: > - RestoreDC(hdcDraw,1); > - ReleaseDC(NULL,hdcDraw); > + GetClientRect(hwnd, &rect); > + > + result = ITextServices_TxSetText(txtserv, test_text); > + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); > + > + cf.cbSize = sizeof(cf); > + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); > + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); > + hf_from_cf(&hf, cf); > + > + old_hf = SelectObject(hdcDraw, hf); How about doing this the other way around - create an hfont, fill out an appropriate cf and use that to set the character format of the text? I think that would end up being simpler. > + expected_width = get_max_width(hdcDraw, test_text, rect.right - rect.left, &lines); > + GetTextMetricsA(hdcDraw, &tm); > + expected_height = (tm.tmAscent + tm.tmDescent) * lines; > + SelectObject(hdcDraw, old_hf); > + > + psizelExtent.cx = -1; psizelExtent.cy = -1; > + width = rect.right - rect.left; > + height = 0; > + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, > + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); > + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); > + > + ReleaseDC(hwnd, hdcDraw); > + DestroyWindow(hwnd); > ITextServices_Release(txtserv); > ITextHost_Release(host); > } > -- > 2.15.1 (Apple Git-101) > > > >

June 4, 2018

Re: [PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Huw Davies

On Sun, Jun 03, 2018 at 02:51:11PM -0500, Zebediah Figura wrote: > On 03/06/18 13:58, Marvin wrote: > > Hi, > > > > While running your changed tests on Windows, I think I found new failures. > > Being a bot and all I'm not very good at pattern recognition, so I might be > > wrong, but could you please double-check? > > Full results can be found at > > https://testbot.winehq.org/JobDetails.pl?Key=38913 > > > > Your paranoid android. > > > > > > === wvistau64 (64 bit typelib) === > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > > > These failures are shortcomings in widl exposed by these patches; they > are fixed in patch 4/4. You'll probably have to merge some of the patches in this series to avoid test failures at intermediate stages. Huw.

June 4, 2018

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

June 4, 2018

Re: [PATCH] ole32: Don't try to unregister window class if it was never registered.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

Re: [PATCH v2] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 4, 2018

[PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators

by Jeff Latimer

Resend to wine-devel. --- dlls/netapi32/netapi32.c | 11 +++++++---- dlls/netapi32/tests/access.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

June 4, 2018

[PATCH] msctf/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a02f95117..4a52432aa5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -981,7 +981,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2089,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) -- 2.14.4

June 3, 2018

[PATCH] mpr/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 041afbf130..fc067d98c4 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -60,7 +60,7 @@ static void test_WNetGetUniversalName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +132,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) -- 2.14.4

June 3, 2018

[PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d3e8617b9..a4e94b15e0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); -- 2.14.4

June 3, 2018

[PATCH] mapi32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/tests/prop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4e099318f5..4d7fd7be43 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -135,7 +135,7 @@ static void test_PropCopyMore(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { lpSrc->ulPropTag = ptTypes[i]; @@ -453,11 +453,11 @@ static void test_FPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(FPCProp_Results)/sizeof(FPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(FPCProp_Results); j++) { SHORT lVal = FPCProp_Results[j].lVal; SHORT rVal = FPCProp_Results[j].rVal; @@ -583,11 +583,11 @@ static void test_LPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(LPCProp_Results)/sizeof(LPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(LPCProp_Results); j++) { SHORT lVal = LPCProp_Results[j].lVal; SHORT rVal = LPCProp_Results[j].rVal; @@ -684,7 +684,7 @@ static void test_PpropFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = ptTypes[i]; @@ -923,7 +923,7 @@ static void test_LpValFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); -- 2.14.4

June 3, 2018

[PATCH] localui/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/tests/localui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index b0b51e338c..f051880fd1 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -310,7 +310,7 @@ START_TEST(localui) while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_lptA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); @@ -321,7 +321,7 @@ START_TEST(localui) while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_comA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); -- 2.14.4

June 3, 2018

[PATCH 4/4] winevulkan: Update Vulkan support to 1.0.76.

by Roderick Colenbrander

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/vulkan-1/vulkan-1.spec | 28 + dlls/winevulkan/make_vulkan | 206 +- dlls/winevulkan/vk.xml | 6448 ++++++++++++++++++++++++++------------- dlls/winevulkan/vulkan_thunks.c | 377 ++- dlls/winevulkan/vulkan_thunks.h | 156 +- dlls/winevulkan/winevulkan.spec | 28 + include/wine/vulkan.h | 1711 +++++++---- 7 files changed, 6135 insertions(+), 2819 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 49af817d57..3d457749b4 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -6,7 +6,9 @@ @ stdcall vkAllocateMemory(ptr ptr ptr ptr) winevulkan.wine_vkAllocateMemory @ stdcall vkBeginCommandBuffer(ptr ptr) winevulkan.wine_vkBeginCommandBuffer @ stdcall vkBindBufferMemory(ptr int64 int64 int64) winevulkan.wine_vkBindBufferMemory +@ stub vkBindBufferMemory2 @ stdcall vkBindImageMemory(ptr int64 int64 int64) winevulkan.wine_vkBindImageMemory +@ stub vkBindImageMemory2 @ stdcall vkCmdBeginQuery(ptr int64 long long) winevulkan.wine_vkCmdBeginQuery @ stdcall vkCmdBeginRenderPass(ptr ptr long) winevulkan.wine_vkCmdBeginRenderPass @ stdcall vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr) winevulkan.wine_vkCmdBindDescriptorSets @@ -23,6 +25,7 @@ @ stdcall vkCmdCopyImageToBuffer(ptr int64 long int64 long ptr) winevulkan.wine_vkCmdCopyImageToBuffer @ stdcall vkCmdCopyQueryPoolResults(ptr int64 long long int64 int64 int64 long) winevulkan.wine_vkCmdCopyQueryPoolResults @ stdcall vkCmdDispatch(ptr long long long) winevulkan.wine_vkCmdDispatch +@ stub vkCmdDispatchBase @ stdcall vkCmdDispatchIndirect(ptr int64 int64) winevulkan.wine_vkCmdDispatchIndirect @ stdcall vkCmdDraw(ptr long long long long) winevulkan.wine_vkCmdDraw @ stdcall vkCmdDrawIndexed(ptr long long long long long) winevulkan.wine_vkCmdDrawIndexed @@ -41,6 +44,7 @@ @ stdcall vkCmdSetBlendConstants(ptr ptr) winevulkan.wine_vkCmdSetBlendConstants @ stdcall vkCmdSetDepthBias(ptr float float float) winevulkan.wine_vkCmdSetDepthBias @ stdcall vkCmdSetDepthBounds(ptr float float) winevulkan.wine_vkCmdSetDepthBounds +@ stub vkCmdSetDeviceMask @ stdcall vkCmdSetEvent(ptr int64 long) winevulkan.wine_vkCmdSetEvent @ stdcall vkCmdSetLineWidth(ptr float) winevulkan.wine_vkCmdSetLineWidth @ stdcall vkCmdSetScissor(ptr long long ptr) winevulkan.wine_vkCmdSetScissor @@ -57,6 +61,7 @@ @ stdcall vkCreateComputePipelines(ptr int64 long ptr ptr ptr) winevulkan.wine_vkCreateComputePipelines @ stdcall vkCreateDescriptorPool(ptr ptr ptr ptr) winevulkan.wine_vkCreateDescriptorPool @ stdcall vkCreateDescriptorSetLayout(ptr ptr ptr ptr) winevulkan.wine_vkCreateDescriptorSetLayout +@ stub vkCreateDescriptorUpdateTemplate @ stdcall vkCreateDevice(ptr ptr ptr ptr) winevulkan.wine_vkCreateDevice @ stub vkCreateDisplayModeKHR @ stub vkCreateDisplayPlaneSurfaceKHR @@ -72,6 +77,7 @@ @ stdcall vkCreateQueryPool(ptr ptr ptr ptr) winevulkan.wine_vkCreateQueryPool @ stdcall vkCreateRenderPass(ptr ptr ptr ptr) winevulkan.wine_vkCreateRenderPass @ stdcall vkCreateSampler(ptr ptr ptr ptr) winevulkan.wine_vkCreateSampler +@ stub vkCreateSamplerYcbcrConversion @ stdcall vkCreateSemaphore(ptr ptr ptr ptr) winevulkan.wine_vkCreateSemaphore @ stdcall vkCreateShaderModule(ptr ptr ptr ptr) winevulkan.wine_vkCreateShaderModule @ stub vkCreateSharedSwapchainsKHR @@ -82,6 +88,7 @@ @ stdcall vkDestroyCommandPool(ptr int64 ptr) winevulkan.wine_vkDestroyCommandPool @ stdcall vkDestroyDescriptorPool(ptr int64 ptr) winevulkan.wine_vkDestroyDescriptorPool @ stdcall vkDestroyDescriptorSetLayout(ptr int64 ptr) winevulkan.wine_vkDestroyDescriptorSetLayout +@ stub vkDestroyDescriptorUpdateTemplate @ stdcall vkDestroyDevice(ptr ptr) winevulkan.wine_vkDestroyDevice @ stdcall vkDestroyEvent(ptr int64 ptr) winevulkan.wine_vkDestroyEvent @ stdcall vkDestroyFence(ptr int64 ptr) winevulkan.wine_vkDestroyFence @@ -95,6 +102,7 @@ @ stdcall vkDestroyQueryPool(ptr int64 ptr) winevulkan.wine_vkDestroyQueryPool @ stdcall vkDestroyRenderPass(ptr int64 ptr) winevulkan.wine_vkDestroyRenderPass @ stdcall vkDestroySampler(ptr int64 ptr) winevulkan.wine_vkDestroySampler +@ stub vkDestroySamplerYcbcrConversion @ stdcall vkDestroySemaphore(ptr int64 ptr) winevulkan.wine_vkDestroySemaphore @ stdcall vkDestroyShaderModule(ptr int64 ptr) winevulkan.wine_vkDestroyShaderModule @ stdcall vkDestroySurfaceKHR(ptr int64 ptr) winevulkan.wine_vkDestroySurfaceKHR @@ -105,33 +113,51 @@ @ stdcall vkEnumerateDeviceLayerProperties(ptr ptr ptr) winevulkan.wine_vkEnumerateDeviceLayerProperties @ stdcall vkEnumerateInstanceExtensionProperties(str ptr ptr) @ stdcall vkEnumerateInstanceLayerProperties(ptr ptr) +@ stub vkEnumerateInstanceVersion +@ stub vkEnumeratePhysicalDeviceGroups @ stdcall vkEnumeratePhysicalDevices(ptr ptr ptr) winevulkan.wine_vkEnumeratePhysicalDevices @ stdcall vkFlushMappedMemoryRanges(ptr long ptr) winevulkan.wine_vkFlushMappedMemoryRanges @ stdcall vkFreeCommandBuffers(ptr int64 long ptr) winevulkan.wine_vkFreeCommandBuffers @ stdcall vkFreeDescriptorSets(ptr int64 long ptr) winevulkan.wine_vkFreeDescriptorSets @ stdcall vkFreeMemory(ptr int64 ptr) winevulkan.wine_vkFreeMemory @ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetBufferMemoryRequirements +@ stub vkGetBufferMemoryRequirements2 +@ stub vkGetDescriptorSetLayoutSupport +@ stub vkGetDeviceGroupPeerMemoryFeatures @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue +@ stub vkGetDeviceQueue2 @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR @ stdcall vkGetEventStatus(ptr int64) winevulkan.wine_vkGetEventStatus @ stdcall vkGetFenceStatus(ptr int64) winevulkan.wine_vkGetFenceStatus @ stdcall vkGetImageMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetImageMemoryRequirements +@ stub vkGetImageMemoryRequirements2 @ stdcall vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements +@ stub vkGetImageSparseMemoryRequirements2 @ stdcall vkGetImageSubresourceLayout(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSubresourceLayout @ stdcall vkGetInstanceProcAddr(ptr str) @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR @ stub vkGetPhysicalDeviceDisplayPropertiesKHR +@ stub vkGetPhysicalDeviceExternalBufferProperties +@ stub vkGetPhysicalDeviceExternalFenceProperties +@ stub vkGetPhysicalDeviceExternalSemaphoreProperties @ stdcall vkGetPhysicalDeviceFeatures(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceFeatures +@ stub vkGetPhysicalDeviceFeatures2 @ stdcall vkGetPhysicalDeviceFormatProperties(ptr long ptr) winevulkan.wine_vkGetPhysicalDeviceFormatProperties +@ stub vkGetPhysicalDeviceFormatProperties2 @ stdcall vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr) winevulkan.wine_vkGetPhysicalDeviceImageFormatProperties +@ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall vkGetPhysicalDeviceMemoryProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties +@ stub vkGetPhysicalDeviceMemoryProperties2 @ stdcall vkGetPhysicalDeviceProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties +@ stub vkGetPhysicalDeviceProperties2 @ stdcall vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties +@ stub vkGetPhysicalDeviceQueueFamilyProperties2 @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties +@ stub vkGetPhysicalDeviceSparseImageFormatProperties2 @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR @ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR @@ -154,6 +180,8 @@ @ stdcall vkResetEvent(ptr int64) winevulkan.wine_vkResetEvent @ stdcall vkResetFences(ptr long ptr) winevulkan.wine_vkResetFences @ stdcall vkSetEvent(ptr int64) winevulkan.wine_vkSetEvent +@ stub vkTrimCommandPool @ stdcall vkUnmapMemory(ptr int64) winevulkan.wine_vkUnmapMemory +@ stub vkUpdateDescriptorSetWithTemplate @ stdcall vkUpdateDescriptorSets(ptr long ptr long ptr) winevulkan.wine_vkUpdateDescriptorSets @ stdcall vkWaitForFences(ptr long ptr long int64) winevulkan.wine_vkWaitForFences diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 594ebdd570..41fa014526 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -95,9 +95,12 @@ BLACKLISTED_EXTENSIONS = [ # In any case callback conversion is required. "VK_EXT_debug_report", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter + "VK_EXT_external_memory_dma_buf", # Linux specific "VK_EXT_hdr_metadata", # Needs WSI work. "VK_GOOGLE_display_timing", + "VK_KHR_device_group", # Needs some thought, but part of Vulkan 1.1 Core. "VK_KHR_display", # Needs WSI work. + "VK_KHR_external_fence", "VK_KHR_external_fence_fd", "VK_KHR_external_fence_win32", "VK_KHR_external_memory", @@ -105,6 +108,7 @@ BLACKLISTED_EXTENSIONS = [ # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_external_semaphore_capabilities", "VK_KHR_shared_presentable_image", # Needs WSI work. + "VK_KHR_win32_keyed_mutex", "VK_NV_external_memory_win32" ] @@ -180,7 +184,7 @@ class Direction(Enum): class VkBaseType(object): - def __init__(self, name, _type, requires=None): + def __init__(self, name, _type, alias=False, requires=None): """ Vulkan base type class. VkBaseType is mostly used by Vulkan to define its own @@ -189,17 +193,23 @@ class VkBaseType(object): Args: name (:obj:'str'): Name of the base type. _type (:obj:'str'): Underlaying type + alias (bool): type is an alias or not. requires (:obj:'str', optional): Other types required. Often bitmask values pull in a *FlagBits type. """ self.name = name self.type = _type + self.alias = alias self.requires = requires self.required = False def definition(self): - text = "typedef {0} {1};\n".format(self.type, self.name) - return text + # Definition is similar for alias or non-alias as type + # is already set to alias. + return "typedef {0} {1};\n".format(self.type, self.name) + + def is_alias(self): + return self.alias class VkConstant(object): @@ -240,10 +250,13 @@ class VkDefine(object): # <type category="define"><name>some_name</name>some_value</type> name = name_elem.text - # VK_API_VERSION is a deprecated constant and we don't really want to parse it or generate - # code for it. However the vk.xml feature section still references it. - if name == "VK_API_VERSION": - return VkDefine(name, "") + # Perform minimal parsing for Vulkan constants, which we don't need, but are referenced + # elsewhere in vk.xml. + # - VK_API_VERSION is a messy, deprecated constant and we don't want generate code for it. + # - AHardwareBuffer/ANativeWindow are forard declarations for Android types, which leaked + # into the define region. + if name in ["VK_API_VERSION", "AHardwareBuffer", "ANativeWindow"]: + return VkDefine(name, None) # The body of the define is basically unstructured C code. It is not meant for easy parsing. # Some lines contain deprecated values or comments, which we try to filter out. @@ -257,7 +270,11 @@ class VkDefine(object): for child in define: value += child.text if child.tail is not None: - value += child.tail + # Split comments for VK_API_VERSION_1_0 / VK_API_VERSION_1_1 + if "//" in child.tail: + value += child.tail.split("//")[0] + else: + value += child.tail return VkDefine(name, value.rstrip(' ')) @@ -270,10 +287,16 @@ class VkDefine(object): class VkEnum(object): - def __init__(self, name, values): + def __init__(self, name, values, alias=False): self.name = name self.values = values self.required = False + self.alias = alias + + @staticmethod + def from_alias(enum, alias): + name = enum.attrib.get("name") + return VkEnum(name, alias.values) @staticmethod def from_xml(enum): @@ -305,6 +328,14 @@ class VkEnum(object): def add(self, value): """ Add a value to enum. """ + + # Extensions can add new enum values. When an extension is promoted to Core + # the registry defines the value twice once for old extension and once for + # new Core features. Ignore the duplicate entry. + for v in self.values: + if v.value == value.value: + LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name)) + return self.values.append(value) def definition(self): @@ -317,6 +348,9 @@ class VkEnum(object): text += "}} {0};\n\n".format(self.name) return text + def is_alias(self): + return self.alias + class VkEnumValue(object): def __init__(self, name, value, hex=False): @@ -339,11 +373,12 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extension=None): + def __init__(self, _type=None, name=None, params=[], extension=None, alias=False): self.extension = extension self.name = name self.type = _type self.params = params + self.alias = alias # For some functions we need some extra metadata from FUNCTION_OVERRIDES. func_info = FUNCTION_OVERRIDES.get(self.name, None) @@ -355,10 +390,26 @@ class VkFunction(object): # and is used by the code generation. self.required = False + @staticmethod + def from_alias(command, alias): + """ Create VkFunction from an alias command. + + Args: + command: xml data for command + alias (VkFunction): function to use as a base for types / parameters. + + Returns: + VkFunction + """ + func_name = command.attrib.get("name") + func_type = alias.type + params = alias.params + + return VkFunction(_type=func_type, name=func_name, params=params, alias=True) + @staticmethod def from_xml(command, types): proto = command.find("proto") - func_name = proto.find("name").text func_type = proto.find("type").text @@ -384,6 +435,9 @@ class VkFunction(object): return conversions + def is_alias(self): + return self.alias + def is_core_func(self): """ Returns whether the function is a Vulkan core function. Core functions are APIs defined by the Vulkan spec to be part of the @@ -716,12 +770,18 @@ class VkFunctionPointer(object): class VkHandle(object): - def __init__(self, name, _type, parent): + def __init__(self, name, _type, parent, alias=None): self.name = name self.type = _type self.parent = parent + self.alias = alias self.required = False + @staticmethod + def from_alias(handle, alias): + name = handle.attrib.get("name") + return VkHandle(name, alias.type, alias.parent, alias=alias) + @staticmethod def from_xml(handle): name = handle.find("name").text @@ -748,14 +808,25 @@ class VkHandle(object): def definition(self): """ Generates handle definition e.g. VK_DEFINE_HANDLE(vkInstance) """ + + # Legacy types are typedef'ed to the new type if they are aliases. + if self.is_alias(): + return "typedef {0} {1};\n".format(self.alias.name, self.name) + return "{0}({1})\n".format(self.type, self.name) + def is_alias(self): + return self.alias is not None + def is_dispatchable(self): """ Some handles like VkInstance, VkDevice are dispatchable objects, which means they contain a dispatch table of function pointers. """ return self.type == "VK_DEFINE_HANDLE" + def is_required(self): + return self.required + def native_handle(self): """ Provide access to the native handle of a dispatchable object. @@ -1331,11 +1402,11 @@ class VkParam(object): if not self.is_struct(): return False - # VkSparseImageMemoryRequirements is used by vkGetImageSparseMemoryRequirements. + # VkSparseImageMemoryRequirements(2) is used by vkGetImageSparseMemoryRequirements(2). # This function is tricky to wrap, because how to wrap depends on whether - # pSparseMemoryRequirements is NULL or not. Luckily for VkSparseImageMemoryRequirements + # pSparseMemoryRequirements is NULL or not. Luckily for VkSparseImageMemoryRequirements(2) # the alignment works out in such a way that no conversion is needed between win32 and Linux. - if self.type == "VkSparseImageMemoryRequirements": + if self.type in ["VkSparseImageMemoryRequirements", "VkSparseImageMemoryRequirements2"]: return False # If a structure needs alignment changes, it means we need to @@ -1405,11 +1476,12 @@ class VkParam(object): class VkStruct(Sequence): """ Class which represents the type union and struct. """ - def __init__(self, name, members, returnedonly, union=False): + def __init__(self, name, members, returnedonly, alias=False, union=False): self.name = name self.members = members self.returnedonly = returnedonly self.required = False + self.alias = alias self.union = union self.type_info = None # To be set later. @@ -1419,6 +1491,11 @@ class VkStruct(Sequence): def __len__(self): return len(self.members) + @staticmethod + def from_alias(struct, alias): + name = struct.attrib.get("name") + return VkStruct(name, alias.members, alias.returnedonly, alias=True) + @staticmethod def from_xml(struct): # Unions and structs are the same parsing wise, but we need to @@ -1462,6 +1539,10 @@ class VkStruct(Sequence): if not (m.is_struct() or m.is_union()): continue + # VkBaseInstructure and VkBaseOutStructure reference themselves. + if m.type == struct.name: + break + found = False # Check if a struct we depend on has already been defined. for s in decoupled_structs: @@ -1519,6 +1600,9 @@ class VkStruct(Sequence): text += "}} {0};\n\n".format(self.name) return text + def is_alias(self): + return self.alias + def needs_alignment(self): """ Check if structure needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due @@ -2059,7 +2143,10 @@ class VkGenerator(object): f.write(define.definition()) for handle in self.registry.handles: - if handle.required: + # For backwards compatiblity also create definitions for aliases. + # These types normally don't get pulled in as we use the new types + # even in legacy functions if they are aliases. + if handle.is_required() or handle.is_alias(): f.write(handle.definition()) f.write("\n") @@ -2269,10 +2356,29 @@ class VkRegistry(object): """ Parse command section containing the Vulkan function calls. """ funcs = {} commands = root.findall("./commands/") + + # As of Vulkan 1.1, various extensions got promoted to Core. + # The old commands (e.g. KHR) are available for backwards compatibility + # and are marked in vk.xml as 'alias' to the non-extension type. + # The registry likes to avoid data duplication, so parameters and other + # metadata need to be looked up from the Core command. + # We parse the alias commands in a second pass. + alias_commands = [] for command in commands: + alias_name = command.attrib.get("alias") + if alias_name: + alias_commands.append(command) + continue + func = VkFunction.from_xml(command, self.types) funcs[func.name] = func + for command in alias_commands: + alias_name = command.attrib.get("alias") + alias = funcs[alias_name] + func = VkFunction.from_alias(command, alias) + funcs[func.name] = func + # To make life easy for the code generation, separate all function # calls out in the 3 types of Vulkan functions: device, global and instance. device_funcs = [] @@ -2307,9 +2413,14 @@ class VkRegistry(object): enums[name] = VkEnum.from_xml(enum) else: # If no type is set, we are dealing with API constants. - values = [] for value in enum.findall("enum"): - self.consts.append(VkConstant(value.attrib.get("name"), value.attrib.get("value"))) + # If enum is an alias, set the value to the alias name. + # E.g. VK_LUID_SIZE_KHR is an alias to VK_LUID_SIZE. + alias = value.attrib.get("alias") + if alias: + self.consts.append(VkConstant(value.attrib.get("name"), alias)) + else: + self.consts.append(VkConstant(value.attrib.get("name"), value.attrib.get("value"))) self.enums = OrderedDict(sorted(enums.items())) @@ -2363,6 +2474,10 @@ class VkRegistry(object): # different features (e.g. Vulkan 1.1). Parse each require section # separately, so we can skip sections we don't want. for require in ext.findall("require"): + feature = require.attrib.get("feature") + if feature == "VK_VERSION_1_1": + continue + # Extensions can add enum values to Core / extension enums, so add these. for enum_elem in require.findall("enum"): if "bitpos" in enum_elem.keys(): @@ -2412,7 +2527,10 @@ class VkRegistry(object): def _parse_features(self, root): """ Parse the feature section, which describes Core commands and types needed. """ - requires = root.findall("./feature/require") + + # For now limit to 1.0 features as various 1.1 features need more work. + # In particular interop extensions promoted to Core. + requires = root.findall("./feature/[@name='VK_VERSION_1_0']/require") for require in requires: LOGGER.info("Including features for {0}".format(require.attrib.get("comment"))) @@ -2420,8 +2538,10 @@ class VkRegistry(object): # Only deal with command. Other values which appear are enum and type for pulling in some # constants and macros. Tricky to parse, so don't bother right now, we will generate them # anyway for now. - name = tag.attrib["name"] - if tag.tag == "command": + if tag.tag == "comment": + continue + elif tag.tag == "command": + name = tag.attrib["name"] self._mark_command_required(name) elif tag.tag == "enum": # We could pull in relevant constants here. Unfortunately @@ -2431,6 +2551,7 @@ class VkRegistry(object): pass elif tag.tag == "type": # Pull in types which may not have been pulled in through commands. + name = tag.attrib["name"] # Skip pull in for vk_platform.h for now. if name == "vk_platform": @@ -2450,10 +2571,18 @@ class VkRegistry(object): handles = [] structs = [] + alias_types = [] for t in types: type_info = {} type_info["category"] = t.attrib.get("category", None) + # We parse aliases in a second pass when we know more. + alias = t.attrib.get("alias") + if alias: + LOGGER.debug("Alias found: {0}".format(alias)) + alias_types.append(t) + continue + if type_info["category"] in ["include"]: continue @@ -2476,7 +2605,6 @@ class VkRegistry(object): type_info["data"] = bitmask if type_info["category"] == "define": - name = t.attrib.get("name") define = VkDefine.from_xml(t) defines.append(define) type_info["data"] = define @@ -2525,6 +2653,37 @@ class VkRegistry(object): # names. self.types[type_info["name"]] = type_info + # Second pass for alias types, so we can retrieve all data from + # the aliased object. + for t in alias_types: + type_info = {} + type_info["category"] = t.attrib.get("category") + type_info["name"] = t.attrib.get("name") + + alias = t.attrib.get("alias") + + if type_info["category"] == "bitmask": + bitmask = VkBaseType(type_info["name"], alias, alias=True) + bitmasks.append(bitmask) + type_info["data"] = bitmask + + if type_info["category"] == "enum": + enum = VkEnum.from_alias(t, self.types[alias]["data"]) + type_info["data"] = enum + self.enums[enum.name] = enum + + if type_info["category"] == "handle": + handle = VkHandle.from_alias(t, self.types[alias]["data"]) + handles.append(handle) + type_info["data"] = handle + + if type_info["category"] == "struct": + struct = VkStruct.from_alias(t, self.types[alias]["data"]) + structs.append(struct) + type_info["data"] = struct + + self.types[type_info["name"]] = type_info + # We need detailed type information during code generation # on structs for alignment reasons. Unfortunately structs # are parsed among other types, so there is no guarantee @@ -2538,6 +2697,7 @@ class VkRegistry(object): self.base_types = sorted(base_types, key=lambda base_type: base_type.name) self.bitmasks = sorted(bitmasks, key=lambda bitmask: bitmask.name) self.defines = defines + self.enums = OrderedDict(sorted(self.enums.items())) self.funcpointers = sorted(funcpointers, key=lambda fp: fp.name) self.handles = sorted(handles, key=lambda handle: handle.name) self.structs = sorted(structs, key=lambda struct: struct.name) diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml index e013ce8b60..7018bbe842 100644 --- a/dlls/winevulkan/vk.xml +++ b/dlls/winevulkan/vk.xml @@ -1,92 +1,131 @@ <?xml version="1.0" encoding="UTF-8"?> <registry> <comment> -Copyright (c) 2015-2017 The Khronos Group Inc. +Copyright (c) 2015-2018 The Khronos Group Inc. -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. + http://www.apache.org/licenses/LICENSE-2.0 -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. ------------------------------------------------------------------------- +---- Exceptions to the Apache 2.0 License: ---- +As an exception, if you use this Software to generate code and portions of +this Software are embedded into the generated code as a result, you may +redistribute such product without providing attribution as would otherwise +be required by Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link code generated by this Software with +software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +("`Combined Software`") and if a court of competent jurisdiction determines +that the patent provision (Section 3), the indemnity provision (Section 9) +or other Section of the License conflicts with the conditions of the +applicable GPL or LGPL license, you may retroactively and prospectively +choose to deem waived or otherwise exclude such Section(s) of the License, +but only in their entirety and only with respect to the Combined Software. + </comment> + + <comment> This file, vk.xml, is the Vulkan API Registry. It is a critically important and normative part of the Vulkan Specification, including a canonical machine-readable definition of the API, parameter and member validation language incorporated into the Specification and reference pages, and other material which is registered by Khronos, such as tags used by extension and -layer authors. The only authoritative version of vk.xml is the one -maintained in the master branch of the Khronos Vulkan GitHub project. +layer authors. The authoritative public version of vk.xml is maintained in +the master branch of the Khronos Vulkan GitHub project. The authoritative +private version is maintained in the master branch of the member gitlab +server. </comment> -  - <vendorids> + <vendorids comment="Vulkan vendor IDs for physical devices without PCI vendor IDs"> <vendorid name="KHR" id="0x10000" comment="This is the next available Khronos vendor ID"/> <vendorid name="VIV" id="0x10001" comment="Vivante vendor ID"/> <vendorid name="VSI" id="0x10002" comment="VeriSilicon vendor ID"/> + <vendorid name="KAZAN" id="0x10003" comment="Kazan Software Renderer"/> </vendorids> -  - <tags> + <platforms comment="Vulkan platform names, reserved for use with platform- and window system-specific extensions"> + <platform name="xlib" protect="VK_USE_PLATFORM_XLIB_KHR" comment="X Window System, Xlib client library"/> + <platform name="xlib_xrandr" protect="VK_USE_PLATFORM_XLIB_XRANDR_EXT" comment="X Window System, Xlib client library, XRandR extension"/> + <platform name="xcb" protect="VK_USE_PLATFORM_XCB_KHR" comment="X Window System, Xcb client library"/> + <platform name="wayland" protect="VK_USE_PLATFORM_WAYLAND_KHR" comment="Wayland display server protocol"/> + <platform name="mir" protect="VK_USE_PLATFORM_MIR_KHR" comment="Mir display server"/> + <platform name="android" protect="VK_USE_PLATFORM_ANDROID_KHR" comment="Android OS"/> + <platform name="win32" protect="VK_USE_PLATFORM_WIN32_KHR" comment="Microsoft Win32 API (also refers to Win64 apps)"/> + <platform name="vi" protect="VK_USE_PLATFORM_VI_NN" comment="Nintendo Vi"/> + <platform name="ios" protect="VK_USE_PLATFORM_IOS_MVK" comment="Apple IOS"/> + <platform name="macos" protect="VK_USE_PLATFORM_MACOS_MVK" comment="Apple MacOS"/> + </platforms> + + <tags comment="Vulkan vendor/author tags for extensions and layers"> <tag name="IMG" author="Imagination Technologies" contact="Michael Worcester @michaelworcester"/> - <tag name="AMD" author="Advanced Micro Devices, Inc." contact="Daniel Rakos @aqnuep"/> - <tag name="ARM" author="ARM Limited" contact="Jan-Harald Fredriksen @janharald"/> + <tag name="AMD" author="Advanced Micro Devices, Inc." contact="Daniel Rakos @drakos-amd"/> + <tag name="AMDX" author="Advanced Micro Devices, Inc." contact="Daniel Rakos @drakos-amd"/> + <tag name="ARM" author="ARM Limited" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm"/> <tag name="FSL" author="Freescale Semiconductor, Inc." contact="Norbert Nopper @FslNopper"/> <tag name="BRCM" author="Broadcom Corporation" contact="Graeme Leese @gnl21"/> <tag name="NXP" author="NXP Semiconductors N.V." contact="Norbert Nopper @FslNopper"/> <tag name="NV" author="NVIDIA Corporation" contact="Daniel Koch @dgkoch"/> <tag name="NVX" author="NVIDIA Corporation" contact="Daniel Koch @dgkoch"/> - <tag name="VIV" author="Vivante Corporation" contact="Yanjun Zhang @yanjunzhang"/> - <tag name="VSI" author="VeriSilicon Holdings Co., Ltd." contact="Yanjun Zhang @yanjunzhang"/> + <tag name="VIV" author="Vivante Corporation" contact="Yanjun Zhang gitlab:@yanjunzhang"/> + <tag name="VSI" author="VeriSilicon Holdings Co., Ltd." contact="Yanjun Zhang gitlab:@yanjunzhang"/> <tag name="KDAB" author="KDAB" contact="Sean Harmer @seanharmer"/> - <tag name="ANDROID" author="Google, Inc." contact="Jesse Hall @jessehall"/> - <tag name="CHROMIUM" author="Google, Inc." contact="Jesse Hall @jessehall"/> - <tag name="GOOGLE" author="Google, Inc." contact="Jesse Hall @jessehall"/> + <tag name="ANDROID" author="Google, Inc." contact="Jesse Hall @critsec"/> + <tag name="CHROMIUM" author="Google, Inc." contact="Jesse Hall @critsec"/> + <tag name="GOOGLE" author="Google, Inc." contact="Jesse Hall @critsec"/> <tag name="QCOM" author="Qualcomm Technologies, Inc." contact="Maurice Ribble @mribble"/> - <tag name="LUNARG" author="LunarG, Inc." contact="Karen Ghavam @KarenGhavam"/> + <tag name="LUNARG" author="LunarG, Inc." contact="Karen Ghavam @karenghavam-lunarg"/> <tag name="SAMSUNG" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> <tag name="SEC" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> <tag name="TIZEN" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> - <tag name="RENDERDOC" author="RenderDoc (renderdoc.org)" contact="baldurk(a)baldurk.org"/> - <tag name="NN" author="Nintendo Co., Ltd." contact="Yasuhiro Yoshioka @yoshioka_yasuhiro"/> + <tag name="RENDERDOC" author="RenderDoc (renderdoc.org)" contact="Baldur Karlsson @baldurk"/> + <tag name="NN" author="Nintendo Co., Ltd." contact="Yasuhiro Yoshioka gitlab:@yoshioka_yasuhiro"/> <tag name="MVK" author="The Brenwill Workshop Ltd." contact="Bill Hollings @billhollings"/> - <tag name="KHR" author="Khronos" contact="Tom Olson @tom.olson"/> + <tag name="KHR" author="Khronos" contact="Tom Olson @tomolson"/> + <tag name="KHX" author="Khronos" contact="Tom Olson @tomolson"/> <tag name="EXT" author="Multivendor" contact="Jon Leech @oddhack"/> <tag name="MESA" author="Mesa open source project" contact="Chad Versace @chadversary, Daniel Stone @fooishbar, David Airlie @airlied, Jason Ekstrand @jekstrand"/> </tags> -  - <types> + <types comment="Vulkan type definitions"> <type name="vk_platform" category="include">#include "vk_platform.h"</type> -  - <type category="include">#include "<name>vulkan.h</name>"</type> - <type category="include">#include <<name>X11/Xlib.h</name>></type> - <type category="include">#include <<name>X11/extensions/Xrandr.h</name>></type> - <type category="include">#include <<name>android/native_window.h</name>></type> - <type category="include">#include <<name>mir_toolkit/client_types.h</name>></type> - <type category="include">#include <<name>wayland-client.h</name>></type> - <type category="include">#include <<name>windows.h</name>></type> - <type category="include">#include <<name>xcb/xcb.h</name>></type> + + <comment>WSI extensions</comment> + + <type category="include" name="X11/Xlib.h"/> + <type category="include" name="X11/extensions/Xrandr.h"/> + <type category="include" name="mir_toolkit/client_types.h"/> + <type category="include" name="wayland-client.h"/> + <type category="include" name="windows.h"/> + <type category="include" name="xcb/xcb.h"/> + <comment> + In the current header structure, each platform's interfaces + are confined to a platform-specific header (vulkan_xlib.h, + vulkan_win32.h, etc.). These headers are not self-contained, + and should not include native headers (X11/Xlib.h, + windows.h, etc.). Code should either include vulkan.h after + defining the appropriate VK_USE_PLATFORM_platform_KHR + macros, or include the required native headers prior to + explicitly including the corresponding platform header. + + To accomplish this, the dependencies of native types require + native headers, but the XML defines the content for those + native headers as empty. The actual native header includes + can be restored by modifying the native header tags above + to #include the header file in the 'name' attribute. + </comment> <type requires="X11/Xlib.h" name="Display"/> <type requires="X11/Xlib.h" name="VisualID"/> <type requires="X11/Xlib.h" name="Window"/> <type requires="X11/extensions/Xrandr.h" name="RROutput"/> - <type requires="android/native_window.h" name="ANativeWindow"/> <type requires="mir_toolkit/client_types.h" name="MirConnection"/> <type requires="mir_toolkit/client_types.h" name="MirSurface"/> <type requires="wayland-client.h" name="wl_display"/> @@ -108,11 +147,13 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type category="define">#define <name>VK_VERSION_PATCH</name>(version) ((uint32_t)(version) & 0xfff)</type> <type category="define">// DEPRECATED: This define has been removed. Specific version defines (e.g. VK_API_VERSION_1_0), or the VK_MAKE_VERSION macro, should be used instead. -//#define <name>VK_API_VERSION</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type>  +//#define <name>VK_API_VERSION</name> <type>VK_MAKE_VERSION</type>(1, 0, 0) // Patch version should always be set to 0</type> <type category="define">// Vulkan 1.0 version number -#define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type>  +#define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)// Patch version should always be set to 0</type> + <type category="define">// Vulkan 1.1 version number +#define <name>VK_API_VERSION_1_1</name> <type>VK_MAKE_VERSION</type>(1, 1, 0)// Patch version should always be set to 0</type> <type category="define">// Version of this file -#define <name>VK_HEADER_VERSION</name> 51</type> +#define <name>VK_HEADER_VERSION</name> 76</type> <type category="define"> #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type> @@ -131,11 +172,15 @@ maintained in the master branch of the Khronos Vulkan GitHub project. #define <name>VK_NULL_HANDLE</name> 0 </type> + <type category="define">struct <name>ANativeWindow</name>;</type> + <type category="define">struct <name>AHardwareBuffer</name>;</type> + <type category="basetype">typedef <type>uint32_t</type> <name>VkSampleMask</name>;</type> <type category="basetype">typedef <type>uint32_t</type> <name>VkBool32</name>;</type> <type category="basetype">typedef <type>uint32_t</type> <name>VkFlags</name>;</type> <type category="basetype">typedef <type>uint64_t</type> <name>VkDeviceSize</name>;</type> -  + + <comment>Basic C types, pulled in via vk_platform.h</comment> <type requires="vk_platform" name="void"/> <type requires="vk_platform" name="char"/> <type requires="vk_platform" name="float"/> @@ -145,103 +190,130 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type requires="vk_platform" name="int32_t"/> <type requires="vk_platform" name="size_t"/> <type name="int"/> -  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkFramebufferCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPoolCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkRenderPassCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkSamplerCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineLayoutCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCacheCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDepthStencilStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDynamicStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineColorBlendStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineMultisampleStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineRasterizationStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineTessellationStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineInputAssemblyStateCreateFlags</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineVertexInputStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineShaderStageCreateFlags</name>;</type>  - <type requires="VkDescriptorSetLayoutCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorSetLayoutCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkBufferViewCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkInstanceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceQueueCreateFlags</name>;</type>  - <type requires="VkQueueFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueueFlags</name>;</type>  - <type requires="VkMemoryPropertyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryPropertyFlags</name>;</type>  - <type requires="VkMemoryHeapFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryHeapFlags</name>;</type>  - <type requires="VkAccessFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAccessFlags</name>;</type>  - <type requires="VkBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferUsageFlags</name>;</type>  - <type requires="VkBufferCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferCreateFlags</name>;</type>  - <type requires="VkShaderStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkShaderStageFlags</name>;</type>  - <type requires="VkImageUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageUsageFlags</name>;</type>  - <type requires="VkImageCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkImageViewCreateFlags</name>;</type>  - <type requires="VkPipelineCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCreateFlags</name>;</type>  - <type requires="VkColorComponentFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkColorComponentFlags</name>;</type>  - <type requires="VkFenceCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFenceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkSemaphoreCreateFlags</name>;</type>  - <type requires="VkFormatFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFormatFeatureFlags</name>;</type>  - <type requires="VkQueryControlFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryControlFlags</name>;</type>  - <type requires="VkQueryResultFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryResultFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkShaderModuleCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkEventCreateFlags</name>;</type>  - <type requires="VkCommandPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolCreateFlags</name>;</type>  - <type requires="VkCommandPoolResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolResetFlags</name>;</type>  - <type requires="VkCommandBufferResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferResetFlags</name>;</type>  - <type requires="VkCommandBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferUsageFlags</name>;</type>  - <type requires="VkQueryPipelineStatisticFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPipelineStatisticFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryMapFlags</name>;</type>  - <type requires="VkImageAspectFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageAspectFlags</name>;</type>  - <type requires="VkSparseMemoryBindFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseMemoryBindFlags</name>;</type>  - <type requires="VkSparseImageFormatFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseImageFormatFlags</name>;</type>  - <type requires="VkSubpassDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSubpassDescriptionFlags</name>;</type>  - <type requires="VkPipelineStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineStageFlags</name>;</type>  - <type requires="VkSampleCountFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSampleCountFlags</name>;</type>  - <type requires="VkAttachmentDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAttachmentDescriptionFlags</name>;</type>  - <type requires="VkStencilFaceFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkStencilFaceFlags</name>;</type>  - <type requires="VkCullModeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCullModeFlags</name>;</type>  - <type requires="VkDescriptorPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolResetFlags</name>;</type>  - <type requires="VkDependencyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDependencyFlags</name>;</type>  - <type requires="VkIndirectCommandsLayoutUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkIndirectCommandsLayoutUsageFlagsNVX</name>;</type>  - <type requires="VkObjectEntryUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkObjectEntryUsageFlagsNVX</name>;</type>  + <comment>Bitmask types</comment> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkFramebufferCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPoolCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkRenderPassCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkSamplerCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineLayoutCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCacheCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDepthStencilStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDynamicStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineColorBlendStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineMultisampleStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineRasterizationStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineTessellationStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineInputAssemblyStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineVertexInputStateCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineShaderStageCreateFlags</name>;</type> + <type requires="VkDescriptorSetLayoutCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorSetLayoutCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkBufferViewCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkInstanceCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceCreateFlags</name>;</type> + <type requires="VkDeviceQueueCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceQueueCreateFlags</name>;</type> + <type requires="VkQueueFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueueFlags</name>;</type> + <type requires="VkMemoryPropertyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryPropertyFlags</name>;</type> + <type requires="VkMemoryHeapFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryHeapFlags</name>;</type> + <type requires="VkAccessFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAccessFlags</name>;</type> + <type requires="VkBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferUsageFlags</name>;</type> + <type requires="VkBufferCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferCreateFlags</name>;</type> + <type requires="VkShaderStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkShaderStageFlags</name>;</type> + <type requires="VkImageUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageUsageFlags</name>;</type> + <type requires="VkImageCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkImageViewCreateFlags</name>;</type> + <type requires="VkPipelineCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCreateFlags</name>;</type> + <type requires="VkColorComponentFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkColorComponentFlags</name>;</type> + <type requires="VkFenceCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFenceCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkSemaphoreCreateFlags</name>;</type> + <type requires="VkFormatFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFormatFeatureFlags</name>;</type> + <type requires="VkQueryControlFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryControlFlags</name>;</type> + <type requires="VkQueryResultFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryResultFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkShaderModuleCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkEventCreateFlags</name>;</type> + <type requires="VkCommandPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolCreateFlags</name>;</type> + <type requires="VkCommandPoolResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolResetFlags</name>;</type> + <type requires="VkCommandBufferResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferResetFlags</name>;</type> + <type requires="VkCommandBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferUsageFlags</name>;</type> + <type requires="VkQueryPipelineStatisticFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPipelineStatisticFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryMapFlags</name>;</type> + <type requires="VkImageAspectFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageAspectFlags</name>;</type> + <type requires="VkSparseMemoryBindFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseMemoryBindFlags</name>;</type> + <type requires="VkSparseImageFormatFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseImageFormatFlags</name>;</type> + <type requires="VkSubpassDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSubpassDescriptionFlags</name>;</type> + <type requires="VkPipelineStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineStageFlags</name>;</type> + <type requires="VkSampleCountFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSampleCountFlags</name>;</type> + <type requires="VkAttachmentDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAttachmentDescriptionFlags</name>;</type> + <type requires="VkStencilFaceFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkStencilFaceFlags</name>;</type> + <type requires="VkCullModeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCullModeFlags</name>;</type> + <type requires="VkDescriptorPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolCreateFlags</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolResetFlags</name>;</type> + <type requires="VkDependencyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDependencyFlags</name>;</type> + <type requires="VkSubgroupFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSubgroupFeatureFlags</name>;</type> + <type requires="VkIndirectCommandsLayoutUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkIndirectCommandsLayoutUsageFlagsNVX</name>;</type> + <type requires="VkObjectEntryUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkObjectEntryUsageFlagsNVX</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorUpdateTemplateCreateFlagsKHR</name>;</type>  -  + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorUpdateTemplateCreateFlags</name>;</type> + <type category="bitmask" name="VkDescriptorUpdateTemplateCreateFlagsKHR" alias="VkDescriptorUpdateTemplateCreateFlags"/> + + <comment>WSI extensions</comment> <type requires="VkCompositeAlphaFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkCompositeAlphaFlagsKHR</name>;</type> <type requires="VkDisplayPlaneAlphaFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkDisplayPlaneAlphaFlagsKHR</name>;</type> <type requires="VkSurfaceTransformFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkSurfaceTransformFlagsKHR</name>;</type> - <type requires="VkSwapchainCreateFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkSwapchainCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplayModeCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplaySurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkAndroidSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMirSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkViSurfaceCreateFlagsNN</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkWaylandSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkWin32SurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkXlibSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkXcbSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkIOSSurfaceCreateFlagsMVK</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMacOSSurfaceCreateFlagsMVK</name>;</type>  - <type requires="VkPeerMemoryFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkPeerMemoryFeatureFlagsKHX</name>;</type>  - <type requires="VkMemoryAllocateFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryAllocateFlagsKHX</name>;</type>  - <type requires="VkDeviceGroupPresentModeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceGroupPresentModeFlagsKHX</name>;</type> + <type requires="VkSwapchainCreateFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkSwapchainCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplayModeCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplaySurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkAndroidSurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkMirSurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkViSurfaceCreateFlagsNN</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkWaylandSurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkWin32SurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkXlibSurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkXcbSurfaceCreateFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkIOSSurfaceCreateFlagsMVK</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkMacOSSurfaceCreateFlagsMVK</name>;</type> + <type requires="VkPeerMemoryFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPeerMemoryFeatureFlags</name>;</type> + <type category="bitmask" name="VkPeerMemoryFeatureFlagsKHR" alias="VkPeerMemoryFeatureFlags"/> + <type requires="VkMemoryAllocateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryAllocateFlags</name>;</type> + <type category="bitmask" name="VkMemoryAllocateFlagsKHR" alias="VkMemoryAllocateFlags"/> + <type requires="VkDeviceGroupPresentModeFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceGroupPresentModeFlagsKHR</name>;</type> <type requires="VkDebugReportFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkDebugReportFlagsEXT</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolTrimFlagsKHR</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolTrimFlags</name>;</type> + <type category="bitmask" name="VkCommandPoolTrimFlagsKHR" alias="VkCommandPoolTrimFlags"/> <type requires="VkExternalMemoryHandleTypeFlagBitsNV" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryHandleTypeFlagsNV</name>;</type> <type requires="VkExternalMemoryFeatureFlagBitsNV" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryFeatureFlagsNV</name>;</type> - <type requires="VkExternalMemoryHandleTypeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryHandleTypeFlagsKHX</name>;</type> - <type requires="VkExternalMemoryFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryFeatureFlagsKHX</name>;</type> - <type requires="VkExternalSemaphoreHandleTypeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreHandleTypeFlagsKHX</name>;</type> - <type requires="VkExternalSemaphoreFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreFeatureFlagsKHX</name>;</type> + <type requires="VkExternalMemoryHandleTypeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryHandleTypeFlags</name>;</type> + <type category="bitmask" name="VkExternalMemoryHandleTypeFlagsKHR" alias="VkExternalMemoryHandleTypeFlags"/> + <type requires="VkExternalMemoryFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryFeatureFlags</name>;</type> + <type category="bitmask" name="VkExternalMemoryFeatureFlagsKHR" alias="VkExternalMemoryFeatureFlags"/> + <type requires="VkExternalSemaphoreHandleTypeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreHandleTypeFlags</name>;</type> + <type category="bitmask" name="VkExternalSemaphoreHandleTypeFlagsKHR" alias="VkExternalSemaphoreHandleTypeFlags"/> + <type requires="VkExternalSemaphoreFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreFeatureFlags</name>;</type> + <type category="bitmask" name="VkExternalSemaphoreFeatureFlagsKHR" alias="VkExternalSemaphoreFeatureFlags"/> + <type requires="VkSemaphoreImportFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSemaphoreImportFlags</name>;</type> + <type category="bitmask" name="VkSemaphoreImportFlagsKHR" alias="VkSemaphoreImportFlags"/> + <type requires="VkExternalFenceHandleTypeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalFenceHandleTypeFlags</name>;</type> + <type category="bitmask" name="VkExternalFenceHandleTypeFlagsKHR" alias="VkExternalFenceHandleTypeFlags"/> + <type requires="VkExternalFenceFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalFenceFeatureFlags</name>;</type> + <type category="bitmask" name="VkExternalFenceFeatureFlagsKHR" alias="VkExternalFenceFeatureFlags"/> + <type requires="VkFenceImportFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFenceImportFlags</name>;</type> + <type category="bitmask" name="VkFenceImportFlagsKHR" alias="VkFenceImportFlags"/> <type requires="VkSurfaceCounterFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkSurfaceCounterFlagsEXT</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportSwizzleStateCreateFlagsNV</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDiscardRectangleStateCreateFlagsEXT</name>;</type>  + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportSwizzleStateCreateFlagsNV</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDiscardRectangleStateCreateFlagsEXT</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCoverageToColorStateCreateFlagsNV</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCoverageModulationStateCreateFlagsNV</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkValidationCacheCreateFlagsEXT</name>;</type> + <type requires="VkDebugUtilsMessageSeverityFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkDebugUtilsMessageSeverityFlagsEXT</name>;</type> + <type requires="VkDebugUtilsMessageTypeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkDebugUtilsMessageTypeFlagsEXT</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDebugUtilsMessengerCreateFlagsEXT</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkDebugUtilsMessengerCallbackDataFlagsEXT</name>;</type> + <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineRasterizationConservativeStateCreateFlagsEXT</name>;</type> + <type requires="VkDescriptorBindingFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorBindingFlagsEXT</name>;</type> -  + <comment>Types which can be void pointers or class pointers, selected at compile time</comment> <type category="handle"><type>VK_DEFINE_HANDLE</type>(<name>VkInstance</name>)</type> <type category="handle" parent="VkInstance"><type>VK_DEFINE_HANDLE</type>(<name>VkPhysicalDevice</name>)</type> <type category="handle" parent="VkPhysicalDevice"><type>VK_DEFINE_HANDLE</type>(<name>VkDevice</name>)</type> @@ -269,16 +341,21 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkPipelineCache</name>)</type> <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkObjectTableNVX</name>)</type> <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkIndirectCommandsLayoutNVX</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorUpdateTemplateKHR</name>)</type> + <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorUpdateTemplate</name>)</type> + <type category="handle" name="VkDescriptorUpdateTemplateKHR" alias="VkDescriptorUpdateTemplate"/> + <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSamplerYcbcrConversion</name>)</type> + <type category="handle" name="VkSamplerYcbcrConversionKHR" alias="VkSamplerYcbcrConversion"/> + <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkValidationCacheEXT</name>)</type> -  + <comment>WSI extensions</comment> <type category="handle"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayKHR</name>)</type> <type category="handle" parent="VkPhysicalDevice,VkDisplayKHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayModeKHR</name>)</type> <type category="handle" parent="VkInstance"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSurfaceKHR</name>)</type> <type category="handle" parent="VkSurfaceKHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSwapchainKHR</name>)</type> <type category="handle" parent="VkInstance"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDebugReportCallbackEXT</name>)</type> + <type category="handle" parent="VkInstance"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDebugUtilsMessengerEXT</name>)</type> -  + <comment>Types generated from corresponding enums tags below</comment> <type name="VkAttachmentLoadOp" category="enum"/> <type name="VkAttachmentStoreOp" category="enum"/> <type name="VkBlendFactor" category="enum"/> @@ -366,16 +443,27 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type name="VkDescriptorPoolCreateFlagBits" category="enum"/> <type name="VkDependencyFlagBits" category="enum"/> <type name="VkObjectType" category="enum"/> -  + <type name="VkDescriptorBindingFlagBitsEXT" category="enum"/> + + <comment>Extensions</comment> <type name="VkIndirectCommandsLayoutUsageFlagBitsNVX" category="enum"/> <type name="VkIndirectCommandsTokenTypeNVX" category="enum"/> <type name="VkObjectEntryUsageFlagBitsNVX" category="enum"/> <type name="VkObjectEntryTypeNVX" category="enum"/> - <type name="VkDescriptorUpdateTemplateTypeKHR" category="enum"/> + <type name="VkDescriptorUpdateTemplateType" category="enum"/> + <type category="enum" name="VkDescriptorUpdateTemplateTypeKHR" alias="VkDescriptorUpdateTemplateType"/> <type name="VkViewportCoordinateSwizzleNV" category="enum"/> <type name="VkDiscardRectangleModeEXT" category="enum"/> <type name="VkSubpassDescriptionFlagBits" category="enum"/> -  + <type name="VkPointClippingBehavior" category="enum"/> + <type category="enum" name="VkPointClippingBehaviorKHR" alias="VkPointClippingBehavior"/> + <type name="VkCoverageModulationModeNV" category="enum"/> + <type name="VkValidationCacheHeaderVersionEXT" category="enum"/> + <type name="VkShaderInfoTypeAMD" category="enum"/> + <type name="VkQueueGlobalPriorityEXT" category="enum"/> + <type name="VkConservativeRasterizationModeEXT" category="enum"/> + + <comment>WSI extensions</comment> <type name="VkColorSpaceKHR" category="enum"/> <type name="VkCompositeAlphaFlagBitsKHR" category="enum"/> <type name="VkDisplayPlaneAlphaFlagBitsKHR" category="enum"/> @@ -387,20 +475,47 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type name="VkExternalMemoryHandleTypeFlagBitsNV" category="enum"/> <type name="VkExternalMemoryFeatureFlagBitsNV" category="enum"/> <type name="VkValidationCheckEXT" category="enum"/> - <type name="VkExternalMemoryHandleTypeFlagBitsKHX" category="enum"/> - <type name="VkExternalMemoryFeatureFlagBitsKHX" category="enum"/> - <type name="VkExternalSemaphoreHandleTypeFlagBitsKHX" category="enum"/> - <type name="VkExternalSemaphoreFeatureFlagBitsKHX" category="enum"/> + <type name="VkExternalMemoryHandleTypeFlagBits" category="enum"/> + <type category="enum" name="VkExternalMemoryHandleTypeFlagBitsKHR" alias="VkExternalMemoryHandleTypeFlagBits"/> + <type name="VkExternalMemoryFeatureFlagBits" category="enum"/> + <type category="enum" name="VkExternalMemoryFeatureFlagBitsKHR" alias="VkExternalMemoryFeatureFlagBits"/> + <type name="VkExternalSemaphoreHandleTypeFlagBits" category="enum"/> + <type category="enum" name="VkExternalSemaphoreHandleTypeFlagBitsKHR" alias="VkExternalSemaphoreHandleTypeFlagBits"/> + <type name="VkExternalSemaphoreFeatureFlagBits" category="enum"/> + <type category="enum" name="VkExternalSemaphoreFeatureFlagBitsKHR" alias="VkExternalSemaphoreFeatureFlagBits"/> + <type name="VkSemaphoreImportFlagBits" category="enum"/> + <type category="enum" name="VkSemaphoreImportFlagBitsKHR" alias="VkSemaphoreImportFlagBits"/> + <type name="VkExternalFenceHandleTypeFlagBits" category="enum"/> + <type category="enum" name="VkExternalFenceHandleTypeFlagBitsKHR" alias="VkExternalFenceHandleTypeFlagBits"/> + <type name="VkExternalFenceFeatureFlagBits" category="enum"/> + <type category="enum" name="VkExternalFenceFeatureFlagBitsKHR" alias="VkExternalFenceFeatureFlagBits"/> + <type name="VkFenceImportFlagBits" category="enum"/> + <type category="enum" name="VkFenceImportFlagBitsKHR" alias="VkFenceImportFlagBits"/> <type name="VkSurfaceCounterFlagBitsEXT" category="enum"/> <type name="VkDisplayPowerStateEXT" category="enum"/> <type name="VkDeviceEventTypeEXT" category="enum"/> <type name="VkDisplayEventTypeEXT" category="enum"/> - <type name="VkPeerMemoryFeatureFlagBitsKHX" category="enum"/> - <type name="VkMemoryAllocateFlagBitsKHX" category="enum"/> - <type name="VkDeviceGroupPresentModeFlagBitsKHX" category="enum"/> + <type name="VkPeerMemoryFeatureFlagBits" category="enum"/> + <type category="enum" name="VkPeerMemoryFeatureFlagBitsKHR" alias="VkPeerMemoryFeatureFlagBits"/> + <type name="VkMemoryAllocateFlagBits" category="enum"/> + <type category="enum" name="VkMemoryAllocateFlagBitsKHR" alias="VkMemoryAllocateFlagBits"/> + <type name="VkDeviceGroupPresentModeFlagBitsKHR" category="enum"/> <type name="VkSwapchainCreateFlagBitsKHR" category="enum"/> + <type name="VkSubgroupFeatureFlagBits" category="enum"/> + <type name="VkTessellationDomainOrigin" category="enum"/> + <type category="enum" name="VkTessellationDomainOriginKHR" alias="VkTessellationDomainOrigin"/> + <type name="VkSamplerYcbcrModelConversion" category="enum"/> + <type category="enum" name="VkSamplerYcbcrModelConversionKHR" alias="VkSamplerYcbcrModelConversion"/> + <type name="VkSamplerYcbcrRange" category="enum"/> + <type category="enum" name="VkSamplerYcbcrRangeKHR" alias="VkSamplerYcbcrRange"/> + <type name="VkChromaLocation" category="enum"/> + <type category="enum" name="VkChromaLocationKHR" alias="VkChromaLocation"/> + <type name="VkSamplerReductionModeEXT" category="enum"/> + <type name="VkBlendOverlapEXT" category="enum"/> + <type name="VkDebugUtilsMessageSeverityFlagBitsEXT" category="enum"/> + <type name="VkDebugUtilsMessageTypeFlagBitsEXT" category="enum"/> -  + <comment>The PFN_vk*Function types are used by VkAllocationCallbacks below</comment> <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalAllocationNotification</name>)( <type>void</type>* pUserData, <type>size_t</type> size, @@ -426,10 +541,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type>void</type>* pUserData, <type>void</type>* pMemory);</type> -  + <comment>The PFN_vkVoidFunction type are used by VkGet*ProcAddr below</comment> <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkVoidFunction</name>)(void);</type> -  + <comment>The PFN_vkDebugReportCallbackEXT type are used by the DEBUG_REPORT extension</comment> <type category="funcpointer">typedef VkBool32 (VKAPI_PTR *<name>PFN_vkDebugReportCallbackEXT</name>)( <type>VkDebugReportFlagsEXT</type> flags, <type>VkDebugReportObjectTypeEXT</type> objectType, @@ -440,7 +555,22 @@ maintained in the master branch of the Khronos Vulkan GitHub project. const <type>char</type>* pMessage, <type>void</type>* pUserData);</type> -  + <comment>The PFN_vkDebugUtilsMessengerCallbackEXT type are used by the VK_EXT_debug_utils extension</comment> + <type category="funcpointer" requires="VkDebugUtilsMessengerCallbackDataEXT">typedef VkBool32 (VKAPI_PTR *<name>PFN_vkDebugUtilsMessengerCallbackEXT</name>)( + <type>VkDebugUtilsMessageSeverityFlagBitsEXT</type> messageSeverity, + <type>VkDebugUtilsMessageTypeFlagsEXT</type> messageType, + const <type>VkDebugUtilsMessengerCallbackDataEXT</type>* pCallbackData, + <type>void</type>* pUserData);</type> + + <comment>Struct types</comment> + <type category="struct" name="VkBaseOutStructure"> + <member><type>VkStructureType</type> <name>sType</name></member> + <member>struct <type>VkBaseOutStructure</type>* <name>pNext</name></member> + </type> + <type category="struct" name="VkBaseInStructure"> + <member><type>VkStructureType</type> <name>sType</name></member> + <member>const struct <type>VkBaseInStructure</type>* <name>pNext</name></member> + </type> <type category="struct" name="VkOffset2D"> <member><type>int32_t</type> <name>x</name></member> <member><type>int32_t</type> <name>y</name></member> @@ -471,10 +601,6 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>VkOffset2D</type> <name>offset</name></member> <member><type>VkExtent2D</type> <name>extent</name></member> </type> - <type category="struct" name="VkRect3D"> - <member><type>VkOffset3D</type> <name>offset</name></member> - <member><type>VkExtent3D</type> <name>extent</name></member> - </type> <type category="struct" name="VkClearRect"> <member><type>VkRect2D</type> <name>rect</name></member> <member><type>uint32_t</type> <name>baseArrayLayer</name></member> @@ -498,18 +624,18 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>VkPhysicalDeviceSparseProperties</type> <name>sparseProperties</name></member> </type> <type category="struct" name="VkExtensionProperties" returnedonly="true"> - <member><type>char</type> <name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>  - <member><type>uint32_t</type> <name>specVersion</name></member>  + <member><type>char</type> <name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>extension name</comment></member> + <member><type>uint32_t</type> <name>specVersion</name><comment>version of the extension specification implemented</comment></member> </type> <type category="struct" name="VkLayerProperties" returnedonly="true"> - <member><type>char</type> <name>layerName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>  - <member><type>uint32_t</type> <name>specVersion</name></member>  - <member><type>uint32_t</type> <name>implementationVersion</name></member>  - <member><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>  + <member><type>char</type> <name>layerName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]<comment>layer name</comment></member> + <member><type>uint32_t</type> <name>specVersion</name><comment>version of the layer specification implemented</comment></member> + <member><type>uint32_t</type> <name>implementationVersion</name><comment>build or release version of the layer's library</comment></member> + <member><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]<comment>Free-form description of the layer</comment></member> </type> <type category="struct" name="VkApplicationInfo"> <member values="VK_STRUCTURE_TYPE_APPLICATION_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true" len="null-terminated">const <type>char</type>* <name>pApplicationName</name></member> <member><type>uint32_t</type> <name>applicationVersion</name></member> <member optional="true" len="null-terminated">const <type>char</type>* <name>pEngineName</name></member> @@ -526,39 +652,39 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkDeviceQueueCreateInfo"> <member values="VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDeviceQueueCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDeviceQueueCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>queueFamilyIndex</name></member> <member><type>uint32_t</type> <name>queueCount</name></member> <member len="queueCount">const <type>float</type>* <name>pQueuePriorities</name></member> </type> <type category="struct" name="VkDeviceCreateInfo"> <member values="VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceFeatures2KHR,VkPhysicalDeviceMultiviewFeaturesKHX,VkDeviceGroupDeviceCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDeviceCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDeviceCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>queueCreateInfoCount</name></member> <member len="queueCreateInfoCount">const <type>VkDeviceQueueCreateInfo</type>* <name>pQueueCreateInfos</name></member> <member optional="true"><type>uint32_t</type> <name>enabledLayerCount</name></member> - <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name></member>  + <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name><comment>Ordered list of layer names to be enabled</comment></member> <member optional="true"><type>uint32_t</type> <name>enabledExtensionCount</name></member> <member len="enabledExtensionCount,null-terminated">const <type>char</type>* const* <name>ppEnabledExtensionNames</name></member> <member optional="true">const <type>VkPhysicalDeviceFeatures</type>* <name>pEnabledFeatures</name></member> </type> <type category="struct" name="VkInstanceCreateInfo"> <member values="VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDebugReportCallbackCreateInfoEXT">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkInstanceCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkInstanceCreateFlags</type> <name>flags</name></member> <member optional="true">const <type>VkApplicationInfo</type>* <name>pApplicationInfo</name></member> <member optional="true"><type>uint32_t</type> <name>enabledLayerCount</name></member> - <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name></member>  + <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name><comment>Ordered list of layer names to be enabled</comment></member> <member optional="true"><type>uint32_t</type> <name>enabledExtensionCount</name></member> - <member len="enabledExtensionCount,null-terminated">const <type>char</type>* const* <name>ppEnabledExtensionNames</name></member>  + <member len="enabledExtensionCount,null-terminated">const <type>char</type>* const* <name>ppEnabledExtensionNames</name><comment>Extension names to be enabled</comment></member> </type> <type category="struct" name="VkQueueFamilyProperties" returnedonly="true"> - <member optional="true"><type>VkQueueFlags</type> <name>queueFlags</name></member>  + <member optional="true"><type>VkQueueFlags</type> <name>queueFlags</name><comment>Queue flags</comment></member> <member><type>uint32_t</type> <name>queueCount</name></member> <member><type>uint32_t</type> <name>timestampValidBits</name></member> - <member><type>VkExtent3D</type> <name>minImageTransferGranularity</name></member>  + <member><type>VkExtent3D</type> <name>minImageTransferGranularity</name><comment>Minimum alignment requirement for image transfers</comment></member> </type> <type category="struct" name="VkPhysicalDeviceMemoryProperties" returnedonly="true"> <member><type>uint32_t</type> <name>memoryTypeCount</name></member> @@ -568,14 +694,14 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkMemoryAllocateInfo"> <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationMemoryAllocateInfoNV,VkMemoryAllocateFlagsInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceSize</type> <name>allocationSize</name></member>  - <member><type>uint32_t</type> <name>memoryTypeIndex</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceSize</type> <name>allocationSize</name><comment>Size of memory allocation</comment></member> + <member><type>uint32_t</type> <name>memoryTypeIndex</name><comment>Index of the of the memory type to allocate from</comment></member> </type> <type category="struct" name="VkMemoryRequirements" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkDeviceSize</type> <name>alignment</name></member>  - <member><type>uint32_t</type> <name>memoryTypeBits</name></member>  + <member><type>VkDeviceSize</type> <name>size</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>alignment</name><comment>Specified in bytes</comment></member> + <member><type>uint32_t</type> <name>memoryTypeBits</name><comment>Bitmask of the allowed memory type indices into memoryTypes[] for this object</comment></member> </type> <type category="struct" name="VkSparseImageFormatProperties" returnedonly="true"> <member optional="true"><type>VkImageAspectFlags</type> <name>aspectMask</name></member> @@ -585,88 +711,88 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type category="struct" name="VkSparseImageMemoryRequirements" returnedonly="true"> <member><type>VkSparseImageFormatProperties</type> <name>formatProperties</name></member> <member><type>uint32_t</type> <name>imageMipTailFirstLod</name></member> - <member><type>VkDeviceSize</type> <name>imageMipTailSize</name></member>  - <member><type>VkDeviceSize</type> <name>imageMipTailOffset</name></member>  - <member><type>VkDeviceSize</type> <name>imageMipTailStride</name></member>  + <member><type>VkDeviceSize</type> <name>imageMipTailSize</name><comment>Specified in bytes, must be a multiple of sparse block size in bytes / alignment</comment></member> + <member><type>VkDeviceSize</type> <name>imageMipTailOffset</name><comment>Specified in bytes, must be a multiple of sparse block size in bytes / alignment</comment></member> + <member><type>VkDeviceSize</type> <name>imageMipTailStride</name><comment>Specified in bytes, must be a multiple of sparse block size in bytes / alignment</comment></member> </type> <type category="struct" name="VkMemoryType" returnedonly="true"> - <member optional="true"><type>VkMemoryPropertyFlags</type> <name>propertyFlags</name></member>  - <member><type>uint32_t</type> <name>heapIndex</name></member>  + <member optional="true"><type>VkMemoryPropertyFlags</type> <name>propertyFlags</name><comment>Memory properties of this memory type</comment></member> + <member><type>uint32_t</type> <name>heapIndex</name><comment>Index of the memory heap allocations of this memory type are taken from</comment></member> </type> <type category="struct" name="VkMemoryHeap" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member optional="true"><type>VkMemoryHeapFlags</type> <name>flags</name></member>  + <member><type>VkDeviceSize</type> <name>size</name><comment>Available memory in the heap</comment></member> + <member optional="true"><type>VkMemoryHeapFlags</type> <name>flags</name><comment>Flags for the heap</comment></member> </type> <type category="struct" name="VkMappedMemoryRange"> <member values="VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceMemory</type> <name>memory</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceMemory</type> <name>memory</name><comment>Mapped memory object</comment></member> + <member><type>VkDeviceSize</type> <name>offset</name><comment>Offset within the memory object where the range starts</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Size of the range within the memory object</comment></member> </type> <type category="struct" name="VkFormatProperties" returnedonly="true"> - <member optional="true"><type>VkFormatFeatureFlags</type> <name>linearTilingFeatures</name></member>  - <member optional="true"><type>VkFormatFeatureFlags</type> <name>optimalTilingFeatures</name></member>  - <member optional="true"><type>VkFormatFeatureFlags</type> <name>bufferFeatures</name></member>  + <member optional="true"><type>VkFormatFeatureFlags</type> <name>linearTilingFeatures</name><comment>Format features in case of linear tiling</comment></member> + <member optional="true"><type>VkFormatFeatureFlags</type> <name>optimalTilingFeatures</name><comment>Format features in case of optimal tiling</comment></member> + <member optional="true"><type>VkFormatFeatureFlags</type> <name>bufferFeatures</name><comment>Format features supported by buffers</comment></member> </type> <type category="struct" name="VkImageFormatProperties" returnedonly="true"> - <member><type>VkExtent3D</type> <name>maxExtent</name></member>  - <member><type>uint32_t</type> <name>maxMipLevels</name></member>  - <member><type>uint32_t</type> <name>maxArrayLayers</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampleCounts</name></member>  - <member><type>VkDeviceSize</type> <name>maxResourceSize</name></member>  + <member><type>VkExtent3D</type> <name>maxExtent</name><comment>max image dimensions for this resource type</comment></member> + <member><type>uint32_t</type> <name>maxMipLevels</name><comment>max number of mipmap levels for this resource type</comment></member> + <member><type>uint32_t</type> <name>maxArrayLayers</name><comment>max array size for this resource type</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>sampleCounts</name><comment>supported sample counts for this resource type</comment></member> + <member><type>VkDeviceSize</type> <name>maxResourceSize</name><comment>max size (in bytes) of this resource type</comment></member> </type> <type category="struct" name="VkDescriptorBufferInfo"> - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>range</name></member>  + <member><type>VkBuffer</type> <name>buffer</name><comment>Buffer used for this descriptor slot when the descriptor is UNIFORM_BUFFER[_DYNAMIC] or STORAGE_BUFFER[_DYNAMIC]. VK_NULL_HANDLE otherwise.</comment></member> + <member><type>VkDeviceSize</type> <name>offset</name><comment>Base offset from buffer start in bytes to update in the descriptor set.</comment></member> + <member><type>VkDeviceSize</type> <name>range</name><comment>Size in bytes of the buffer resource for this descriptor update.</comment></member> </type> <type category="struct" name="VkDescriptorImageInfo"> - <member noautovalidity="true"><type>VkSampler</type> <name>sampler</name></member>  - <member noautovalidity="true"><type>VkImageView</type> <name>imageView</name></member>  - <member noautovalidity="true"><type>VkImageLayout</type> <name>imageLayout</name></member>  + <member noautovalidity="true"><type>VkSampler</type> <name>sampler</name><comment>Sampler to write to the descriptor in case it is a SAMPLER or COMBINED_IMAGE_SAMPLER descriptor. Ignored otherwise.</comment></member> + <member noautovalidity="true"><type>VkImageView</type> <name>imageView</name><comment>Image view to write to the descriptor in case it is a SAMPLED_IMAGE, STORAGE_IMAGE, COMBINED_IMAGE_SAMPLER, or INPUT_ATTACHMENT descriptor. Ignored otherwise.</comment></member> + <member noautovalidity="true"><type>VkImageLayout</type> <name>imageLayout</name><comment>Layout the image is expected to be in when accessed using this descriptor (only used if imageView is not VK_NULL_HANDLE).</comment></member> </type> <type category="struct" name="VkWriteDescriptorSet"> <member values="VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member noautovalidity="true"><type>VkDescriptorSet</type> <name>dstSet</name></member>  - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorImageInfo</type>* <name>pImageInfo</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorBufferInfo</type>* <name>pBufferInfo</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkBufferView</type>* <name>pTexelBufferView</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member noautovalidity="true"><type>VkDescriptorSet</type> <name>dstSet</name><comment>Destination descriptor set</comment></member> + <member><type>uint32_t</type> <name>dstBinding</name><comment>Binding within the destination descriptor set to write</comment></member> + <member><type>uint32_t</type> <name>dstArrayElement</name><comment>Array element within the destination binding to write</comment></member> + <member><type>uint32_t</type> <name>descriptorCount</name><comment>Number of descriptors to write (determines the size of the array pointed by pDescriptors)</comment></member> + <member><type>VkDescriptorType</type> <name>descriptorType</name><comment>Descriptor type to write (determines which members of the array pointed by pDescriptors are going to be used)</comment></member> + <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorImageInfo</type>* <name>pImageInfo</name><comment>Sampler, image view, and layout for SAMPLER, COMBINED_IMAGE_SAMPLER, {SAMPLED,STORAGE}_IMAGE, and INPUT_ATTACHMENT descriptor types.</comment></member> + <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorBufferInfo</type>* <name>pBufferInfo</name><comment>Raw buffer, size, and offset for {UNIFORM,STORAGE}_BUFFER[_DYNAMIC] descriptor types.</comment></member> + <member noautovalidity="true" len="descriptorCount">const <type>VkBufferView</type>* <name>pTexelBufferView</name><comment>Buffer view to write to the descriptor for {UNIFORM,STORAGE}_TEXEL_BUFFER descriptor types.</comment></member> </type> <type category="struct" name="VkCopyDescriptorSet"> <member values="VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDescriptorSet</type> <name>srcSet</name></member>  - <member><type>uint32_t</type> <name>srcBinding</name></member>  - <member><type>uint32_t</type> <name>srcArrayElement</name></member>  - <member><type>VkDescriptorSet</type> <name>dstSet</name></member>  - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDescriptorSet</type> <name>srcSet</name><comment>Source descriptor set</comment></member> + <member><type>uint32_t</type> <name>srcBinding</name><comment>Binding within the source descriptor set to copy from</comment></member> + <member><type>uint32_t</type> <name>srcArrayElement</name><comment>Array element within the source binding to copy from</comment></member> + <member><type>VkDescriptorSet</type> <name>dstSet</name><comment>Destination descriptor set</comment></member> + <member><type>uint32_t</type> <name>dstBinding</name><comment>Binding within the destination descriptor set to copy to</comment></member> + <member><type>uint32_t</type> <name>dstArrayElement</name><comment>Array element within the destination binding to copy to</comment></member> + <member><type>uint32_t</type> <name>descriptorCount</name><comment>Number of descriptors to write (determines the size of the array pointed by pDescriptors)</comment></member> </type> <type category="struct" name="VkBufferCreateInfo"> <member values="VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationBufferCreateInfoNV">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkBufferUsageFlags</type> <name>usage</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name><comment>Buffer creation flags</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Specified in bytes</comment></member> + <member><type>VkBufferUsageFlags</type> <name>usage</name><comment>Buffer usage flags</comment></member> <member><type>VkSharingMode</type> <name>sharingMode</name></member> <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member> <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member> </type> <type category="struct" name="VkBufferViewCreateInfo"> <member values="VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkBufferViewCreateFlags</type><name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkBufferViewCreateFlags</type><name>flags</name></member> <member><type>VkBuffer</type> <name>buffer</name></member> - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>range</name></member>  + <member><type>VkFormat</type> <name>format</name><comment>Optionally specifies format of elements</comment></member> + <member><type>VkDeviceSize</type> <name>offset</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>range</name><comment>View size specified in bytes</comment></member> </type> <type category="struct" name="VkImageSubresource"> <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> @@ -688,37 +814,37 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkMemoryBarrier"> <member values="VK_STRUCTURE_TYPE_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name><comment>Memory accesses from the source of the dependency to synchronize</comment></member> + <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name><comment>Memory accesses from the destination of the dependency to synchronize</comment></member> </type> <type category="struct" name="VkBufferMemoryBarrier"> <member values="VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name></member>  - <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name></member>  - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name><comment>Memory accesses from the source of the dependency to synchronize</comment></member> + <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name><comment>Memory accesses from the destination of the dependency to synchronize</comment></member> + <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name><comment>Queue family to transition ownership from</comment></member> + <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name><comment>Queue family to transition ownership to</comment></member> + <member><type>VkBuffer</type> <name>buffer</name><comment>Buffer to sync</comment></member> + <member><type>VkDeviceSize</type> <name>offset</name><comment>Offset within the buffer to sync</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Amount of bytes to sync</comment></member> </type> <type category="struct" name="VkImageMemoryBarrier"> <member values="VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - <member><type>VkImageLayout</type> <name>oldLayout</name></member>  - <member><type>VkImageLayout</type> <name>newLayout</name></member>  - <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name></member>  - <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name></member>  - <member><type>VkImage</type> <name>image</name></member>  - <member><type>VkImageSubresourceRange</type> <name>subresourceRange</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name><comment>Memory accesses from the source of the dependency to synchronize</comment></member> + <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name><comment>Memory accesses from the destination of the dependency to synchronize</comment></member> + <member><type>VkImageLayout</type> <name>oldLayout</name><comment>Current layout of the image</comment></member> + <member><type>VkImageLayout</type> <name>newLayout</name><comment>New layout to transition the image to</comment></member> + <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name><comment>Queue family to transition ownership from</comment></member> + <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name><comment>Queue family to transition ownership to</comment></member> + <member><type>VkImage</type> <name>image</name><comment>Image to sync</comment></member> + <member><type>VkImageSubresourceRange</type> <name>subresourceRange</name><comment>Subresource range to sync</comment></member> </type> <type category="struct" name="VkImageCreateInfo"> <member values="VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationImageCreateInfoNV,VkImageSwapchainCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkImageCreateFlags</type> <name>flags</name><comment>Image creation flags</comment></member> <member><type>VkImageType</type> <name>imageType</name></member> <member><type>VkFormat</type> <name>format</name></member> <member><type>VkExtent3D</type> <name>extent</name></member> @@ -726,23 +852,23 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>uint32_t</type> <name>arrayLayers</name></member> <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> <member><type>VkImageTiling</type> <name>tiling</name></member> - <member><type>VkImageUsageFlags</type> <name>usage</name></member>  - <member><type>VkSharingMode</type> <name>sharingMode</name></member>  - <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member>  - <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member>  - <member><type>VkImageLayout</type> <name>initialLayout</name></member>  + <member><type>VkImageUsageFlags</type> <name>usage</name><comment>Image usage flags</comment></member> + <member><type>VkSharingMode</type> <name>sharingMode</name><comment>Cross-queue-family sharing mode</comment></member> + <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name><comment>Number of queue families to share across</comment></member> + <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name><comment>Array of queue family indices to share across</comment></member> + <member><type>VkImageLayout</type> <name>initialLayout</name><comment>Initial image layout for all subresources</comment></member> </type> <type category="struct" name="VkSubresourceLayout" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkDeviceSize</type> <name>rowPitch</name></member>  - <member><type>VkDeviceSize</type> <name>arrayPitch</name></member>  - <member><type>VkDeviceSize</type> <name>depthPitch</name></member>  + <member><type>VkDeviceSize</type> <name>offset</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>rowPitch</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>arrayPitch</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>depthPitch</name><comment>Specified in bytes</comment></member> </type> <type category="struct" name="VkImageViewCreateInfo"> <member values="VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageViewCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkImageViewCreateFlags</type> <name>flags</name></member> <member><type>VkImage</type> <name>image</name></member> <member><type>VkImageViewType</type> <name>viewType</name></member> <member><type>VkFormat</type> <name>format</name></member> @@ -750,24 +876,24 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>VkImageSubresourceRange</type> <name>subresourceRange</name></member> </type> <type category="struct" name="VkBufferCopy"> - <member><type>VkDeviceSize</type> <name>srcOffset</name></member>  - <member><type>VkDeviceSize</type> <name>dstOffset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  + <member><type>VkDeviceSize</type> <name>srcOffset</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>dstOffset</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Specified in bytes</comment></member> </type> <type category="struct" name="VkSparseMemoryBind"> - <member><type>VkDeviceSize</type> <name>resourceOffset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  + <member><type>VkDeviceSize</type> <name>resourceOffset</name><comment>Specified in bytes</comment></member> + <member><type>VkDeviceSize</type> <name>size</name><comment>Specified in bytes</comment></member> <member optional="true"><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member>  - <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member>  + <member><type>VkDeviceSize</type> <name>memoryOffset</name><comment>Specified in bytes</comment></member> + <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member> </type> <type category="struct" name="VkSparseImageMemoryBind"> <member><type>VkImageSubresource</type> <name>subresource</name></member> <member><type>VkOffset3D</type> <name>offset</name></member> <member><type>VkExtent3D</type> <name>extent</name></member> <member optional="true"><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member>  - <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member>  + <member><type>VkDeviceSize</type> <name>memoryOffset</name><comment>Specified in bytes</comment></member> + <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member> </type> <type category="struct" name="VkSparseBufferMemoryBindInfo"> <member><type>VkBuffer</type> <name>buffer</name></member> @@ -786,7 +912,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkBindSparseInfo"> <member values="VK_STRUCTURE_TYPE_BIND_SPARSE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupBindSparseInfoKHX">const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> <member len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member> <member optional="true"><type>uint32_t</type> <name>bufferBindCount</name></member> @@ -800,24 +926,24 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkImageCopy"> <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> - <member><type>VkOffset3D</type> <name>srcOffset</name></member>  + <member><type>VkOffset3D</type> <name>srcOffset</name><comment>Specified in pixels for both compressed and uncompressed images</comment></member> <member><type>VkImageSubresourceLayers</type> <name>dstSubresource</name></member> - <member><type>VkOffset3D</type> <name>dstOffset</name></member>  - <member><type>VkExtent3D</type> <name>extent</name></member>  + <member><type>VkOffset3D</type> <name>dstOffset</name><comment>Specified in pixels for both compressed and uncompressed images</comment></member> + <member><type>VkExtent3D</type> <name>extent</name><comment>Specified in pixels for both compressed and uncompressed images</comment></member> </type> <type category="struct" name="VkImageBlit"> <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> - <member><type>VkOffset3D</type> <name>srcOffsets</name>[2]</member>  + <member><type>VkOffset3D</type> <name>srcOffsets</name>[2]<comment>Specified in pixels for both compressed and uncompressed images</comment></member> <member><type>VkImageSubresourceLayers</type> <name>dstSubresource</name></member> - <member><type>VkOffset3D</type> <name>dstOffsets</name>[2]</member>  + <member><type>VkOffset3D</type> <name>dstOffsets</name>[2]<comment>Specified in pixels for both compressed and uncompressed images</comment></member> </type> <type category="struct" name="VkBufferImageCopy"> - <member><type>VkDeviceSize</type> <name>bufferOffset</name></member>  - <member><type>uint32_t</type> <name>bufferRowLength</name></member>  + <member><type>VkDeviceSize</type> <name>bufferOffset</name><comment>Specified in bytes</comment></member> + <member><type>uint32_t</type> <name>bufferRowLength</name><comment>Specified in texels</comment></member> <member><type>uint32_t</type> <name>bufferImageHeight</name></member> <member><type>VkImageSubresourceLayers</type> <name>imageSubresource</name></member> - <member><type>VkOffset3D</type> <name>imageOffset</name></member>  - <member><type>VkExtent3D</type> <name>imageExtent</name></member>  + <member><type>VkOffset3D</type> <name>imageOffset</name><comment>Specified in pixels for both compressed and uncompressed images</comment></member> + <member><type>VkExtent3D</type> <name>imageExtent</name><comment>Specified in pixels for both compressed and uncompressed images</comment></member> </type> <type category="struct" name="VkImageResolve"> <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> @@ -828,24 +954,24 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkShaderModuleCreateInfo"> <member values="VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkShaderModuleCreateFlags</type> <name>flags</name></member>  - <member><type>size_t</type> <name>codeSize</name></member>  - <member len="latexmath:[codeSize \over 4]">const <type>uint32_t</type>* <name>pCode</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkShaderModuleCreateFlags</type> <name>flags</name></member> + <member><type>size_t</type> <name>codeSize</name><comment>Specified in bytes</comment></member> + <member len="latexmath:[codeSize \over 4]" altlen="codeSize / 4">const <type>uint32_t</type>* <name>pCode</name><comment>Binary code of size codeSize</comment></member> </type> <type category="struct" name="VkDescriptorSetLayoutBinding"> - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member optional="true"><type>uint32_t</type> <name>descriptorCount</name></member>  - <member noautovalidity="true"><type>VkShaderStageFlags</type> <name>stageFlags</name></member>  - <member noautovalidity="true" optional="true" len="descriptorCount">const <type>VkSampler</type>* <name>pImmutableSamplers</name></member>  + <member><type>uint32_t</type> <name>binding</name><comment>Binding number for this entry</comment></member> + <member><type>VkDescriptorType</type> <name>descriptorType</name><comment>Type of the descriptors in this binding</comment></member> + <member optional="true"><type>uint32_t</type> <name>descriptorCount</name><comment>Number of descriptors in this binding</comment></member> + <member noautovalidity="true"><type>VkShaderStageFlags</type> <name>stageFlags</name><comment>Shader stages this binding is visible to</comment></member> + <member noautovalidity="true" optional="true" len="descriptorCount">const <type>VkSampler</type>* <name>pImmutableSamplers</name><comment>Immutable samplers (used if descriptor type is SAMPLER or COMBINED_IMAGE_SAMPLER, is either NULL or contains count number of elements)</comment></member> </type> <type category="struct" name="VkDescriptorSetLayoutCreateInfo"> <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDescriptorSetLayoutCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>bindingCount</name></member>  - <member len="bindingCount">const <type>VkDescriptorSetLayoutBinding</type>* <name>pBindings</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDescriptorSetLayoutCreateFlags</type> <name>flags</name></member> + <member optional="true"><type>uint32_t</type> <name>bindingCount</name><comment>Number of bindings in the descriptor set layout</comment></member> + <member len="bindingCount">const <type>VkDescriptorSetLayoutBinding</type>* <name>pBindings</name><comment>Array of descriptor set layout bindings</comment></member> </type> <type category="struct" name="VkDescriptorPoolSize"> <member><type>VkDescriptorType</type> <name>type</name></member> @@ -853,7 +979,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkDescriptorPoolCreateInfo"> <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkDescriptorPoolCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>maxSets</name></member> <member><type>uint32_t</type> <name>poolSizeCount</name></member> @@ -861,77 +987,77 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkDescriptorSetAllocateInfo"> <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkDescriptorPool</type> <name>descriptorPool</name></member> <member><type>uint32_t</type> <name>descriptorSetCount</name></member> <member len="descriptorSetCount">const <type>VkDescriptorSetLayout</type>* <name>pSetLayouts</name></member> </type> <type category="struct" name="VkSpecializationMapEntry"> - <member><type>uint32_t</type> <name>constantID</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  - <member><type>size_t</type> <name>size</name></member>  + <member><type>uint32_t</type> <name>constantID</name><comment>The SpecConstant ID specified in the BIL</comment></member> + <member><type>uint32_t</type> <name>offset</name><comment>Offset of the value in the data block</comment></member> + <member><type>size_t</type> <name>size</name><comment>Size in bytes of the SpecConstant</comment></member> </type> <type category="struct" name="VkSpecializationInfo"> - <member optional="true"><type>uint32_t</type> <name>mapEntryCount</name></member>  - <member len="mapEntryCount" noautovalidity="true">const <type>VkSpecializationMapEntry</type>* <name>pMapEntries</name></member>  - <member optional="true"><type>size_t</type> <name>dataSize</name></member>  - <member len="dataSize">const <type>void</type>* <name>pData</name></member>  + <member optional="true"><type>uint32_t</type> <name>mapEntryCount</name><comment>Number of entries in the map</comment></member> + <member len="mapEntryCount" noautovalidity="true">const <type>VkSpecializationMapEntry</type>* <name>pMapEntries</name><comment>Array of map entries</comment></member> + <member optional="true"><type>size_t</type> <name>dataSize</name><comment>Size in bytes of pData</comment></member> + <member len="dataSize">const <type>void</type>* <name>pData</name><comment>Pointer to SpecConstant data</comment></member> </type> <type category="struct" name="VkPipelineShaderStageCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineShaderStageCreateFlags</type> <name>flags</name></member>  - <member><type>VkShaderStageFlagBits</type> <name>stage</name></member>  - <member><type>VkShaderModule</type> <name>module</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pName</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineShaderStageCreateFlags</type> <name>flags</name></member> + <member><type>VkShaderStageFlagBits</type> <name>stage</name><comment>Shader stage</comment></member> + <member><type>VkShaderModule</type> <name>module</name><comment>Module containing entry point</comment></member> + <member len="null-terminated">const <type>char</type>* <name>pName</name><comment>Null-terminated entry point name</comment></member> <member optional="true">const <type>VkSpecializationInfo</type>* <name>pSpecializationInfo</name></member> </type> <type category="struct" name="VkComputePipelineCreateInfo"> <member values="VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name><comment>Pipeline creation flags</comment></member> <member><type>VkPipelineShaderStageCreateInfo</type> <name>stage</name></member> - <member><type>VkPipelineLayout</type> <name>layout</name></member>  - <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name></member>  - <member><type>int32_t</type> <name>basePipelineIndex</name></member>  + <member><type>VkPipelineLayout</type> <name>layout</name><comment>Interface layout of the pipeline</comment></member> + <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is nonzero, it specifies the handle of the base pipeline this is a derivative of</comment></member> + <member><type>int32_t</type> <name>basePipelineIndex</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is not -1, it specifies an index into pCreateInfos of the base pipeline this is a derivative of</comment></member> </type> <type category="struct" name="VkVertexInputBindingDescription"> - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>uint32_t</type> <name>stride</name></member>  - <member><type>VkVertexInputRate</type> <name>inputRate</name></member>  + <member><type>uint32_t</type> <name>binding</name><comment>Vertex buffer binding id</comment></member> + <member><type>uint32_t</type> <name>stride</name><comment>Distance between vertices in bytes (0 = no advancement)</comment></member> + <member><type>VkVertexInputRate</type> <name>inputRate</name><comment>The rate at which the vertex data is consumed</comment></member> </type> <type category="struct" name="VkVertexInputAttributeDescription"> - <member><type>uint32_t</type> <name>location</name></member>  - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  + <member><type>uint32_t</type> <name>location</name><comment>location of the shader vertex attrib</comment></member> + <member><type>uint32_t</type> <name>binding</name><comment>Vertex buffer binding id</comment></member> + <member><type>VkFormat</type> <name>format</name><comment>format of source data</comment></member> + <member><type>uint32_t</type> <name>offset</name><comment>Offset of first element in bytes from base of vertex</comment></member> </type> <type category="struct" name="VkPipelineVertexInputStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineVertexInputStateCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>vertexBindingDescriptionCount</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineVertexInputStateCreateFlags</type> <name>flags</name></member> + <member optional="true"><type>uint32_t</type> <name>vertexBindingDescriptionCount</name><comment>number of bindings</comment></member> <member len="vertexBindingDescriptionCount">const <type>VkVertexInputBindingDescription</type>* <name>pVertexBindingDescriptions</name></member> - <member optional="true"><type>uint32_t</type> <name>vertexAttributeDescriptionCount</name></member>  + <member optional="true"><type>uint32_t</type> <name>vertexAttributeDescriptionCount</name><comment>number of attributes</comment></member> <member len="vertexAttributeDescriptionCount">const <type>VkVertexInputAttributeDescription</type>* <name>pVertexAttributeDescriptions</name></member> </type> <type category="struct" name="VkPipelineInputAssemblyStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineInputAssemblyStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineInputAssemblyStateCreateFlags</type> <name>flags</name></member> <member><type>VkPrimitiveTopology</type> <name>topology</name></member> <member><type>VkBool32</type> <name>primitiveRestartEnable</name></member> </type> <type category="struct" name="VkPipelineTessellationStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineTessellationStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineTessellationStateCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>patchControlPoints</name></member> </type> <type category="struct" name="VkPipelineViewportStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPipelineViewportWScalingStateCreateInfoNV">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineViewportStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineViewportStateCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>viewportCount</name></member> <member noautovalidity="true" optional="true" len="viewportCount">const <type>VkViewport</type>* <name>pViewports</name></member> <member><type>uint32_t</type> <name>scissorCount</name></member> @@ -939,11 +1065,11 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkPipelineRasterizationStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPipelineRasterizationStateRasterizationOrderAMD">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineRasterizationStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineRasterizationStateCreateFlags</type> <name>flags</name></member> <member><type>VkBool32</type> <name>depthClampEnable</name></member> <member><type>VkBool32</type> <name>rasterizerDiscardEnable</name></member> - <member><type>VkPolygonMode</type> <name>polygonMode</name></member>  + <member><type>VkPolygonMode</type> <name>polygonMode</name><comment>optional (GL45)</comment></member> <member optional="true"><type>VkCullModeFlags</type> <name>cullMode</name></member> <member><type>VkFrontFace</type> <name>frontFace</name></member> <member><type>VkBool32</type> <name>depthBiasEnable</name></member> @@ -954,12 +1080,12 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkPipelineMultisampleStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineMultisampleStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkSampleCountFlagBits</type> <name>rasterizationSamples</name></member>  - <member><type>VkBool32</type> <name>sampleShadingEnable</name></member>  - <member><type>float</type> <name>minSampleShading</name></member>  - <member optional="true" len="latexmath:[\lceil{\mathit{rasterizationSamples} \over 32}\rceil]">const <type>VkSampleMask</type>* <name>pSampleMask</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineMultisampleStateCreateFlags</type> <name>flags</name></member> + <member><type>VkSampleCountFlagBits</type> <name>rasterizationSamples</name><comment>Number of samples used for rasterization</comment></member> + <member><type>VkBool32</type> <name>sampleShadingEnable</name><comment>optional (GL45)</comment></member> + <member><type>float</type> <name>minSampleShading</name><comment>optional (GL45)</comment></member> + <member optional="true" len="latexmath:[\lceil{\mathit{rasterizationSamples} \over 32}\rceil]" altlen="(rasterizationSamples + 31) / 32">const <type>VkSampleMask</type>* <name>pSampleMask</name><comment>Array of sampleMask words</comment></member> <member><type>VkBool32</type> <name>alphaToCoverageEnable</name></member> <member><type>VkBool32</type> <name>alphaToOneEnable</name></member> </type> @@ -975,18 +1101,18 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkPipelineColorBlendStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineColorBlendStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineColorBlendStateCreateFlags</type> <name>flags</name></member> <member><type>VkBool32</type> <name>logicOpEnable</name></member> <member noautovalidity="true"><type>VkLogicOp</type> <name>logicOp</name></member> - <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member>  + <member optional="true"><type>uint32_t</type> <name>attachmentCount</name><comment># of pAttachments</comment></member> <member len="attachmentCount">const <type>VkPipelineColorBlendAttachmentState</type>* <name>pAttachments</name></member> <member><type>float</type> <name>blendConstants</name>[4]</member> </type> <type category="struct" name="VkPipelineDynamicStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDynamicStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineDynamicStateCreateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>dynamicStateCount</name></member> <member len="dynamicStateCount">const <type>VkDynamicState</type>* <name>pDynamicStates</name></member> </type> @@ -1001,12 +1127,12 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkPipelineDepthStencilStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDepthStencilStateCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineDepthStencilStateCreateFlags</type> <name>flags</name></member> <member><type>VkBool32</type> <name>depthTestEnable</name></member> <member><type>VkBool32</type> <name>depthWriteEnable</name></member> <member><type>VkCompareOp</type> <name>depthCompareOp</name></member> - <member><type>VkBool32</type> <name>depthBoundsTestEnable</name></member>  + <member><type>VkBool32</type> <name>depthBoundsTestEnable</name><comment>optional (depth_bounds_test)</comment></member> <member><type>VkBool32</type> <name>stencilTestEnable</name></member> <member><type>VkStencilOpState</type> <name>front</name></member> <member><type>VkStencilOpState</type> <name>back</name></member> @@ -1015,10 +1141,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkGraphicsPipelineCreateInfo"> <member values="VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name><comment>Pipeline creation flags</comment></member> <member><type>uint32_t</type> <name>stageCount</name></member> - <member len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name></member>  + <member len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name><comment>One entry for each active shader stage</comment></member> <member>const <type>VkPipelineVertexInputStateCreateInfo</type>* <name>pVertexInputState</name></member> <member>const <type>VkPipelineInputAssemblyStateCreateInfo</type>* <name>pInputAssemblyState</name></member> <member noautovalidity="true" optional="true">const <type>VkPipelineTessellationStateCreateInfo</type>* <name>pTessellationState</name></member> @@ -1028,40 +1154,40 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member noautovalidity="true" optional="true">const <type>VkPipelineDepthStencilStateCreateInfo</type>* <name>pDepthStencilState</name></member> <member noautovalidity="true" optional="true">const <type>VkPipelineColorBlendStateCreateInfo</type>* <name>pColorBlendState</name></member> <member optional="true">const <type>VkPipelineDynamicStateCreateInfo</type>* <name>pDynamicState</name></member> - <member><type>VkPipelineLayout</type> <name>layout</name></member>  + <member><type>VkPipelineLayout</type> <name>layout</name><comment>Interface layout of the pipeline</comment></member> <member><type>VkRenderPass</type> <name>renderPass</name></member> <member><type>uint32_t</type> <name>subpass</name></member> - <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name></member>  - <member><type>int32_t</type> <name>basePipelineIndex</name></member>  + <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is nonzero, it specifies the handle of the base pipeline this is a derivative of</comment></member> + <member><type>int32_t</type> <name>basePipelineIndex</name><comment>If VK_PIPELINE_CREATE_DERIVATIVE_BIT is set and this value is not -1, it specifies an index into pCreateInfos of the base pipeline this is a derivative of</comment></member> </type> <type category="struct" name="VkPipelineCacheCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCacheCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>size_t</type> <name>initialDataSize</name></member>  - <member len="initialDataSize">const <type>void</type>* <name>pInitialData</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineCacheCreateFlags</type> <name>flags</name></member> + <member optional="true"><type>size_t</type> <name>initialDataSize</name><comment>Size of initial data to populate cache, in bytes</comment></member> + <member len="initialDataSize">const <type>void</type>* <name>pInitialData</name><comment>Initial data to populate cache</comment></member> </type> <type category="struct" name="VkPushConstantRange"> - <member><type>VkShaderStageFlags</type> <name>stageFlags</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  - <member><type>uint32_t</type> <name>size</name></member>  + <member><type>VkShaderStageFlags</type> <name>stageFlags</name><comment>Which stages use the range</comment></member> + <member><type>uint32_t</type> <name>offset</name><comment>Start of the range, in bytes</comment></member> + <member><type>uint32_t</type> <name>size</name><comment>Size of the range, in bytes</comment></member> </type> <type category="struct" name="VkPipelineLayoutCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineLayoutCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>setLayoutCount</name></member>  - <member len="setLayoutCount">const <type>VkDescriptorSetLayout</type>* <name>pSetLayouts</name></member>  - <member optional="true"><type>uint32_t</type> <name>pushConstantRangeCount</name></member>  - <member len="pushConstantRangeCount">const <type>VkPushConstantRange</type>* <name>pPushConstantRanges</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineLayoutCreateFlags</type> <name>flags</name></member> + <member optional="true"><type>uint32_t</type> <name>setLayoutCount</name><comment>Number of descriptor sets interfaced by the pipeline</comment></member> + <member len="setLayoutCount">const <type>VkDescriptorSetLayout</type>* <name>pSetLayouts</name><comment>Array of setCount number of descriptor set layout objects defining the layout of the</comment></member> + <member optional="true"><type>uint32_t</type> <name>pushConstantRangeCount</name><comment>Number of push-constant ranges used by the pipeline</comment></member> + <member len="pushConstantRangeCount">const <type>VkPushConstantRange</type>* <name>pPushConstantRanges</name><comment>Array of pushConstantRangeCount number of ranges used by various shader stages</comment></member> </type> <type category="struct" name="VkSamplerCreateInfo"> <member values="VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSamplerCreateFlags</type> <name>flags</name></member>  - <member><type>VkFilter</type> <name>magFilter</name></member>  - <member><type>VkFilter</type> <name>minFilter</name></member>  - <member><type>VkSamplerMipmapMode</type> <name>mipmapMode</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkSamplerCreateFlags</type> <name>flags</name></member> + <member><type>VkFilter</type> <name>magFilter</name><comment>Filter mode for magnification</comment></member> + <member><type>VkFilter</type> <name>minFilter</name><comment>Filter mode for minifiation</comment></member> + <member><type>VkSamplerMipmapMode</type> <name>mipmapMode</name><comment>Mipmap selection mode</comment></member> <member><type>VkSamplerAddressMode</type> <name>addressModeU</name></member> <member><type>VkSamplerAddressMode</type> <name>addressModeV</name></member> <member><type>VkSamplerAddressMode</type> <name>addressModeW</name></member> @@ -1077,36 +1203,36 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkCommandPoolCreateInfo"> <member values="VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkCommandPoolCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkCommandPoolCreateFlags</type> <name>flags</name><comment>Command pool creation flags</comment></member> <member><type>uint32_t</type> <name>queueFamilyIndex</name></member> </type> <type category="struct" name="VkCommandBufferAllocateInfo"> <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkCommandPool</type> <name>commandPool</name></member> <member><type>VkCommandBufferLevel</type> <name>level</name></member> <member><type>uint32_t</type> <name>commandBufferCount</name></member> </type> <type category="struct" name="VkCommandBufferInheritanceInfo"> <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true" noautovalidity="true"><type>VkRenderPass</type> <name>renderPass</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true" noautovalidity="true"><type>VkRenderPass</type> <name>renderPass</name><comment>Render pass for secondary command buffers</comment></member> <member><type>uint32_t</type> <name>subpass</name></member> - <member optional="true" noautovalidity="true"><type>VkFramebuffer</type> <name>framebuffer</name></member>  - <member><type>VkBool32</type> <name>occlusionQueryEnable</name></member>  - <member optional="true" noautovalidity="true"><type>VkQueryControlFlags</type> <name>queryFlags</name></member>  - <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name></member>  + <member optional="true" noautovalidity="true"><type>VkFramebuffer</type> <name>framebuffer</name><comment>Framebuffer for secondary command buffers</comment></member> + <member><type>VkBool32</type> <name>occlusionQueryEnable</name><comment>Whether this secondary command buffer may be executed during an occlusion query</comment></member> + <member optional="true" noautovalidity="true"><type>VkQueryControlFlags</type> <name>queryFlags</name><comment>Query flags used by this secondary command buffer, if executed during an occlusion query</comment></member> + <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name><comment>Pipeline statistics that may be counted for this secondary command buffer</comment></member> </type> <type category="struct" name="VkCommandBufferBeginInfo"> <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupCommandBufferBeginInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkCommandBufferUsageFlags</type> <name>flags</name></member>  - <member optional="true" noautovalidity="true">const <type>VkCommandBufferInheritanceInfo</type>* <name>pInheritanceInfo</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkCommandBufferUsageFlags</type> <name>flags</name><comment>Command buffer usage flags</comment></member> + <member optional="true" noautovalidity="true">const <type>VkCommandBufferInheritanceInfo</type>* <name>pInheritanceInfo</name><comment>Pointer to inheritance info for secondary command buffers</comment></member> </type> <type category="struct" name="VkRenderPassBeginInfo"> <member values="VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupRenderPassBeginInfoKHX">const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkRenderPass</type> <name>renderPass</name></member> <member><type>VkFramebuffer</type> <name>framebuffer</name></member> <member><type>VkRect2D</type> <name>renderArea</name></member> @@ -1135,10 +1261,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member optional="true"><type>VkAttachmentDescriptionFlags</type> <name>flags</name></member> <member><type>VkFormat</type> <name>format</name></member> <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> - <member><type>VkAttachmentLoadOp</type> <name>loadOp</name></member>  - <member><type>VkAttachmentStoreOp</type> <name>storeOp</name></member>  - <member><type>VkAttachmentLoadOp</type> <name>stencilLoadOp</name></member>  - <member><type>VkAttachmentStoreOp</type> <name>stencilStoreOp</name></member>  + <member><type>VkAttachmentLoadOp</type> <name>loadOp</name><comment>Load operation for color or depth data</comment></member> + <member><type>VkAttachmentStoreOp</type> <name>storeOp</name><comment>Store operation for color or depth data</comment></member> + <member><type>VkAttachmentLoadOp</type> <name>stencilLoadOp</name><comment>Load operation for stencil data</comment></member> + <member><type>VkAttachmentStoreOp</type> <name>stencilStoreOp</name><comment>Store operation for stencil data</comment></member> <member><type>VkImageLayout</type> <name>initialLayout</name></member> <member><type>VkImageLayout</type> <name>finalLayout</name></member> </type> @@ -1148,7 +1274,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkSubpassDescription"> <member optional="true"><type>VkSubpassDescriptionFlags</type> <name>flags</name></member> - <member><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member>  + <member><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name><comment>Must be VK_PIPELINE_BIND_POINT_GRAPHICS for now</comment></member> <member optional="true"><type>uint32_t</type> <name>inputAttachmentCount</name></member> <member len="inputAttachmentCount">const <type>VkAttachmentReference</type>* <name>pInputAttachments</name></member> <member optional="true"><type>uint32_t</type> <name>colorAttachmentCount</name></member> @@ -1163,14 +1289,14 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>uint32_t</type> <name>dstSubpass</name></member> <member><type>VkPipelineStageFlags</type> <name>srcStageMask</name></member> <member><type>VkPipelineStageFlags</type> <name>dstStageMask</name></member> - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  + <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name><comment>Memory accesses from the source of the dependency to synchronize</comment></member> + <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name><comment>Memory accesses from the destination of the dependency to synchronize</comment></member> <member optional="true"><type>VkDependencyFlags</type> <name>dependencyFlags</name></member> </type> <type category="struct" name="VkRenderPassCreateInfo"> <member values="VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkRenderPassCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkRenderPassCreateFlags</type> <name>flags</name></member> <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member> <member len="attachmentCount">const <type>VkAttachmentDescription</type>* <name>pAttachments</name></member> <member><type>uint32_t</type> <name>subpassCount</name></member> @@ -1180,212 +1306,212 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkEventCreateInfo"> <member values="VK_STRUCTURE_TYPE_EVENT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkEventCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkEventCreateFlags</type> <name>flags</name><comment>Event creation flags</comment></member> </type> <type category="struct" name="VkFenceCreateInfo"> <member values="VK_STRUCTURE_TYPE_FENCE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkFenceCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkFenceCreateFlags</type> <name>flags</name><comment>Fence creation flags</comment></member> </type> <type category="struct" name="VkPhysicalDeviceFeatures"> - <member><type>VkBool32</type> <name>robustBufferAccess</name></member>  - <member><type>VkBool32</type> <name>fullDrawIndexUint32</name></member>  - <member><type>VkBool32</type> <name>imageCubeArray</name></member>  - <member><type>VkBool32</type> <name>independentBlend</name></member>  - <member><type>VkBool32</type> <name>geometryShader</name></member>  - <member><type>VkBool32</type> <name>tessellationShader</name></member>  - <member><type>VkBool32</type> <name>sampleRateShading</name></member>  - <member><type>VkBool32</type> <name>dualSrcBlend</name></member>  - <member><type>VkBool32</type> <name>logicOp</name></member>  - <member><type>VkBool32</type> <name>multiDrawIndirect</name></member>  - <member><type>VkBool32</type> <name>drawIndirectFirstInstance</name></member>  - <member><type>VkBool32</type> <name>depthClamp</name></member>  - <member><type>VkBool32</type> <name>depthBiasClamp</name></member>  - <member><type>VkBool32</type> <name>fillModeNonSolid</name></member>  - <member><type>VkBool32</type> <name>depthBounds</name></member>  - <member><type>VkBool32</type> <name>wideLines</name></member>  - <member><type>VkBool32</type> <name>largePoints</name></member>  - <member><type>VkBool32</type> <name>alphaToOne</name></member>  - <member><type>VkBool32</type> <name>multiViewport</name></member>  - <member><type>VkBool32</type> <name>samplerAnisotropy</name></member>  - <member><type>VkBool32</type> <name>textureCompressionETC2</name></member>  - <member><type>VkBool32</type> <name>textureCompressionASTC_LDR</name></member>  - <member><type>VkBool32</type> <name>textureCompressionBC</name></member>  - <member><type>VkBool32</type> <name>occlusionQueryPrecise</name></member>  - <member><type>VkBool32</type> <name>pipelineStatisticsQuery</name></member>  - <member><type>VkBool32</type> <name>vertexPipelineStoresAndAtomics</name></member>  - <member><type>VkBool32</type> <name>fragmentStoresAndAtomics</name></member>  - <member><type>VkBool32</type> <name>shaderTessellationAndGeometryPointSize</name></member> - <member><type>VkBool32</type> <name>shaderImageGatherExtended</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageExtendedFormats</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageMultisample</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageReadWithoutFormat</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageWriteWithoutFormat</name></member>  - <member><type>VkBool32</type> <name>shaderUniformBufferArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderSampledImageArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderStorageBufferArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderClipDistance</name></member>  - <member><type>VkBool32</type> <name>shaderCullDistance</name></member>  - <member><type>VkBool32</type> <name>shaderFloat64</name></member>  - <member><type>VkBool32</type> <name>shaderInt64</name></member>  - <member><type>VkBool32</type> <name>shaderInt16</name></member>  - <member><type>VkBool32</type> <name>shaderResourceResidency</name></member>  - <member><type>VkBool32</type> <name>shaderResourceMinLod</name></member>  - <member><type>VkBool32</type> <name>sparseBinding</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyBuffer</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyImage2D</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyImage3D</name></member>  - <member><type>VkBool32</type> <name>sparseResidency2Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency4Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency8Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency16Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyAliased</name></member>  - <member><type>VkBool32</type> <name>variableMultisampleRate</name></member>  - <member><type>VkBool32</type> <name>inheritedQueries</name></member>  + <member><type>VkBool32</type> <name>robustBufferAccess</name><comment>out of bounds buffer accesses are well defined</comment></member> + <member><type>VkBool32</type> <name>fullDrawIndexUint32</name><comment>full 32-bit range of indices for indexed draw calls</comment></member> + <member><type>VkBool32</type> <name>imageCubeArray</name><comment>image views which are arrays of cube maps</comment></member> + <member><type>VkBool32</type> <name>independentBlend</name><comment>blending operations are controlled per-attachment</comment></member> + <member><type>VkBool32</type> <name>geometryShader</name><comment>geometry stage</comment></member> + <member><type>VkBool32</type> <name>tessellationShader</name><comment>tessellation control and evaluation stage</comment></member> + <member><type>VkBool32</type> <name>sampleRateShading</name><comment>per-sample shading and interpolation</comment></member> + <member><type>VkBool32</type> <name>dualSrcBlend</name><comment>blend operations which take two sources</comment></member> + <member><type>VkBool32</type> <name>logicOp</name><comment>logic operations</comment></member> + <member><type>VkBool32</type> <name>multiDrawIndirect</name><comment>multi draw indirect</comment></member> + <member><type>VkBool32</type> <name>drawIndirectFirstInstance</name><comment>indirect draws can use non-zero firstInstance</comment></member> + <member><type>VkBool32</type> <name>depthClamp</name><comment>depth clamping</comment></member> + <member><type>VkBool32</type> <name>depthBiasClamp</name><comment>depth bias clamping</comment></member> + <member><type>VkBool32</type> <name>fillModeNonSolid</name><comment>point and wireframe fill modes</comment></member> + <member><type>VkBool32</type> <name>depthBounds</name><comment>depth bounds test</comment></member> + <member><type>VkBool32</type> <name>wideLines</name><comment>lines with width greater than 1</comment></member> + <member><type>VkBool32</type> <name>largePoints</name><comment>points with size greater than 1</comment></member> + <member><type>VkBool32</type> <name>alphaToOne</name><comment>the fragment alpha component can be forced to maximum representable alpha value</comment></member> + <member><type>VkBool32</type> <name>multiViewport</name><comment>viewport arrays</comment></member> + <member><type>VkBool32</type> <name>samplerAnisotropy</name><comment>anisotropic sampler filtering</comment></member> + <member><type>VkBool32</type> <name>textureCompressionETC2</name><comment>ETC texture compression formats</comment></member> + <member><type>VkBool32</type> <name>textureCompressionASTC_LDR</name><comment>ASTC LDR texture compression formats</comment></member> + <member><type>VkBool32</type> <name>textureCompressionBC</name><comment>BC1-7 texture compressed formats</comment></member> + <member><type>VkBool32</type> <name>occlusionQueryPrecise</name><comment>precise occlusion queries returning actual sample counts</comment></member> + <member><type>VkBool32</type> <name>pipelineStatisticsQuery</name><comment>pipeline statistics query</comment></member> + <member><type>VkBool32</type> <name>vertexPipelineStoresAndAtomics</name><comment>stores and atomic ops on storage buffers and images are supported in vertex, tessellation, and geometry stages</comment></member> + <member><type>VkBool32</type> <name>fragmentStoresAndAtomics</name><comment>stores and atomic ops on storage buffers and images are supported in the fragment stage</comment></member> + <member><type>VkBool32</type> <name>shaderTessellationAndGeometryPointSize</name><comment>tessellation and geometry stages can export point size</comment></member> + <member><type>VkBool32</type> <name>shaderImageGatherExtended</name><comment>image gather with run-time values and independent offsets</comment></member> + <member><type>VkBool32</type> <name>shaderStorageImageExtendedFormats</name><comment>the extended set of formats can be used for storage images</comment></member> + <member><type>VkBool32</type> <name>shaderStorageImageMultisample</name><comment>multisample images can be used for storage images</comment></member> + <member><type>VkBool32</type> <name>shaderStorageImageReadWithoutFormat</name><comment>read from storage image does not require format qualifier</comment></member> + <member><type>VkBool32</type> <name>shaderStorageImageWriteWithoutFormat</name><comment>write to storage image does not require format qualifier</comment></member> + <member><type>VkBool32</type> <name>shaderUniformBufferArrayDynamicIndexing</name><comment>arrays of uniform buffers can be accessed with dynamically uniform indices</comment></member> + <member><type>VkBool32</type> <name>shaderSampledImageArrayDynamicIndexing</name><comment>arrays of sampled images can be accessed with dynamically uniform indices</comment></member> + <member><type>VkBool32</type> <name>shaderStorageBufferArrayDynamicIndexing</name><comment>arrays of storage buffers can be accessed with dynamically uniform indices</comment></member> + <member><type>VkBool32</type> <name>shaderStorageImageArrayDynamicIndexing</name><comment>arrays of storage images can be accessed with dynamically uniform indices</comment></member> + <member><type>VkBool32</type> <name>shaderClipDistance</name><comment>clip distance in shaders</comment></member> + <member><type>VkBool32</type> <name>shaderCullDistance</name><comment>cull distance in shaders</comment></member> + <member><type>VkBool32</type> <name>shaderFloat64</name><comment>64-bit floats (doubles) in shaders</comment></member> + <member><type>VkBool32</type> <name>shaderInt64</name><comment>64-bit integers in shaders</comment></member> + <member><type>VkBool32</type> <name>shaderInt16</name><comment>16-bit integers in shaders</comment></member> + <member><type>VkBool32</type> <name>shaderResourceResidency</name><comment>shader can use texture operations that return resource residency information (requires sparseNonResident support)</comment></member> + <member><type>VkBool32</type> <name>shaderResourceMinLod</name><comment>shader can use texture operations that specify minimum resource LOD</comment></member> + <member><type>VkBool32</type> <name>sparseBinding</name><comment>Sparse resources support: Resource memory can be managed at opaque page level rather than object level</comment></member> + <member><type>VkBool32</type> <name>sparseResidencyBuffer</name><comment>Sparse resources support: GPU can access partially resident buffers </comment></member> + <member><type>VkBool32</type> <name>sparseResidencyImage2D</name><comment>Sparse resources support: GPU can access partially resident 2D (non-MSAA non-depth/stencil) images </comment></member> + <member><type>VkBool32</type> <name>sparseResidencyImage3D</name><comment>Sparse resources support: GPU can access partially resident 3D images </comment></member> + <member><type>VkBool32</type> <name>sparseResidency2Samples</name><comment>Sparse resources support: GPU can access partially resident MSAA 2D images with 2 samples</comment></member> + <member><type>VkBool32</type> <name>sparseResidency4Samples</name><comment>Sparse resources support: GPU can access partially resident MSAA 2D images with 4 samples</comment></member> + <member><type>VkBool32</type> <name>sparseResidency8Samples</name><comment>Sparse resources support: GPU can access partially resident MSAA 2D images with 8 samples</comment></member> + <member><type>VkBool32</type> <name>sparseResidency16Samples</name><comment>Sparse resources support: GPU can access partially resident MSAA 2D images with 16 samples</comment></member> + <member><type>VkBool32</type> <name>sparseResidencyAliased</name><comment>Sparse resources support: GPU can correctly access data aliased into multiple locations (opt-in)</comment></member> + <member><type>VkBool32</type> <name>variableMultisampleRate</name><comment>multisample rate must be the same for all pipelines in a subpass</comment></member> + <member><type>VkBool32</type> <name>inheritedQueries</name><comment>Queries may be inherited from primary to secondary command buffers</comment></member> </type> <type category="struct" name="VkPhysicalDeviceSparseProperties" returnedonly="true"> - <member><type>VkBool32</type> <name>residencyStandard2DBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyStandard2DMultisampleBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyStandard3DBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyAlignedMipSize</name></member>  - <member><type>VkBool32</type> <name>residencyNonResidentStrict</name></member>  + <member><type>VkBool32</type> <name>residencyStandard2DBlockShape</name><comment>Sparse resources support: GPU will access all 2D (single sample) sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member> + <member><type>VkBool32</type> <name>residencyStandard2DMultisampleBlockShape</name><comment>Sparse resources support: GPU will access all 2D (multisample) sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member> + <member><type>VkBool32</type> <name>residencyStandard3DBlockShape</name><comment>Sparse resources support: GPU will access all 3D sparse resources using the standard sparse image block shapes (based on pixel format)</comment></member> + <member><type>VkBool32</type> <name>residencyAlignedMipSize</name><comment>Sparse resources support: Images with mip level dimensions that are NOT a multiple of the sparse image block dimensions will be placed in the mip tail</comment></member> + <member><type>VkBool32</type> <name>residencyNonResidentStrict</name><comment>Sparse resources support: GPU can consistently access non-resident regions of a resource, all reads return as if data is 0, writes are discarded</comment></member> </type> <type category="struct" name="VkPhysicalDeviceLimits" returnedonly="true"> -  - <member><type>uint32_t</type> <name>maxImageDimension1D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimension2D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimension3D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimensionCube</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member><type>uint32_t</type> <name>maxTexelBufferElements</name></member>  - <member><type>uint32_t</type> <name>maxUniformBufferRange</name></member>  - <member><type>uint32_t</type> <name>maxStorageBufferRange</name></member>  - <member><type>uint32_t</type> <name>maxPushConstantsSize</name></member>  -  - <member><type>uint32_t</type> <name>maxMemoryAllocationCount</name></member>  - <member><type>uint32_t</type> <name>maxSamplerAllocationCount</name></member>  - <member><type>VkDeviceSize</type> <name>bufferImageGranularity</name></member>  - <member><type>VkDeviceSize</type> <name>sparseAddressSpaceSize</name></member>  -  - <member><type>uint32_t</type> <name>maxBoundDescriptorSets</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorSamplers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorUniformBuffers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageBuffers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorSampledImages</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageImages</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorInputAttachments</name></member>  - <member><type>uint32_t</type> <name>maxPerStageResources</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetSamplers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffersDynamic</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffersDynamic</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetSampledImages</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageImages</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetInputAttachments</name></member>  -  - <member><type>uint32_t</type> <name>maxVertexInputAttributes</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputBindings</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputAttributeOffset</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputBindingStride</name></member>  - <member><type>uint32_t</type> <name>maxVertexOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxTessellationGenerationLevel</name></member>  - <member><type>uint32_t</type> <name>maxTessellationPatchSize</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerVertexInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerVertexOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerPatchOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlTotalOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxTessellationEvaluationInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationEvaluationOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxGeometryShaderInvocations</name></member>  - <member><type>uint32_t</type> <name>maxGeometryInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxGeometryOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxGeometryOutputVertices</name></member>  - <member><type>uint32_t</type> <name>maxGeometryTotalOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxFragmentInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxFragmentOutputAttachments</name></member>  - <member><type>uint32_t</type> <name>maxFragmentDualSrcAttachments</name></member>  - <member><type>uint32_t</type> <name>maxFragmentCombinedOutputResources</name></member> -  - <member><type>uint32_t</type> <name>maxComputeSharedMemorySize</name></member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupCount</name>[3]</member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupInvocations</name></member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupSize</name>[3]</member>  - <member><type>uint32_t</type> <name>subPixelPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>subTexelPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>mipmapPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>maxDrawIndexedIndexValue</name></member>  - <member><type>uint32_t</type> <name>maxDrawIndirectCount</name></member>  - <member><type>float</type> <name>maxSamplerLodBias</name></member>  - <member><type>float</type> <name>maxSamplerAnisotropy</name></member>  - <member><type>uint32_t</type> <name>maxViewports</name></member>  - <member><type>uint32_t</type> <name>maxViewportDimensions</name>[2]</member>  - <member><type>float</type> <name>viewportBoundsRange</name>[2]</member>  - <member><type>uint32_t</type> <name>viewportSubPixelBits</name></member>  - <member><type>size_t</type> <name>minMemoryMapAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minTexelBufferOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minUniformBufferOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minStorageBufferOffsetAlignment</name></member>  - <member><type>int32_t</type> <name>minTexelOffset</name></member>  - <member><type>uint32_t</type> <name>maxTexelOffset</name></member>  - <member><type>int32_t</type> <name>minTexelGatherOffset</name></member>  - <member><type>uint32_t</type> <name>maxTexelGatherOffset</name></member>  - <member><type>float</type> <name>minInterpolationOffset</name></member>  - <member><type>float</type> <name>maxInterpolationOffset</name></member>  - <member><type>uint32_t</type> <name>subPixelInterpolationOffsetBits</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferWidth</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferHeight</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferLayers</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferColorSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferDepthSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferStencilSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferNoAttachmentsSampleCounts</name></member>  - <member><type>uint32_t</type> <name>maxColorAttachments</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageColorSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageIntegerSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageDepthSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageStencilSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>storageImageSampleCounts</name></member>  - <member><type>uint32_t</type> <name>maxSampleMaskWords</name></member>  - <member><type>VkBool32</type> <name>timestampComputeAndGraphics</name></member>  - <member><type>float</type> <name>timestampPeriod</name></member>  - <member><type>uint32_t</type> <name>maxClipDistances</name></member>  - <member><type>uint32_t</type> <name>maxCullDistances</name></member>  - <member><type>uint32_t</type> <name>maxCombinedClipAndCullDistances</name></member>  - <member><type>uint32_t</type> <name>discreteQueuePriorities</name></member>  - <member><type>float</type> <name>pointSizeRange</name>[2]</member>  - <member><type>float</type> <name>lineWidthRange</name>[2]</member>  - <member><type>float</type> <name>pointSizeGranularity</name></member>  - <member><type>float</type> <name>lineWidthGranularity</name></member>  - <member><type>VkBool32</type> <name>strictLines</name></member>  - <member><type>VkBool32</type> <name>standardSampleLocations</name></member>  - <member><type>VkDeviceSize</type> <name>optimalBufferCopyOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>optimalBufferCopyRowPitchAlignment</name></member> - <member><type>VkDeviceSize</type> <name>nonCoherentAtomSize</name></member>  + <comment>resource maximum sizes</comment> + <member><type>uint32_t</type> <name>maxImageDimension1D</name><comment>max 1D image dimension</comment></member> + <member><type>uint32_t</type> <name>maxImageDimension2D</name><comment>max 2D image dimension</comment></member> + <member><type>uint32_t</type> <name>maxImageDimension3D</name><comment>max 3D image dimension</comment></member> + <member><type>uint32_t</type> <name>maxImageDimensionCube</name><comment>max cubemap image dimension</comment></member> + <member><type>uint32_t</type> <name>maxImageArrayLayers</name><comment>max layers for image arrays</comment></member> + <member><type>uint32_t</type> <name>maxTexelBufferElements</name><comment>max texel buffer size (fstexels)</comment></member> + <member><type>uint32_t</type> <name>maxUniformBufferRange</name><comment>max uniform buffer range (bytes)</comment></member> + <member><type>uint32_t</type> <name>maxStorageBufferRange</name><comment>max storage buffer range (bytes)</comment></member> + <member><type>uint32_t</type> <name>maxPushConstantsSize</name><comment>max size of the push constants pool (bytes)</comment></member> + <comment>memory limits</comment> + <member><type>uint32_t</type> <name>maxMemoryAllocationCount</name><comment>max number of device memory allocations supported</comment></member> + <member><type>uint32_t</type> <name>maxSamplerAllocationCount</name><comment>max number of samplers that can be allocated on a device</comment></member> + <member><type>VkDeviceSize</type> <name>bufferImageGranularity</name><comment>Granularity (in bytes) at which buffers and images can be bound to adjacent memory for simultaneous usage</comment></member> + <member><type>VkDeviceSize</type> <name>sparseAddressSpaceSize</name><comment>Total address space available for sparse allocations (bytes)</comment></member> + <comment>descriptor set limits</comment> + <member><type>uint32_t</type> <name>maxBoundDescriptorSets</name><comment>max number of descriptors sets that can be bound to a pipeline</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorSamplers</name><comment>max number of samplers allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUniformBuffers</name><comment>max number of uniform buffers allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageBuffers</name><comment>max number of storage buffers allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorSampledImages</name><comment>max number of sampled images allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageImages</name><comment>max number of storage images allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorInputAttachments</name><comment>max number of input attachments allowed per-stage in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxPerStageResources</name><comment>max number of resources allowed by a single stage</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetSamplers</name><comment>max number of samplers allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffers</name><comment>max number of uniform buffers allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffersDynamic</name><comment>max number of dynamic uniform buffers allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffers</name><comment>max number of storage buffers allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffersDynamic</name><comment>max number of dynamic storage buffers allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetSampledImages</name><comment>max number of sampled images allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetStorageImages</name><comment>max number of storage images allowed in all stages in a descriptor set</comment></member> + <member><type>uint32_t</type> <name>maxDescriptorSetInputAttachments</name><comment>max number of input attachments allowed in all stages in a descriptor set</comment></member> + <comment>vertex stage limits</comment> + <member><type>uint32_t</type> <name>maxVertexInputAttributes</name><comment>max number of vertex input attribute slots</comment></member> + <member><type>uint32_t</type> <name>maxVertexInputBindings</name><comment>max number of vertex input binding slots</comment></member> + <member><type>uint32_t</type> <name>maxVertexInputAttributeOffset</name><comment>max vertex input attribute offset added to vertex buffer offset</comment></member> + <member><type>uint32_t</type> <name>maxVertexInputBindingStride</name><comment>max vertex input binding stride</comment></member> + <member><type>uint32_t</type> <name>maxVertexOutputComponents</name><comment>max number of output components written by vertex shader</comment></member> + <comment>tessellation control stage limits</comment> + <member><type>uint32_t</type> <name>maxTessellationGenerationLevel</name><comment>max level supported by tessellation primitive generator</comment></member> + <member><type>uint32_t</type> <name>maxTessellationPatchSize</name><comment>max patch size (vertices)</comment></member> + <member><type>uint32_t</type> <name>maxTessellationControlPerVertexInputComponents</name><comment>max number of input components per-vertex in TCS</comment></member> + <member><type>uint32_t</type> <name>maxTessellationControlPerVertexOutputComponents</name><comment>max number of output components per-vertex in TCS</comment></member> + <member><type>uint32_t</type> <name>maxTessellationControlPerPatchOutputComponents</name><comment>max number of output components per-patch in TCS</comment></member> + <member><type>uint32_t</type> <name>maxTessellationControlTotalOutputComponents</name><comment>max total number of per-vertex and per-patch output components in TCS</comment></member> + <comment>tessellation evaluation stage limits</comment> + <member><type>uint32_t</type> <name>maxTessellationEvaluationInputComponents</name><comment>max number of input components per vertex in TES</comment></member> + <member><type>uint32_t</type> <name>maxTessellationEvaluationOutputComponents</name><comment>max number of output components per vertex in TES</comment></member> + <comment>geometry stage limits</comment> + <member><type>uint32_t</type> <name>maxGeometryShaderInvocations</name><comment>max invocation count supported in geometry shader</comment></member> + <member><type>uint32_t</type> <name>maxGeometryInputComponents</name><comment>max number of input components read in geometry stage</comment></member> + <member><type>uint32_t</type> <name>maxGeometryOutputComponents</name><comment>max number of output components written in geometry stage</comment></member> + <member><type>uint32_t</type> <name>maxGeometryOutputVertices</name><comment>max number of vertices that can be emitted in geometry stage</comment></member> + <member><type>uint32_t</type> <name>maxGeometryTotalOutputComponents</name><comment>max total number of components (all vertices) written in geometry stage</comment></member> + <comment>fragment stage limits</comment> + <member><type>uint32_t</type> <name>maxFragmentInputComponents</name><comment>max number of input components read in fragment stage</comment></member> + <member><type>uint32_t</type> <name>maxFragmentOutputAttachments</name><comment>max number of output attachments written in fragment stage</comment></member> + <member><type>uint32_t</type> <name>maxFragmentDualSrcAttachments</name><comment>max number of output attachments written when using dual source blending</comment></member> + <member><type>uint32_t</type> <name>maxFragmentCombinedOutputResources</name><comment>max total number of storage buffers, storage images and output buffers</comment></member> + <comment>compute stage limits</comment> + <member><type>uint32_t</type> <name>maxComputeSharedMemorySize</name><comment>max total storage size of work group local storage (bytes)</comment></member> + <member><type>uint32_t</type> <name>maxComputeWorkGroupCount</name>[3]<comment>max num of compute work groups that may be dispatched by a single command (x,y,z)</comment></member> + <member><type>uint32_t</type> <name>maxComputeWorkGroupInvocations</name><comment>max total compute invocations in a single local work group</comment></member> + <member><type>uint32_t</type> <name>maxComputeWorkGroupSize</name>[3]<comment>max local size of a compute work group (x,y,z)</comment></member> + <member><type>uint32_t</type> <name>subPixelPrecisionBits</name><comment>number bits of subpixel precision in screen x and y</comment></member> + <member><type>uint32_t</type> <name>subTexelPrecisionBits</name><comment>number bits of precision for selecting texel weights</comment></member> + <member><type>uint32_t</type> <name>mipmapPrecisionBits</name><comment>number bits of precision for selecting mipmap weights</comment></member> + <member><type>uint32_t</type> <name>maxDrawIndexedIndexValue</name><comment>max index value for indexed draw calls (for 32-bit indices)</comment></member> + <member><type>uint32_t</type> <name>maxDrawIndirectCount</name><comment>max draw count for indirect draw calls</comment></member> + <member><type>float</type> <name>maxSamplerLodBias</name><comment>max absolute sampler LOD bias</comment></member> + <member><type>float</type> <name>maxSamplerAnisotropy</name><comment>max degree of sampler anisotropy</comment></member> + <member><type>uint32_t</type> <name>maxViewports</name><comment>max number of active viewports</comment></member> + <member><type>uint32_t</type> <name>maxViewportDimensions</name>[2]<comment>max viewport dimensions (x,y)</comment></member> + <member><type>float</type> <name>viewportBoundsRange</name>[2]<comment>viewport bounds range (min,max)</comment></member> + <member><type>uint32_t</type> <name>viewportSubPixelBits</name><comment>number bits of subpixel precision for viewport</comment></member> + <member><type>size_t</type> <name>minMemoryMapAlignment</name><comment>min required alignment of pointers returned by MapMemory (bytes)</comment></member> + <member><type>VkDeviceSize</type> <name>minTexelBufferOffsetAlignment</name><comment>min required alignment for texel buffer offsets (bytes) </comment></member> + <member><type>VkDeviceSize</type> <name>minUniformBufferOffsetAlignment</name><comment>min required alignment for uniform buffer sizes and offsets (bytes)</comment></member> + <member><type>VkDeviceSize</type> <name>minStorageBufferOffsetAlignment</name><comment>min required alignment for storage buffer offsets (bytes)</comment></member> + <member><type>int32_t</type> <name>minTexelOffset</name><comment>min texel offset for OpTextureSampleOffset</comment></member> + <member><type>uint32_t</type> <name>maxTexelOffset</name><comment>max texel offset for OpTextureSampleOffset</comment></member> + <member><type>int32_t</type> <name>minTexelGatherOffset</name><comment>min texel offset for OpTextureGatherOffset</comment></member> + <member><type>uint32_t</type> <name>maxTexelGatherOffset</name><comment>max texel offset for OpTextureGatherOffset</comment></member> + <member><type>float</type> <name>minInterpolationOffset</name><comment>furthest negative offset for interpolateAtOffset</comment></member> + <member><type>float</type> <name>maxInterpolationOffset</name><comment>furthest positive offset for interpolateAtOffset</comment></member> + <member><type>uint32_t</type> <name>subPixelInterpolationOffsetBits</name><comment>number of subpixel bits for interpolateAtOffset</comment></member> + <member><type>uint32_t</type> <name>maxFramebufferWidth</name><comment>max width for a framebuffer</comment></member> + <member><type>uint32_t</type> <name>maxFramebufferHeight</name><comment>max height for a framebuffer</comment></member> + <member><type>uint32_t</type> <name>maxFramebufferLayers</name><comment>max layer count for a layered framebuffer</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferColorSampleCounts</name><comment>supported color sample counts for a framebuffer</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferDepthSampleCounts</name><comment>supported depth sample counts for a framebuffer</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferStencilSampleCounts</name><comment>supported stencil sample counts for a framebuffer</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferNoAttachmentsSampleCounts</name><comment>supported sample counts for a framebuffer with no attachments</comment></member> + <member><type>uint32_t</type> <name>maxColorAttachments</name><comment>max number of color attachments per subpass</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageColorSampleCounts</name><comment>supported color sample counts for a non-integer sampled image</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageIntegerSampleCounts</name><comment>supported sample counts for an integer image</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageDepthSampleCounts</name><comment>supported depth sample counts for a sampled image</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageStencilSampleCounts</name><comment>supported stencil sample counts for a sampled image</comment></member> + <member optional="true"><type>VkSampleCountFlags</type> <name>storageImageSampleCounts</name><comment>supported sample counts for a storage image</comment></member> + <member><type>uint32_t</type> <name>maxSampleMaskWords</name><comment>max number of sample mask words</comment></member> + <member><type>VkBool32</type> <name>timestampComputeAndGraphics</name><comment>timestamps on graphics and compute queues</comment></member> + <member><type>float</type> <name>timestampPeriod</name><comment>number of nanoseconds it takes for timestamp query value to increment by 1</comment></member> + <member><type>uint32_t</type> <name>maxClipDistances</name><comment>max number of clip distances</comment></member> + <member><type>uint32_t</type> <name>maxCullDistances</name><comment>max number of cull distances</comment></member> + <member><type>uint32_t</type> <name>maxCombinedClipAndCullDistances</name><comment>max combined number of user clipping</comment></member> + <member><type>uint32_t</type> <name>discreteQueuePriorities</name><comment>distinct queue priorities available </comment></member> + <member><type>float</type> <name>pointSizeRange</name>[2]<comment>range (min,max) of supported point sizes</comment></member> + <member><type>float</type> <name>lineWidthRange</name>[2]<comment>range (min,max) of supported line widths</comment></member> + <member><type>float</type> <name>pointSizeGranularity</name><comment>granularity of supported point sizes</comment></member> + <member><type>float</type> <name>lineWidthGranularity</name><comment>granularity of supported line widths</comment></member> + <member><type>VkBool32</type> <name>strictLines</name><comment>line rasterization follows preferred rules</comment></member> + <member><type>VkBool32</type> <name>standardSampleLocations</name><comment>supports standard sample locations for all supported sample counts</comment></member> + <member><type>VkDeviceSize</type> <name>optimalBufferCopyOffsetAlignment</name><comment>optimal offset of buffer copies</comment></member> + <member><type>VkDeviceSize</type> <name>optimalBufferCopyRowPitchAlignment</name><comment>optimal pitch of buffer copies</comment></member> + <member><type>VkDeviceSize</type> <name>nonCoherentAtomSize</name><comment>minimum size and alignment for non-coherent host-mapped device memory access</comment></member> </type> <type category="struct" name="VkSemaphoreCreateInfo"> <member values="VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSemaphoreCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkSemaphoreCreateFlags</type> <name>flags</name><comment>Semaphore creation flags</comment></member> </type> <type category="struct" name="VkQueryPoolCreateInfo"> <member values="VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkQueryPoolCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkQueryPoolCreateFlags</type> <name>flags</name></member> <member><type>VkQueryType</type> <name>queryType</name></member> <member><type>uint32_t</type> <name>queryCount</name></member> - <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name></member>  + <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name><comment>Optional</comment></member> </type> <type category="struct" name="VkFramebufferCreateInfo"> <member values="VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkFramebufferCreateFlags</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkFramebufferCreateFlags</type> <name>flags</name></member> <member><type>VkRenderPass</type> <name>renderPass</name></member> <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member> <member len="attachmentCount">const <type>VkImageView</type>* <name>pAttachments</name></member> @@ -1413,7 +1539,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkSubmitInfo"> <member values="VK_STRUCTURE_TYPE_SUBMIT_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkWin32KeyedMutexAcquireReleaseInfoNV,VkWin32KeyedMutexAcquireReleaseInfoKHX,VkD3D12FenceSubmitInfoKHX,VkDeviceGroupSubmitInfoKHX">const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> <member len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member> <member len="waitSemaphoreCount">const <type>VkPipelineStageFlags</type>* <name>pWaitDstStageMask</name></member> @@ -1422,37 +1548,37 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member optional="true"><type>uint32_t</type> <name>signalSemaphoreCount</name></member> <member len="signalSemaphoreCount">const <type>VkSemaphore</type>* <name>pSignalSemaphores</name></member> </type> -  + <comment>WSI extensions</comment> <type category="struct" name="VkDisplayPropertiesKHR" returnedonly="true"> - <member><type>VkDisplayKHR</type> <name>display</name></member>  - <member len="null-terminated">const <type>char</type>* <name>displayName</name></member>  - <member><type>VkExtent2D</type> <name>physicalDimensions</name></member>  - <member><type>VkExtent2D</type> <name>physicalResolution</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkBool32</type> <name>planeReorderPossible</name></member>  - <member><type>VkBool32</type> <name>persistentContent</name></member>  + <member><type>VkDisplayKHR</type> <name>display</name><comment>Handle of the display object</comment></member> + <member len="null-terminated">const <type>char</type>* <name>displayName</name><comment>Name of the display</comment></member> + <member><type>VkExtent2D</type> <name>physicalDimensions</name><comment>In millimeters?</comment></member> + <member><type>VkExtent2D</type> <name>physicalResolution</name><comment>Max resolution for CRT?</comment></member> + <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name><comment>one or more bits from VkSurfaceTransformFlagsKHR</comment></member> + <member><type>VkBool32</type> <name>planeReorderPossible</name><comment>VK_TRUE if the overlay plane's z-order can be changed on this display.</comment></member> + <member><type>VkBool32</type> <name>persistentContent</name><comment>VK_TRUE if this is a "smart" display that supports self-refresh/internal buffering.</comment></member> </type> <type category="struct" name="VkDisplayPlanePropertiesKHR" returnedonly="true"> - <member><type>VkDisplayKHR</type> <name>currentDisplay</name></member>  - <member><type>uint32_t</type> <name>currentStackIndex</name></member>  + <member><type>VkDisplayKHR</type> <name>currentDisplay</name><comment>Display the plane is currently associated with. Will be VK_NULL_HANDLE if the plane is not in use.</comment></member> + <member><type>uint32_t</type> <name>currentStackIndex</name><comment>Current z-order of the plane.</comment></member> </type> <type category="struct" name="VkDisplayModeParametersKHR"> - <member><type>VkExtent2D</type> <name>visibleRegion</name></member>  - <member><type>uint32_t</type> <name>refreshRate</name></member>  + <member><type>VkExtent2D</type> <name>visibleRegion</name><comment>Visible scanout region.</comment></member> + <member><type>uint32_t</type> <name>refreshRate</name><comment>Number of times per second the display is updated.</comment></member> </type> <type category="struct" name="VkDisplayModePropertiesKHR" returnedonly="true"> - <member><type>VkDisplayModeKHR</type> <name>displayMode</name></member>  - <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name></member>  + <member><type>VkDisplayModeKHR</type> <name>displayMode</name><comment>Handle of this display mode.</comment></member> + <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name><comment>The parameters this mode uses.</comment></member> </type> <type category="struct" name="VkDisplayModeCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDisplayModeCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDisplayModeCreateFlagsKHR</type> <name>flags</name></member> + <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name><comment>The parameters this mode uses.</comment></member> </type> <type category="struct" name="VkDisplayPlaneCapabilitiesKHR" returnedonly="true"> - <member optional="true"><type>VkDisplayPlaneAlphaFlagsKHR</type> <name>supportedAlpha</name></member>  - <member><type>VkOffset2D</type> <name>minSrcPosition</name></member>  + <member optional="true"><type>VkDisplayPlaneAlphaFlagsKHR</type> <name>supportedAlpha</name><comment>Types of alpha blending supported, if any.</comment></member> + <member><type>VkOffset2D</type> <name>minSrcPosition</name><comment>Does the plane have any position and extent restrictions?</comment></member> <member><type>VkOffset2D</type> <name>maxSrcPosition</name></member> <member><type>VkExtent2D</type> <name>minSrcExtent</name></member> <member><type>VkExtent2D</type> <name>maxSrcExtent</name></member> @@ -1463,171 +1589,171 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkDisplaySurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDisplaySurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkDisplayModeKHR</type> <name>displayMode</name></member>  - <member><type>uint32_t</type> <name>planeIndex</name></member>  - <member><type>uint32_t</type> <name>planeStackIndex</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>transform</name></member>  - <member><type>float</type> <name>globalAlpha</name></member>  - <member><type>VkDisplayPlaneAlphaFlagBitsKHR</type> <name>alphaMode</name></member>  - <member><type>VkExtent2D</type> <name>imageExtent</name></member>  - </type> - <type category="struct" name="VkDisplayPresentInfoKHR"> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDisplaySurfaceCreateFlagsKHR</type> <name>flags</name></member> + <member><type>VkDisplayModeKHR</type> <name>displayMode</name><comment>The mode to use when displaying this surface</comment></member> + <member><type>uint32_t</type> <name>planeIndex</name><comment>The plane on which this surface appears. Must be between 0 and the value returned by vkGetPhysicalDeviceDisplayPlanePropertiesKHR() in pPropertyCount.</comment></member> + <member><type>uint32_t</type> <name>planeStackIndex</name><comment>The z-order of the plane.</comment></member> + <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>transform</name><comment>Transform to apply to the images as part of the scanout operation</comment></member> + <member><type>float</type> <name>globalAlpha</name><comment>Global alpha value. Must be between 0 and 1, inclusive. Ignored if alphaMode is not VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR</comment></member> + <member><type>VkDisplayPlaneAlphaFlagBitsKHR</type> <name>alphaMode</name><comment>What type of alpha blending to use. Must be a bit from vkGetDisplayPlanePropertiesKHR::supportedAlpha.</comment></member> + <member><type>VkExtent2D</type> <name>imageExtent</name><comment>size of the images to use with this surface</comment></member> + </type> + <type category="struct" name="VkDisplayPresentInfoKHR" structextends="VkPresentInfoKHR"> <member values="VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkRect2D</type> <name>srcRect</name></member>  - <member><type>VkRect2D</type> <name>dstRect</name></member>  - <member><type>VkBool32</type> <name>persistent</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkRect2D</type> <name>srcRect</name><comment>Rectangle within the presentable image to read pixel data from when presenting to the display.</comment></member> + <member><type>VkRect2D</type> <name>dstRect</name><comment>Rectangle within the current display mode's visible region to display srcRectangle in.</comment></member> + <member><type>VkBool32</type> <name>persistent</name><comment>For smart displays, use buffered mode. If the display properties member "persistentMode" is VK_FALSE, this member must always be VK_FALSE.</comment></member> </type> <type category="struct" name="VkSurfaceCapabilitiesKHR" returnedonly="true"> - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>uint32_t</type> <name>maxImageCount</name></member>  - <member><type>VkExtent2D</type> <name>currentExtent</name></member>  - <member><type>VkExtent2D</type> <name>minImageExtent</name></member>  - <member><type>VkExtent2D</type> <name>maxImageExtent</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name></member>  - <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name></member>  + <member><type>uint32_t</type> <name>minImageCount</name><comment>Supported minimum number of images for the surface</comment></member> + <member><type>uint32_t</type> <name>maxImageCount</name><comment>Supported maximum number of images for the surface, 0 for unlimited</comment></member> + <member><type>VkExtent2D</type> <name>currentExtent</name><comment>Current image width and height for the surface, (0, 0) if undefined</comment></member> + <member><type>VkExtent2D</type> <name>minImageExtent</name><comment>Supported minimum image width and height for the surface</comment></member> + <member><type>VkExtent2D</type> <name>maxImageExtent</name><comment>Supported maximum image width and height for the surface</comment></member> + <member><type>uint32_t</type> <name>maxImageArrayLayers</name><comment>Supported maximum number of image layers for the surface</comment></member> + <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name><comment>1 or more bits representing the transforms supported</comment></member> + <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name><comment>The surface's current transform relative to the device's natural orientation</comment></member> + <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name><comment>1 or more bits representing the alpha compositing modes supported</comment></member> + <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name><comment>Supported image usage flags for the surface</comment></member> </type> <type category="struct" name="VkAndroidSurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAndroidSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true"><type>ANativeWindow</type>* <name>window</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkAndroidSurfaceCreateFlagsKHR</type> <name>flags</name></member> + <member noautovalidity="true">struct <type>ANativeWindow</type>* <name>window</name></member> </type> <type category="struct" name="VkMirSurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMirSurfaceCreateFlagsKHR</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkMirSurfaceCreateFlagsKHR</type> <name>flags</name></member> <member noautovalidity="true"><type>MirConnection</type>* <name>connection</name></member> <member noautovalidity="true"><type>MirSurface</type>* <name>mirSurface</name></member> </type> <type category="struct" name="VkViSurfaceCreateInfoNN"> <member values="VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkViSurfaceCreateFlagsNN</type> <name>flags</name></member>  - <member><type>void</type>* <name>window</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkViSurfaceCreateFlagsNN</type> <name>flags</name></member> + <member noautovalidity="true"><type>void</type>* <name>window</name></member> </type> <type category="struct" name="VkWaylandSurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkWaylandSurfaceCreateFlagsKHR</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkWaylandSurfaceCreateFlagsKHR</type> <name>flags</name></member> <member noautovalidity="true">struct <type>wl_display</type>* <name>display</name></member> <member noautovalidity="true">struct <type>wl_surface</type>* <name>surface</name></member> </type> <type category="struct" name="VkWin32SurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkWin32SurfaceCreateFlagsKHR</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkWin32SurfaceCreateFlagsKHR</type> <name>flags</name></member> <member><type>HINSTANCE</type> <name>hinstance</name></member> <member><type>HWND</type> <name>hwnd</name></member> </type> <type category="struct" name="VkXlibSurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkXlibSurfaceCreateFlagsKHR</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkXlibSurfaceCreateFlagsKHR</type> <name>flags</name></member> <member noautovalidity="true"><type>Display</type>* <name>dpy</name></member> <member><type>Window</type> <name>window</name></member> </type> <type category="struct" name="VkXcbSurfaceCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkXcbSurfaceCreateFlagsKHR</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkXcbSurfaceCreateFlagsKHR</type> <name>flags</name></member> <member noautovalidity="true"><type>xcb_connection_t</type>* <name>connection</name></member> <member><type>xcb_window_t</type> <name>window</name></member> </type> <type category="struct" name="VkSurfaceFormatKHR" returnedonly="true"> - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>VkColorSpaceKHR</type> <name>colorSpace</name></member>  + <member><type>VkFormat</type> <name>format</name><comment>Supported pair of rendering format</comment></member> + <member><type>VkColorSpaceKHR</type> <name>colorSpace</name><comment>and color space for the surface</comment></member> </type> <type category="struct" name="VkSwapchainCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupSwapchainCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSwapchainCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkSurfaceKHR</type> <name>surface</name></member>  - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>VkFormat</type> <name>imageFormat</name></member>  - <member><type>VkColorSpaceKHR</type> <name>imageColorSpace</name></member>  - <member><type>VkExtent2D</type> <name>imageExtent</name></member>  - <member><type>uint32_t</type> <name>imageArrayLayers</name></member>  - <member><type>VkImageUsageFlags</type> <name>imageUsage</name></member>  - <member><type>VkSharingMode</type> <name>imageSharingMode</name></member>  - <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member>  - <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>preTransform</name></member>  - <member><type>VkCompositeAlphaFlagBitsKHR</type> <name>compositeAlpha</name></member>  - <member><type>VkPresentModeKHR</type> <name>presentMode</name></member>  - <member><type>VkBool32</type> <name>clipped</name></member>  - <member optional="true"><type>VkSwapchainKHR</type> <name>oldSwapchain</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkSwapchainCreateFlagsKHR</type> <name>flags</name></member> + <member><type>VkSurfaceKHR</type> <name>surface</name><comment>The swapchain's target surface</comment></member> + <member><type>uint32_t</type> <name>minImageCount</name><comment>Minimum number of presentation images the application needs</comment></member> + <member><type>VkFormat</type> <name>imageFormat</name><comment>Format of the presentation images</comment></member> + <member><type>VkColorSpaceKHR</type> <name>imageColorSpace</name><comment>Colorspace of the presentation images</comment></member> + <member><type>VkExtent2D</type> <name>imageExtent</name><comment>Dimensions of the presentation images</comment></member> + <member><type>uint32_t</type> <name>imageArrayLayers</name><comment>Determines the number of views for multiview/stereo presentation</comment></member> + <member><type>VkImageUsageFlags</type> <name>imageUsage</name><comment>Bits indicating how the presentation images will be used</comment></member> + <member><type>VkSharingMode</type> <name>imageSharingMode</name><comment>Sharing mode used for the presentation images</comment></member> + <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name><comment>Number of queue families having access to the images in case of concurrent sharing mode</comment></member> + <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name><comment>Array of queue family indices having access to the images in case of concurrent sharing mode</comment></member> + <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>preTransform</name><comment>The transform, relative to the device's natural orientation, applied to the image content prior to presentation</comment></member> + <member><type>VkCompositeAlphaFlagBitsKHR</type> <name>compositeAlpha</name><comment>The alpha blending mode used when compositing this surface with other surfaces in the window system</comment></member> + <member><type>VkPresentModeKHR</type> <name>presentMode</name><comment>Which presentation mode to use for presents on this swap chain</comment></member> + <member><type>VkBool32</type> <name>clipped</name><comment>Specifies whether presentable images may be affected by window clip regions</comment></member> + <member optional="true"><type>VkSwapchainKHR</type> <name>oldSwapchain</name><comment>Existing swap chain to replace, if any</comment></member> </type> <type category="struct" name="VkPresentInfoKHR"> <member values="VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDisplayPresentInfoKHR,VkPresentRegionsKHR,VkDeviceGroupPresentInfoKHX,VkPresentTimesInfoGOOGLE">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member>  - <member optional="true" len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name></member>  - <member len="swapchainCount">const <type>uint32_t</type>* <name>pImageIndices</name></member>  - <member optional="true" len="swapchainCount"><type>VkResult</type>* <name>pResults</name></member>  - </type> - <type category="struct" name="VkDebugReportCallbackCreateInfoEXT"> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name><comment>Number of semaphores to wait for before presenting</comment></member> + <member len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name><comment>Semaphores to wait for before presenting</comment></member> + <member><type>uint32_t</type> <name>swapchainCount</name><comment>Number of swapchains to present in this call</comment></member> + <member len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name><comment>Swapchains to present an image from</comment></member> + <member len="swapchainCount">const <type>uint32_t</type>* <name>pImageIndices</name><comment>Indices of which presentable images to present</comment></member> + <member optional="true" len="swapchainCount"><type>VkResult</type>* <name>pResults</name><comment>Optional (i.e. if non-NULL) VkResult for each swapchain</comment></member> + </type> + <type category="struct" name="VkDebugReportCallbackCreateInfoEXT" structextends="VkInstanceCreateInfo"> <member values="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDebugReportFlagsEXT</type> <name>flags</name></member>  - <member><type>PFN_vkDebugReportCallbackEXT</type> <name>pfnCallback</name></member>  - <member optional="true"><type>void</type>* <name>pUserData</name></member>  - </type> - <type category="struct" name="VkValidationFlagsEXT"> - <member values="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"><type>VkStructureType</type> <name>sType</name></member>  - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>disabledValidationCheckCount</name></member>  - <member len="disabledValidationCheckCount"><type>VkValidationCheckEXT</type>* <name>pDisabledValidationChecks</name></member>  - </type> - <type category="struct" name="VkPipelineRasterizationStateRasterizationOrderAMD"> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDebugReportFlagsEXT</type> <name>flags</name><comment>Indicates which events call this callback</comment></member> + <member><type>PFN_vkDebugReportCallbackEXT</type> <name>pfnCallback</name><comment>Function pointer of a callback function</comment></member> + <member optional="true"><type>void</type>* <name>pUserData</name><comment>User data provided to callback function</comment></member> + </type> + <type category="struct" name="VkValidationFlagsEXT" structextends="VkInstanceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"><type>VkStructureType</type> <name>sType</name><comment>Must be VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT</comment></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>disabledValidationCheckCount</name><comment>Number of validation checks to disable</comment></member> + <member len="disabledValidationCheckCount"><type>VkValidationCheckEXT</type>* <name>pDisabledValidationChecks</name><comment>Validation checks to disable</comment></member> + </type> + <type category="struct" name="VkPipelineRasterizationStateRasterizationOrderAMD" structextends="VkPipelineRasterizationStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkRasterizationOrderAMD</type> <name>rasterizationOrder</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkRasterizationOrderAMD</type> <name>rasterizationOrder</name><comment>Rasterization order to use for the pipeline</comment></member> </type> <type category="struct" name="VkDebugMarkerObjectNameInfoEXT"> <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></member>  - <member><type>uint64_t</type> <name>object</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pObjectName</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name><comment>The type of the object</comment></member> + <member><type>uint64_t</type> <name>object</name><comment>The handle of the object, cast to uint64_t</comment></member> + <member len="null-terminated">const <type>char</type>* <name>pObjectName</name><comment>Name to apply to the object</comment></member> </type> <type category="struct" name="VkDebugMarkerObjectTagInfoEXT"> <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></member>  - <member><type>uint64_t</type> <name>object</name></member>  - <member><type>uint64_t</type> <name>tagName</name></member>  - <member><type>size_t</type> <name>tagSize</name></member>  - <member len="tagSize">const <type>void</type>* <name>pTag</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name><comment>The type of the object</comment></member> + <member><type>uint64_t</type> <name>object</name><comment>The handle of the object, cast to uint64_t</comment></member> + <member><type>uint64_t</type> <name>tagName</name><comment>The name of the tag to set on the object</comment></member> + <member><type>size_t</type> <name>tagSize</name><comment>The length in bytes of the tag data</comment></member> + <member len="tagSize">const <type>void</type>* <name>pTag</name><comment>Tag data to attach to the object</comment></member> </type> <type category="struct" name="VkDebugMarkerMarkerInfoEXT"> <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pMarkerName</name></member>  - <member optional="true"><type>float</type> <name>color</name>[4]</member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member len="null-terminated">const <type>char</type>* <name>pMarkerName</name><comment>Name of the debug marker</comment></member> + <member optional="true"><type>float</type> <name>color</name>[4]<comment>Optional color for debug marker</comment></member> </type> - <type category="struct" name="VkDedicatedAllocationImageCreateInfoNV"> + <type category="struct" name="VkDedicatedAllocationImageCreateInfoNV" structextends="VkImageCreateInfo"> <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>dedicatedAllocation</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>dedicatedAllocation</name><comment>Whether this image uses a dedicated allocation</comment></member> </type> - <type category="struct" name="VkDedicatedAllocationBufferCreateInfoNV"> + <type category="struct" name="VkDedicatedAllocationBufferCreateInfoNV" structextends="VkBufferCreateInfo"> <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>dedicatedAllocation</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>dedicatedAllocation</name><comment>Whether this buffer uses a dedicated allocation</comment></member> </type> - <type category="struct" name="VkDedicatedAllocationMemoryAllocateInfoNV"> + <type category="struct" name="VkDedicatedAllocationMemoryAllocateInfoNV" structextends="VkMemoryAllocateInfo"> <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImage</type> <name>image</name></member>  - <member optional="true"><type>VkBuffer</type> <name>buffer</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkImage</type> <name>image</name><comment>Image that this allocation will be bound to</comment></member> + <member optional="true"><type>VkBuffer</type> <name>buffer</name><comment>Buffer that this allocation will be bound to</comment></member> </type> <type category="struct" name="VkExternalImageFormatPropertiesNV" returnedonly="true"> <member><type>VkImageFormatProperties</type> <name>imageFormatProperties</name></member> @@ -1635,31 +1761,31 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>exportFromImportedHandleTypes</name></member> <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>compatibleHandleTypes</name></member> </type> - <type category="struct" name="VkExternalMemoryImageCreateInfoNV"> + <type category="struct" name="VkExternalMemoryImageCreateInfoNV" structextends="VkImageCreateInfo"> <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleTypes</name></member> </type> - <type category="struct" name="VkExportMemoryAllocateInfoNV"> + <type category="struct" name="VkExportMemoryAllocateInfoNV" structextends="VkMemoryAllocateInfo"> <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleTypes</name></member> </type> - <type category="struct" name="VkImportMemoryWin32HandleInfoNV"> + <type category="struct" name="VkImportMemoryWin32HandleInfoNV" structextends="VkMemoryAllocateInfo"> <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></member> <member optional="true"><type>HANDLE</type> <name>handle</name></member> </type> - <type category="struct" name="VkExportMemoryWin32HandleInfoNV"> + <type category="struct" name="VkExportMemoryWin32HandleInfoNV" structextends="VkMemoryAllocateInfo"> <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> <member optional="true"><type>DWORD</type> <name>dwAccess</name></member> </type> - <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoNV"> + <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoNV" structextends="VkSubmitInfo"> <member values="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>acquireCount</name></member> <member len="acquireCount">const <type>VkDeviceMemory</type>* <name>pAcquireSyncs</name></member> <member len="acquireCount">const <type>uint64_t</type>* <name>pAcquireKeys</name></member> @@ -1684,14 +1810,14 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkIndirectCommandsTokenNVX"> <member><type>VkIndirectCommandsTokenTypeNVX</type> <name>tokenType</name></member> - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  + <member><type>VkBuffer</type> <name>buffer</name><comment>buffer containing tableEntries and additional data for indirectCommands</comment></member> + <member><type>VkDeviceSize</type> <name>offset</name><comment>offset from the base address of the buffer</comment></member> </type> <type category="struct" name="VkIndirectCommandsLayoutTokenNVX"> <member><type>VkIndirectCommandsTokenTypeNVX</type> <name>tokenType</name></member> - <member><type>uint32_t</type> <name>bindingUnit</name></member>  - <member><type>uint32_t</type> <name>dynamicCount</name></member>  - <member><type>uint32_t</type> <name>divisor</name></member>  + <member><type>uint32_t</type> <name>bindingUnit</name><comment>Binding unit for vertex attribute / descriptor set, offset for pushconstants</comment></member> + <member><type>uint32_t</type> <name>dynamicCount</name><comment>Number of variable dynamic values for descriptor set / push constants</comment></member> + <member><type>uint32_t</type> <name>divisor</name><comment>Rate the which the array is advanced per element (must be power of 2, minimum 1)</comment></member> </type> <type category="struct" name="VkIndirectCommandsLayoutCreateInfoNVX"> <member values="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member> @@ -1768,161 +1894,200 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>VkPipelineLayout</type> <name>pipelineLayout</name></member> <member><type>VkShaderStageFlags</type> <name>stageFlags</name></member> </type> - <type category="struct" name="VkPhysicalDeviceFeatures2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceMultiviewFeaturesKHX"><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceFeatures2" structextends="VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkPhysicalDeviceFeatures</type> <name>features</name></member> </type> - <type category="struct" name="VkPhysicalDeviceProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDevicePushDescriptorPropertiesKHR,VkPhysicalDeviceIDPropertiesKHX,VkPhysicalDeviceMultiviewPropertiesKHX,VkPhysicalDeviceDiscardRectanglePropertiesEXT,VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX"><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceFeatures2KHR" alias="VkPhysicalDeviceFeatures2"/> + <type category="struct" name="VkPhysicalDeviceProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkPhysicalDeviceProperties</type> <name>properties</name></member> </type> - <type category="struct" name="VkFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceProperties2KHR" alias="VkPhysicalDeviceProperties2"/> + <type category="struct" name="VkFormatProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkFormatProperties</type> <name>formatProperties</name></member> </type> - <type category="struct" name="VkImageFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkExternalImageFormatPropertiesKHX,VkTextureLODGatherFormatPropertiesAMD"><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkFormatProperties2KHR" alias="VkFormatProperties2"/> + <type category="struct" name="VkImageFormatProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkImageFormatProperties</type> <name>imageFormatProperties</name></member> </type> - <type category="struct" name="VkPhysicalDeviceImageFormatInfo2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceExternalImageFormatInfoKHX">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkImageFormatProperties2KHR" alias="VkImageFormatProperties2"/> + <type category="struct" name="VkPhysicalDeviceImageFormatInfo2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkFormat</type> <name>format</name></member> <member><type>VkImageType</type> <name>type</name></member> <member><type>VkImageTiling</type> <name>tiling</name></member> <member><type>VkImageUsageFlags</type> <name>usage</name></member> <member optional="true"><type>VkImageCreateFlags</type> <name>flags</name></member> </type> - <type category="struct" name="VkQueueFamilyProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceImageFormatInfo2KHR" alias="VkPhysicalDeviceImageFormatInfo2"/> + <type category="struct" name="VkQueueFamilyProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkQueueFamilyProperties</type> <name>queueFamilyProperties</name></member> </type> - <type category="struct" name="VkPhysicalDeviceMemoryProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkQueueFamilyProperties2KHR" alias="VkQueueFamilyProperties2"/> + <type category="struct" name="VkPhysicalDeviceMemoryProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkPhysicalDeviceMemoryProperties</type> <name>memoryProperties</name></member> </type> - <type category="struct" name="VkSparseImageFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceMemoryProperties2KHR" alias="VkPhysicalDeviceMemoryProperties2"/> + <type category="struct" name="VkSparseImageFormatProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>VkSparseImageFormatProperties</type> <name>properties</name></member> </type> - <type category="struct" name="VkPhysicalDeviceSparseImageFormatInfo2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkSparseImageFormatProperties2KHR" alias="VkSparseImageFormatProperties2"/> + <type category="struct" name="VkPhysicalDeviceSparseImageFormatInfo2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkFormat</type> <name>format</name></member> <member><type>VkImageType</type> <name>type</name></member> <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> <member><type>VkImageUsageFlags</type> <name>usage</name></member> <member><type>VkImageTiling</type> <name>tiling</name></member> </type> - <type category="struct" name="VkPhysicalDevicePushDescriptorPropertiesKHR"> + <type category="struct" name="VkPhysicalDeviceSparseImageFormatInfo2KHR" alias="VkPhysicalDeviceSparseImageFormatInfo2"/> + <type category="struct" name="VkPhysicalDevicePushDescriptorPropertiesKHR" structextends="VkPhysicalDeviceProperties2"> <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <member><type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>maxPushDescriptors</name></member> </type> - <type category="struct" name="VkPresentRegionsKHR"> + <type category="struct" name="VkPresentRegionsKHR" structextends="VkPresentInfoKHR"> <member values="VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount" optional="true">const <type>VkPresentRegionKHR</type>* <name>pRegions</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>swapchainCount</name><comment>Copy of VkPresentInfoKHR::swapchainCount</comment></member> + <member len="swapchainCount" optional="true">const <type>VkPresentRegionKHR</type>* <name>pRegions</name><comment>The regions that have changed</comment></member> </type> <type category="struct" name="VkPresentRegionKHR"> - <member optional="true"><type>uint32_t</type> <name>rectangleCount</name></member>  - <member optional="true" len="rectangleCount">const <type>VkRectLayerKHR</type>* <name>pRectangles</name></member>  + <member optional="true"><type>uint32_t</type> <name>rectangleCount</name><comment>Number of rectangles in pRectangles</comment></member> + <member optional="true" len="rectangleCount">const <type>VkRectLayerKHR</type>* <name>pRectangles</name><comment>Array of rectangles that have changed in a swapchain's image(s)</comment></member> </type> <type category="struct" name="VkRectLayerKHR"> - <member><type>VkOffset2D</type> <name>offset</name></member>  - <member><type>VkExtent2D</type> <name>extent</name></member>  - <member><type>uint32_t</type> <name>layer</name></member>  - </type> - <type category="struct" name="VkExternalMemoryPropertiesKHX" returnedonly="true"> - <member><type>VkExternalMemoryFeatureFlagsKHX</type> <name>externalMemoryFeatures</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>exportFromImportedHandleTypes</name></member> - <member><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>compatibleHandleTypes</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceExternalImageFormatInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - </type> - <type category="struct" name="VkExternalImageFormatPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryPropertiesKHX</type> <name>externalMemoryProperties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceExternalBufferInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <member><type>VkOffset2D</type> <name>offset</name><comment>upper-left corner of a rectangle that has not changed, in pixels of a presentation images</comment></member> + <member><type>VkExtent2D</type> <name>extent</name><comment>Dimensions of a rectangle that has not changed, in pixels of a presentation images</comment></member> + <member><type>uint32_t</type> <name>layer</name><comment>Layer of a swapchain's image(s), for stereoscopic-3D images</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceVariablePointerFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>variablePointersStorageBuffer</name></member> + <member><type>VkBool32</type> <name>variablePointers</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceVariablePointerFeaturesKHR" alias="VkPhysicalDeviceVariablePointerFeatures"/> + <type category="struct" name="VkExternalMemoryProperties" returnedonly="true"> + <member><type>VkExternalMemoryFeatureFlags</type> <name>externalMemoryFeatures</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlags</type> <name>exportFromImportedHandleTypes</name></member> + <member><type>VkExternalMemoryHandleTypeFlags</type> <name>compatibleHandleTypes</name></member> + </type> + <type category="struct" name="VkExternalMemoryPropertiesKHR" alias="VkExternalMemoryProperties"/> + <type category="struct" name="VkPhysicalDeviceExternalImageFormatInfo" structextends="VkPhysicalDeviceImageFormatInfo2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalImageFormatInfoKHR" alias="VkPhysicalDeviceExternalImageFormatInfo"/> + <type category="struct" name="VkExternalImageFormatProperties" returnedonly="true" structextends="VkImageFormatProperties2"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkExternalMemoryProperties</type> <name>externalMemoryProperties</name></member> + </type> + <type category="struct" name="VkExternalImageFormatPropertiesKHR" alias="VkExternalImageFormatProperties"/> + <type category="struct" name="VkPhysicalDeviceExternalBufferInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name></member> <member><type>VkBufferUsageFlags</type> <name>usage</name></member> - <member><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> + <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> </type> - <type category="struct" name="VkExternalBufferPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryPropertiesKHX</type> <name>externalMemoryProperties</name></member> + <type category="struct" name="VkPhysicalDeviceExternalBufferInfoKHR" alias="VkPhysicalDeviceExternalBufferInfo"/> + <type category="struct" name="VkExternalBufferProperties" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkExternalMemoryProperties</type> <name>externalMemoryProperties</name></member> </type> - <type category="struct" name="VkPhysicalDeviceIDPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkExternalBufferPropertiesKHR" alias="VkExternalBufferProperties"/> + <type category="struct" name="VkPhysicalDeviceIDProperties" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>uint8_t</type> <name>deviceUUID</name>[<enum>VK_UUID_SIZE</enum>]</member> <member><type>uint8_t</type> <name>driverUUID</name>[<enum>VK_UUID_SIZE</enum>]</member> - <member><type>uint8_t</type> <name>deviceLUID</name>[<enum>VK_LUID_SIZE_KHX</enum>]</member> + <member><type>uint8_t</type> <name>deviceLUID</name>[<enum>VK_LUID_SIZE</enum>]</member> + <member><type>uint32_t</type> <name>deviceNodeMask</name></member> <member><type>VkBool32</type> <name>deviceLUIDValid</name></member> </type> - <type category="struct" name="VkExternalMemoryImageCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkExternalMemoryBufferCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkExportMemoryAllocateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkImportMemoryWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - <member><type>HANDLE</type> <name>handle</name></member> - </type> - <type category="struct" name="VkExportMemoryWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceIDPropertiesKHR" alias="VkPhysicalDeviceIDProperties"/> + <type category="struct" name="VkExternalMemoryImageCreateInfo" structextends="VkImageCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkExternalMemoryHandleTypeFlags</type> <name>handleTypes</name></member> + </type> + <type category="struct" name="VkExternalMemoryImageCreateInfoKHR" alias="VkExternalMemoryImageCreateInfo"/> + <type category="struct" name="VkExternalMemoryBufferCreateInfo" structextends="VkBufferCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlags</type> <name>handleTypes</name></member> + </type> + <type category="struct" name="VkExternalMemoryBufferCreateInfoKHR" alias="VkExternalMemoryBufferCreateInfo"/> + <type category="struct" name="VkExportMemoryAllocateInfo" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlags</type> <name>handleTypes</name></member> + </type> + <type category="struct" name="VkExportMemoryAllocateInfoKHR" alias="VkExportMemoryAllocateInfo"/> + <type category="struct" name="VkImportMemoryWin32HandleInfoKHR" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> + <member optional="true"><type>HANDLE</type> <name>handle</name></member> + <member optional="true"><type>LPCWSTR</type> <name>name</name></member> + </type> + <type category="struct" name="VkExportMemoryWin32HandleInfoKHR" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> <member><type>DWORD</type> <name>dwAccess</name></member> <member><type>LPCWSTR</type> <name>name</name></member> </type> - <type category="struct" name="VkMemoryWin32HandlePropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkMemoryWin32HandlePropertiesKHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>memoryTypeBits</name></member> </type> - <type category="struct" name="VkImportMemoryFdInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> + <type category="struct" name="VkMemoryGetWin32HandleInfoKHR"> + <member values="VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceMemory</type> <name>memory</name></member> + <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkImportMemoryFdInfoKHR" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> <member><type>int</type> <name>fd</name></member> </type> - <type category="struct" name="VkMemoryFdPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkMemoryFdPropertiesKHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>memoryTypeBits</name></member> </type> - <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoKHX"> - <member values="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkMemoryGetFdInfoKHR"> + <member values="VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceMemory</type> <name>memory</name></member> + <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoKHR" structextends="VkSubmitInfo"> + <member values="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>acquireCount</name></member> <member len="acquireCount">const <type>VkDeviceMemory</type>* <name>pAcquireSyncs</name></member> <member len="acquireCount">const <type>uint64_t</type>* <name>pAcquireKeys</name></member> @@ -1931,68 +2096,144 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member len="releaseCount">const <type>VkDeviceMemory</type>* <name>pReleaseSyncs</name></member> <member len="releaseCount">const <type>uint64_t</type>* <name>pReleaseKeys</name></member> </type> - <type category="struct" name="VkPhysicalDeviceExternalSemaphoreInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - </type> - <type category="struct" name="VkExternalSemaphorePropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>exportFromImportedHandleTypes</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>compatibleHandleTypes</name></member> - <member optional="true"><type>VkExternalSemaphoreFeatureFlagsKHX</type> <name>externalSemaphoreFeatures</name></member> - </type> - <type category="struct" name="VkExportSemaphoreCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkImportSemaphoreWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkSemaphore</type> <name>semaphore</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>handleType</name></member> - <member><type>HANDLE</type> <name>handle</name></member> + <type category="struct" name="VkPhysicalDeviceExternalSemaphoreInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalSemaphoreInfoKHR" alias="VkPhysicalDeviceExternalSemaphoreInfo"/> + <type category="struct" name="VkExternalSemaphoreProperties" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlags</type> <name>exportFromImportedHandleTypes</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlags</type> <name>compatibleHandleTypes</name></member> + <member optional="true"><type>VkExternalSemaphoreFeatureFlags</type> <name>externalSemaphoreFeatures</name></member> </type> - <type category="struct" name="VkExportSemaphoreWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkExternalSemaphorePropertiesKHR" alias="VkExternalSemaphoreProperties"/> + <type category="struct" name="VkExportSemaphoreCreateInfo" structextends="VkSemaphoreCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalSemaphoreHandleTypeFlags</type> <name>handleTypes</name></member> + </type> + <type category="struct" name="VkExportSemaphoreCreateInfoKHR" alias="VkExportSemaphoreCreateInfo"/> + <type category="struct" name="VkImportSemaphoreWin32HandleInfoKHR"> + <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member externsync="true"><type>VkSemaphore</type> <name>semaphore</name></member> + <member optional="true"><type>VkSemaphoreImportFlags</type> <name>flags</name></member> + <member optional="true"><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member> + <member optional="true"><type>HANDLE</type> <name>handle</name></member> + <member optional="true"><type>LPCWSTR</type> <name>name</name></member> + </type> + <type category="struct" name="VkExportSemaphoreWin32HandleInfoKHR" structextends="VkSemaphoreCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> <member><type>DWORD</type> <name>dwAccess</name></member> <member><type>LPCWSTR</type> <name>name</name></member> </type> - <type category="struct" name="VkD3D12FenceSubmitInfoKHX"> - <member values="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkD3D12FenceSubmitInfoKHR" structextends="VkSubmitInfo"> + <member values="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>waitSemaphoreValuesCount</name></member> <member optional="true" len="waitSemaphoreValuesCount">const <type>uint64_t</type>* <name>pWaitSemaphoreValues</name></member> <member optional="true"><type>uint32_t</type> <name>signalSemaphoreValuesCount</name></member> <member optional="true" len="signalSemaphoreValuesCount">const <type>uint64_t</type>* <name>pSignalSemaphoreValues</name></member> </type> - <type category="struct" name="VkImportSemaphoreFdInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkSemaphoreGetWin32HandleInfoKHR"> + <member values="VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkSemaphore</type> <name>semaphore</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkImportSemaphoreFdInfoKHR"> + <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member externsync="true"><type>VkSemaphore</type> <name>semaphore</name></member> + <member optional="true"><type>VkSemaphoreImportFlags</type> <name>flags</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member> <member><type>int</type> <name>fd</name></member> </type> - <type category="struct" name="VkPhysicalDeviceMultiviewFeaturesKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true"><type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>multiview</name></member>  - <member><type>VkBool32</type> <name>multiviewGeometryShader</name></member>  - <member><type>VkBool32</type> <name>multiviewTessellationShader</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceMultiviewPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>maxMultiviewViewCount</name></member>  - <member><type>uint32_t</type> <name>maxMultiviewInstanceIndex</name></member>  - </type> - <type category="struct" name="VkRenderPassMultiviewCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkSemaphoreGetFdInfoKHR"> + <member values="VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkSemaphore</type> <name>semaphore</name></member> + <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalFenceInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkExternalFenceHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalFenceInfoKHR" alias="VkPhysicalDeviceExternalFenceInfo"/> + <type category="struct" name="VkExternalFenceProperties" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkExternalFenceHandleTypeFlags</type> <name>exportFromImportedHandleTypes</name></member> + <member><type>VkExternalFenceHandleTypeFlags</type> <name>compatibleHandleTypes</name></member> + <member optional="true"><type>VkExternalFenceFeatureFlags</type> <name>externalFenceFeatures</name></member> + </type> + <type category="struct" name="VkExternalFencePropertiesKHR" alias="VkExternalFenceProperties"/> + <type category="struct" name="VkExportFenceCreateInfo" structextends="VkFenceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkExternalFenceHandleTypeFlags</type> <name>handleTypes</name></member> + </type> + <type category="struct" name="VkExportFenceCreateInfoKHR" alias="VkExportFenceCreateInfo"/> + <type category="struct" name="VkImportFenceWin32HandleInfoKHR"> + <member values="VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member externsync="true"><type>VkFence</type> <name>fence</name></member> + <member optional="true"><type>VkFenceImportFlags</type> <name>flags</name></member> + <member optional="true"><type>VkExternalFenceHandleTypeFlagBits</type> <name>handleType</name></member> + <member optional="true"><type>HANDLE</type> <name>handle</name></member> + <member optional="true"><type>LPCWSTR</type> <name>name</name></member> + </type> + <type category="struct" name="VkExportFenceWin32HandleInfoKHR" structextends="VkFenceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> + <member><type>DWORD</type> <name>dwAccess</name></member> + <member><type>LPCWSTR</type> <name>name</name></member> + </type> + <type category="struct" name="VkFenceGetWin32HandleInfoKHR"> + <member values="VK_STRUCTURE_TYPE_FENCE_GET_WIN32_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkFence</type> <name>fence</name></member> + <member><type>VkExternalFenceHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkImportFenceFdInfoKHR"> + <member values="VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member externsync="true"><type>VkFence</type> <name>fence</name></member> + <member optional="true"><type>VkFenceImportFlags</type> <name>flags</name></member> + <member><type>VkExternalFenceHandleTypeFlagBits</type> <name>handleType</name></member> + <member><type>int</type> <name>fd</name></member> + </type> + <type category="struct" name="VkFenceGetFdInfoKHR"> + <member values="VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkFence</type> <name>fence</name></member> + <member><type>VkExternalFenceHandleTypeFlagBits</type> <name>handleType</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceMultiviewFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>multiview</name><comment>Multiple views in a renderpass</comment></member> + <member><type>VkBool32</type> <name>multiviewGeometryShader</name><comment>Multiple views in a renderpass w/ geometry shader</comment></member> + <member><type>VkBool32</type> <name>multiviewTessellationShader</name><comment>Multiple views in a renderpass w/ tessellation shader</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceMultiviewFeaturesKHR" alias="VkPhysicalDeviceMultiviewFeatures"/> + <type category="struct" name="VkPhysicalDeviceMultiviewProperties" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxMultiviewViewCount</name><comment>max number of views in a subpass</comment></member> + <member><type>uint32_t</type> <name>maxMultiviewInstanceIndex</name><comment>max instance index for a draw in a multiview subpass</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceMultiviewPropertiesKHR" alias="VkPhysicalDeviceMultiviewProperties"/> + <type category="struct" name="VkRenderPassMultiviewCreateInfo" structextends="VkRenderPassCreateInfo"> + <member values="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>subpassCount</name></member> <member len="subpassCount">const <type>uint32_t</type>* <name>pViewMasks</name></member> <member optional="true"><type>uint32_t</type> <name>dependencyCount</name></member> @@ -2000,19 +2241,20 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member optional="true"><type>uint32_t</type> <name>correlationMaskCount</name></member> <member len="correlationMaskCount">const <type>uint32_t</type>* <name>pCorrelationMasks</name></member> </type> + <type category="struct" name="VkRenderPassMultiviewCreateInfoKHR" alias="VkRenderPassMultiviewCreateInfo"/> <type category="struct" name="VkSurfaceCapabilities2EXT" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT"><type>VkStructureType</type> <name>sType</name></member> <member><type>void</type>* <name>pNext</name></member> - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>uint32_t</type> <name>maxImageCount</name></member>  - <member><type>VkExtent2D</type> <name>currentExtent</name></member>  - <member><type>VkExtent2D</type> <name>minImageExtent</name></member>  - <member><type>VkExtent2D</type> <name>maxImageExtent</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name></member>  - <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name></member>  + <member><type>uint32_t</type> <name>minImageCount</name><comment>Supported minimum number of images for the surface</comment></member> + <member><type>uint32_t</type> <name>maxImageCount</name><comment>Supported maximum number of images for the surface, 0 for unlimited</comment></member> + <member><type>VkExtent2D</type> <name>currentExtent</name><comment>Current image width and height for the surface, (0, 0) if undefined</comment></member> + <member><type>VkExtent2D</type> <name>minImageExtent</name><comment>Supported minimum image width and height for the surface</comment></member> + <member><type>VkExtent2D</type> <name>maxImageExtent</name><comment>Supported maximum image width and height for the surface</comment></member> + <member><type>uint32_t</type> <name>maxImageArrayLayers</name><comment>Supported maximum number of image layers for the surface</comment></member> + <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name><comment>1 or more bits representing the transforms supported</comment></member> + <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name><comment>The surface's current transform relative to the device's natural orientation</comment></member> + <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name><comment>1 or more bits representing the alpha compositing modes supported</comment></member> + <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name><comment>Supported image usage flags for the surface</comment></member> <member optional="true"><type>VkSurfaceCounterFlagsEXT</type> <name>supportedSurfaceCounters</name></member> </type> <type category="struct" name="VkDisplayPowerInfoEXT"> @@ -2030,59 +2272,75 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkDisplayEventTypeEXT</type> <name>displayEvent</name></member> </type> - <type category="struct" name="VkSwapchainCounterCreateInfoEXT"> + <type category="struct" name="VkSwapchainCounterCreateInfoEXT" structextends="VkSwapchainCreateInfoKHR"> <member values="VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkSurfaceCounterFlagsEXT</type> <name>surfaceCounters</name></member> </type> - <type category="struct" name="VkPhysicalDeviceGroupPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkPhysicalDeviceGroupProperties" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>physicalDeviceCount</name></member> - <member><type>VkPhysicalDevice</type> <name>physicalDevices</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE_KHX</enum>]</member> + <member><type>VkPhysicalDevice</type> <name>physicalDevices</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE</enum>]</member> <member><type>VkBool32</type> <name>subsetAllocation</name></member> </type> - <type category="struct" name="VkMemoryAllocateFlagsInfoKHX"> - <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMemoryAllocateFlagsKHX</type> <name>flags</name></member> + <type category="struct" name="VkPhysicalDeviceGroupPropertiesKHR" alias="VkPhysicalDeviceGroupProperties"/> + <type category="struct" name="VkMemoryAllocateFlagsInfo" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkMemoryAllocateFlags</type> <name>flags</name></member> <member><type>uint32_t</type> <name>deviceMask</name></member> </type> - <type category="struct" name="VkBindBufferMemoryInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkMemoryAllocateFlagsInfoKHR" alias="VkMemoryAllocateFlagsInfo"/> + <type category="struct" name="VkBindBufferMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkBuffer</type> <name>buffer</name></member> <member><type>VkDeviceMemory</type> <name>memory</name></member> <member><type>VkDeviceSize</type> <name>memoryOffset</name></member> + </type> + <type category="struct" name="VkBindBufferMemoryInfoKHR" alias="VkBindBufferMemoryInfo"/> + <type category="struct" name="VkBindBufferMemoryDeviceGroupInfo" structextends="VkBindBufferMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>deviceIndexCount</name></member> <member len="deviceIndexCount">const <type>uint32_t</type>* <name>pDeviceIndices</name></member> </type> - <type category="struct" name="VkBindImageMemoryInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkBindImageMemorySwapchainInfoKHX">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkBindBufferMemoryDeviceGroupInfoKHR" alias="VkBindBufferMemoryDeviceGroupInfo"/> + <type category="struct" name="VkBindImageMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkImage</type> <name>image</name></member> - <member><type>VkDeviceMemory</type> <name>memory</name></member> + <member noautovalidity="true"><type>VkDeviceMemory</type> <name>memory</name></member> <member><type>VkDeviceSize</type> <name>memoryOffset</name></member> + </type> + <type category="struct" name="VkBindImageMemoryInfoKHR" alias="VkBindImageMemoryInfo"/> + <type category="struct" name="VkBindImageMemoryDeviceGroupInfo" structextends="VkBindImageMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>deviceIndexCount</name></member> <member len="deviceIndexCount">const <type>uint32_t</type>* <name>pDeviceIndices</name></member> - <member optional="true"><type>uint32_t</type> <name>SFRRectCount</name></member> - <member len="SFRRectCount">const <type>VkRect2D</type>* <name>pSFRRects</name></member> + <member optional="true"><type>uint32_t</type> <name>splitInstanceBindRegionCount</name></member> + <member len="splitInstanceBindRegionCount">const <type>VkRect2D</type>* <name>pSplitInstanceBindRegions</name></member> </type> - <type category="struct" name="VkDeviceGroupRenderPassBeginInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkBindImageMemoryDeviceGroupInfoKHR" alias="VkBindImageMemoryDeviceGroupInfo"/> + <type category="struct" name="VkDeviceGroupRenderPassBeginInfo" structextends="VkRenderPassBeginInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>deviceMask</name></member> <member optional="true"><type>uint32_t</type> <name>deviceRenderAreaCount</name></member> <member len="deviceRenderAreaCount">const <type>VkRect2D</type>* <name>pDeviceRenderAreas</name></member> </type> - <type category="struct" name="VkDeviceGroupCommandBufferBeginInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkDeviceGroupRenderPassBeginInfoKHR" alias="VkDeviceGroupRenderPassBeginInfo"/> + <type category="struct" name="VkDeviceGroupCommandBufferBeginInfo" structextends="VkCommandBufferBeginInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>deviceMask</name></member> </type> - <type category="struct" name="VkDeviceGroupSubmitInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkDeviceGroupCommandBufferBeginInfoKHR" alias="VkDeviceGroupCommandBufferBeginInfo"/> + <type category="struct" name="VkDeviceGroupSubmitInfo" structextends="VkSubmitInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> <member len="waitSemaphoreCount">const <type>uint32_t</type>* <name>pWaitSemaphoreDeviceIndices</name></member> <member optional="true"><type>uint32_t</type> <name>commandBufferCount</name></member> @@ -2090,135 +2348,139 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member optional="true"><type>uint32_t</type> <name>signalSemaphoreCount</name></member> <member len="signalSemaphoreCount">const <type>uint32_t</type>* <name>pSignalSemaphoreDeviceIndices</name></member> </type> - <type category="struct" name="VkDeviceGroupBindSparseInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkDeviceGroupSubmitInfoKHR" alias="VkDeviceGroupSubmitInfo"/> + <type category="struct" name="VkDeviceGroupBindSparseInfo" structextends="VkBindSparseInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member><type>uint32_t</type> <name>resourceDeviceIndex</name></member> <member><type>uint32_t</type> <name>memoryDeviceIndex</name></member> </type> - <type category="struct" name="VkDeviceGroupPresentCapabilitiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>presentMask</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE_KHX</enum>]</member> - <member><type>VkDeviceGroupPresentModeFlagsKHX</type> <name>modes</name></member> + <type category="struct" name="VkDeviceGroupBindSparseInfoKHR" alias="VkDeviceGroupBindSparseInfo"/> + <type category="struct" name="VkDeviceGroupPresentCapabilitiesKHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>presentMask</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE</enum>]</member> + <member><type>VkDeviceGroupPresentModeFlagsKHR</type> <name>modes</name></member> </type> - <type category="struct" name="VkImageSwapchainCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkImageSwapchainCreateInfoKHR" structextends="VkImageCreateInfo"> + <member values="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> </type> - <type category="struct" name="VkBindImageMemorySwapchainInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkBindImageMemorySwapchainInfoKHR" structextends="VkBindImageMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> <member><type>uint32_t</type> <name>imageIndex</name></member> </type> - <type category="struct" name="VkAcquireNextImageInfoKHX"> - <member values="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkAcquireNextImageInfoKHR"> + <member values="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> <member><type>uint64_t</type> <name>timeout</name></member> <member optional="true" externsync="true"><type>VkSemaphore</type> <name>semaphore</name></member> <member optional="true" externsync="true"><type>VkFence</type> <name>fence</name></member> <member><type>uint32_t</type> <name>deviceMask</name></member> </type> - <type category="struct" name="VkDeviceGroupPresentInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkDeviceGroupPresentInfoKHR" structextends="VkPresentInfoKHR"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>swapchainCount</name></member> <member len="swapchainCount">const <type>uint32_t</type>* <name>pDeviceMasks</name></member> - <member><type>VkDeviceGroupPresentModeFlagBitsKHX</type> <name>mode</name></member> + <member><type>VkDeviceGroupPresentModeFlagBitsKHR</type> <name>mode</name></member> </type> - <type category="struct" name="VkDeviceGroupDeviceCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <type category="struct" name="VkDeviceGroupDeviceCreateInfo" structextends="VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> <member optional="true"><type>uint32_t</type> <name>physicalDeviceCount</name></member> <member len="physicalDeviceCount">const <type>VkPhysicalDevice</type>* <name>pPhysicalDevices</name></member> </type> - <type category="struct" name="VkDeviceGroupSwapchainCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceGroupPresentModeFlagsKHX</type> <name>modes</name></member> - </type> - <type category="struct" name="VkDescriptorUpdateTemplateEntryKHR"> - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member><type>size_t</type> <name>offset</name></member>  - <member><type>size_t</type> <name>stride</name></member>  - </type> - <type category="struct" name="VkDescriptorUpdateTemplateCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDescriptorUpdateTemplateCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>descriptorUpdateEntryCount</name></member>  - <member len="descriptorUpdateEntryCount">const <type>VkDescriptorUpdateTemplateEntryKHR</type>* <name>pDescriptorUpdateEntries</name></member>  - <member><type>VkDescriptorUpdateTemplateTypeKHR</type> <name>templateType</name></member> + <type category="struct" name="VkDeviceGroupDeviceCreateInfoKHR" alias="VkDeviceGroupDeviceCreateInfo"/> + <type category="struct" name="VkDeviceGroupSwapchainCreateInfoKHR" structextends="VkSwapchainCreateInfoKHR"> + <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceGroupPresentModeFlagsKHR</type> <name>modes</name></member> + </type> + <type category="struct" name="VkDescriptorUpdateTemplateEntry"> + <member><type>uint32_t</type> <name>dstBinding</name><comment>Binding within the destination descriptor set to write</comment></member> + <member><type>uint32_t</type> <name>dstArrayElement</name><comment>Array element within the destination binding to write</comment></member> + <member><type>uint32_t</type> <name>descriptorCount</name><comment>Number of descriptors to write</comment></member> + <member><type>VkDescriptorType</type> <name>descriptorType</name><comment>Descriptor type to write</comment></member> + <member><type>size_t</type> <name>offset</name><comment>Offset into pData where the descriptors to update are stored</comment></member> + <member><type>size_t</type> <name>stride</name><comment>Stride between two descriptors in pData when writing more than one descriptor</comment></member> + </type> + <type category="struct" name="VkDescriptorUpdateTemplateEntryKHR" alias="VkDescriptorUpdateTemplateEntry"/> + <type category="struct" name="VkDescriptorUpdateTemplateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDescriptorUpdateTemplateCreateFlags</type> <name>flags</name></member> + <member><type>uint32_t</type> <name>descriptorUpdateEntryCount</name><comment>Number of descriptor update entries to use for the update template</comment></member> + <member len="descriptorUpdateEntryCount">const <type>VkDescriptorUpdateTemplateEntry</type>* <name>pDescriptorUpdateEntries</name><comment>Descriptor update entries for the template</comment></member> + <member><type>VkDescriptorUpdateTemplateType</type> <name>templateType</name></member> <member optional="true"><type>VkDescriptorSetLayout</type> <name>descriptorSetLayout</name></member> - <member optional="true"><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member> - <member optional="true"><type>VkPipelineLayout</type><name>pipelineLayout</name></member>  - <member optional="true"><type>uint32_t</type> <name>set</name></member> + <member noautovalidity="true"><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member> + <member noautovalidity="true"><type>VkPipelineLayout</type><name>pipelineLayout</name><comment>If used for push descriptors, this is the only allowed layout</comment></member> + <member noautovalidity="true"><type>uint32_t</type> <name>set</name></member> </type> - <type category="struct" name="VkXYColorEXT"> -  + <type category="struct" name="VkDescriptorUpdateTemplateCreateInfoKHR" alias="VkDescriptorUpdateTemplateCreateInfo"/> + <type category="struct" name="VkXYColorEXT" comment="Chromaticity coordinate"> <member><type>float</type> <name>x</name></member> <member><type>float</type> <name>y</name></member> </type> <type category="struct" name="VkHdrMetadataEXT"> -  + <comment>Display primary in chromaticity coordinates</comment> <member values="VK_STRUCTURE_TYPE_HDR_METADATA_EXT"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> -  - <member><type>VkXYColorEXT</type> <name>displayPrimaryRed</name></member>  - <member><type>VkXYColorEXT</type> <name>displayPrimaryGreen</name></member>  - <member><type>VkXYColorEXT</type> <name>displayPrimaryBlue</name></member>  - <member><type>VkXYColorEXT</type> <name>whitePoint</name></member>  - <member><type>float</type> <name>maxLuminance</name></member>  - <member><type>float</type> <name>minLuminance</name></member>  -  - <member><type>float</type> <name>maxContentLightLevel</name></member> + <comment> From SMPTE 2086</comment> + <member><type>VkXYColorEXT</type> <name>displayPrimaryRed</name><comment>Display primary's Red</comment></member> + <member><type>VkXYColorEXT</type> <name>displayPrimaryGreen</name><comment>Display primary's Green</comment></member> + <member><type>VkXYColorEXT</type> <name>displayPrimaryBlue</name><comment>Display primary's Blue</comment></member> + <member><type>VkXYColorEXT</type> <name>whitePoint</name><comment>Display primary's Blue</comment></member> + <member><type>float</type> <name>maxLuminance</name><comment>Display maximum luminance</comment></member> + <member><type>float</type> <name>minLuminance</name><comment>Display minimum luminance</comment></member> + <comment> From CTA 861.3</comment> + <member><type>float</type> <name>maxContentLightLevel</name><comment>Content maximum luminance</comment></member> <member><type>float</type> <name>maxFrameAverageLightLevel</name></member> </type> <type category="struct" name="VkRefreshCycleDurationGOOGLE"> - <member><type>uint64_t</type> <name>refreshDuration</name></member>  + <member><type>uint64_t</type> <name>refreshDuration</name><comment>Number of nanoseconds from the start of one refresh cycle to the next</comment></member> </type> <type category="struct" name="VkPastPresentationTimingGOOGLE"> - <member><type>uint32_t</type> <name>presentID</name></member>  - <member><type>uint64_t</type> <name>desiredPresentTime</name></member>  - <member><type>uint64_t</type> <name>actualPresentTime</name></member>  - <member><type>uint64_t</type> <name>earliestPresentTime</name></member>  - <member><type>uint64_t</type> <name>presentMargin</name></member>  + <member><type>uint32_t</type> <name>presentID</name><comment>Application-provided identifier, previously given to vkQueuePresentKHR</comment></member> + <member><type>uint64_t</type> <name>desiredPresentTime</name><comment>Earliest time an image should have been presented, previously given to vkQueuePresentKHR</comment></member> + <member><type>uint64_t</type> <name>actualPresentTime</name><comment>Time the image was actually displayed</comment></member> + <member><type>uint64_t</type> <name>earliestPresentTime</name><comment>Earliest time the image could have been displayed</comment></member> + <member><type>uint64_t</type> <name>presentMargin</name><comment>How early vkQueuePresentKHR was processed vs. how soon it needed to be and make earliestPresentTime</comment></member> </type> - <type category="struct" name="VkPresentTimesInfoGOOGLE"> + <type category="struct" name="VkPresentTimesInfoGOOGLE" structextends="VkPresentInfoKHR"> <member values="VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount" optional="true">const <type>VkPresentTimeGOOGLE</type>* <name>pTimes</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>swapchainCount</name><comment>Copy of VkPresentInfoKHR::swapchainCount</comment></member> + <member len="swapchainCount" optional="true">const <type>VkPresentTimeGOOGLE</type>* <name>pTimes</name><comment>The earliest times to present images</comment></member> </type> <type category="struct" name="VkPresentTimeGOOGLE"> - <member><type>uint32_t</type> <name>presentID</name></member>  - <member><type>uint64_t</type> <name>desiredPresentTime</name></member>  + <member><type>uint32_t</type> <name>presentID</name><comment>Application-provided identifier</comment></member> + <member><type>uint64_t</type> <name>desiredPresentTime</name><comment>Earliest time an image should be presented</comment></member> </type> <type category="struct" name="VkIOSSurfaceCreateInfoMVK"> <member values="VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkIOSSurfaceCreateFlagsMVK</type> <name>flags</name></member>  - <member>const <type>void</type>* <name>pView</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkIOSSurfaceCreateFlagsMVK</type> <name>flags</name></member> + <member noautovalidity="true">const <type>void</type>* <name>pView</name></member> </type> <type category="struct" name="VkMacOSSurfaceCreateInfoMVK"> <member values="VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMacOSSurfaceCreateFlagsMVK</type> <name>flags</name></member>  - <member>const <type>void</type>* <name>pView</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkMacOSSurfaceCreateFlagsMVK</type> <name>flags</name></member> + <member noautovalidity="true">const <type>void</type>* <name>pView</name></member> </type> <type category="struct" name="VkViewportWScalingNV"> <member><type>float</type> <name>xcoeff</name></member> <member><type>float</type> <name>ycoeff</name></member> </type> - <type category="struct" name="VkPipelineViewportWScalingStateCreateInfoNV"> + <type category="struct" name="VkPipelineViewportWScalingStateCreateInfoNV" structextends="VkPipelineViewportStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> <member><type>VkBool32</type> <name>viewportWScalingEnable</name></member> <member><type>uint32_t</type> <name>viewportCount</name></member> <member noautovalidity="true" len="viewportCount">const <type>VkViewportWScalingNV</type>* <name>pViewportWScalings</name></member> @@ -2229,31 +2491,44 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>VkViewportCoordinateSwizzleNV</type> <name>z</name></member> <member><type>VkViewportCoordinateSwizzleNV</type> <name>w</name></member> </type> - <type category="struct" name="VkPipelineViewportSwizzleStateCreateInfoNV"> + <type category="struct" name="VkPipelineViewportSwizzleStateCreateInfoNV" structextends="VkPipelineViewportStateCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineViewportSwizzleStateCreateFlagsNV</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineViewportSwizzleStateCreateFlagsNV</type> <name>flags</name></member> <member><type>uint32_t</type> <name>viewportCount</name></member> <member noautovalidity="true" optional="true" len="viewportCount">const <type>VkViewportSwizzleNV</type>* <name>pViewportSwizzles</name></member> </type> - <type category="struct" name="VkPhysicalDeviceDiscardRectanglePropertiesEXT"> + <type category="struct" name="VkPhysicalDeviceDiscardRectanglePropertiesEXT" structextends="VkPhysicalDeviceProperties2"> <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>maxDiscardRectangles</name></member>  + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxDiscardRectangles</name><comment>max number of active discard rectangles</comment></member> </type> - <type category="struct" name="VkPipelineDiscardRectangleStateCreateInfoEXT"> + <type category="struct" name="VkPipelineDiscardRectangleStateCreateInfoEXT" structextends="VkGraphicsPipelineCreateInfo"> <member values="VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDiscardRectangleStateCreateFlagsEXT</type> <name>flags</name></member>  + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineDiscardRectangleStateCreateFlagsEXT</type> <name>flags</name></member> <member><type>VkDiscardRectangleModeEXT</type> <name>discardRectangleMode</name></member> <member optional="true"><type>uint32_t</type> <name>discardRectangleCount</name></member> <member noautovalidity="true" optional="true" len="discardRectangleCount">const <type>VkRect2D</type>* <name>pDiscardRectangles</name></member> </type> - <type category="struct" name="VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX" returnedonly="true"> + <type category="struct" name="VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> <member><type>VkBool32</type> <name>perViewPositionAllComponents</name></member> </type> + <type category="struct" name="VkInputAttachmentAspectReference"> + <member><type>uint32_t</type> <name>subpass</name></member> + <member><type>uint32_t</type> <name>inputAttachmentIndex</name></member> + <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> + </type> + <type category="struct" name="VkInputAttachmentAspectReferenceKHR" alias="VkInputAttachmentAspectReference"/> + <type category="struct" name="VkRenderPassInputAttachmentAspectCreateInfo" structextends="VkRenderPassCreateInfo"> + <member values="VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>aspectReferenceCount</name></member> + <member len="aspectReferenceCount">const <type>VkInputAttachmentAspectReference</type>* <name>pAspectReferences</name></member> + </type> + <type category="struct" name="VkRenderPassInputAttachmentAspectCreateInfoKHR" alias="VkRenderPassInputAttachmentAspectCreateInfo"/> <type category="struct" name="VkPhysicalDeviceSurfaceInfo2KHR"> <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> <member>const <type>void</type>* <name>pNext</name></member> @@ -2261,7 +2536,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </type> <type category="struct" name="VkSurfaceCapabilities2KHR" returnedonly="true"> <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkSharedPresentSurfaceCapabilitiesKHR"><type>void</type>* <name>pNext</name></member>  + <member><type>void</type>* <name>pNext</name></member> <member><type>VkSurfaceCapabilitiesKHR</type> <name>surfaceCapabilities</name></member> </type> <type category="struct" name="VkSurfaceFormat2KHR" returnedonly="true"> @@ -2269,29 +2544,581 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <member><type>void</type>* <name>pNext</name></member> <member><type>VkSurfaceFormatKHR</type> <name>surfaceFormat</name></member> </type> - <type category="struct" name="VkSharedPresentSurfaceCapabilitiesKHR" returnedonly="true"> + <type category="struct" name="VkDisplayProperties2KHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDisplayPropertiesKHR</type> <name>displayProperties</name></member> + </type> + <type category="struct" name="VkDisplayPlaneProperties2KHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDisplayPlanePropertiesKHR</type> <name>displayPlaneProperties</name></member> + </type> + <type category="struct" name="VkDisplayModeProperties2KHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDisplayModePropertiesKHR</type> <name>displayModeProperties</name></member> + </type> + <type category="struct" name="VkDisplayPlaneInfo2KHR"> + <member values="VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member externsync="true"><type>VkDisplayModeKHR</type> <name>mode</name></member> + <member><type>uint32_t</type> <name>planeIndex</name></member> + </type> + <type category="struct" name="VkDisplayPlaneCapabilities2KHR" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDisplayPlaneCapabilitiesKHR</type> <name>capabilities</name></member> + </type> + <type category="struct" name="VkSharedPresentSurfaceCapabilitiesKHR" returnedonly="true" structextends="VkSurfaceCapabilities2KHR"> <member values="VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true"><type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>sharedPresentSupportedUsageFlags</name></member>  + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkImageUsageFlags</type> <name>sharedPresentSupportedUsageFlags</name><comment>Supported image usage flags if swapchain created using a shared present mode</comment></member> + </type> + <type category="struct" name="VkPhysicalDevice16BitStorageFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>storageBuffer16BitAccess</name><comment>16-bit integer/floating-point variables supported in BufferBlock</comment></member> + <member><type>VkBool32</type> <name>uniformAndStorageBuffer16BitAccess</name><comment>16-bit integer/floating-point variables supported in BufferBlock and Block</comment></member> + <member><type>VkBool32</type> <name>storagePushConstant16</name><comment>16-bit integer/floating-point variables supported in PushConstant</comment></member> + <member><type>VkBool32</type> <name>storageInputOutput16</name><comment>16-bit integer/floating-point variables supported in shader inputs and outputs</comment></member> + </type> + <type category="struct" name="VkPhysicalDevice16BitStorageFeaturesKHR" alias="VkPhysicalDevice16BitStorageFeatures"/> + <type category="struct" name="VkPhysicalDeviceSubgroupProperties" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member noautovalidity="true"><type>uint32_t</type> <name>subgroupSize</name><comment>The size of a subgroup for this queue.</comment></member> + <member noautovalidity="true"><type>VkShaderStageFlags</type> <name>supportedStages</name><comment>Bitfield of what shader stages support subgroup operations</comment></member> + <member noautovalidity="true"><type>VkSubgroupFeatureFlags</type> <name>supportedOperations</name><comment>Bitfield of what subgroup operations are supported.</comment></member> + <member noautovalidity="true"><type>VkBool32</type> <name>quadOperationsInAllStages</name><comment>Flag to specify whether quad operations are available in all stages.</comment></member> + </type> + <type category="struct" name="VkBufferMemoryRequirementsInfo2"> + <member values="VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBuffer</type> <name>buffer</name></member> + </type> + <type category="struct" name="VkBufferMemoryRequirementsInfo2KHR" alias="VkBufferMemoryRequirementsInfo2"/> + <type category="struct" name="VkImageMemoryRequirementsInfo2"> + <member values="VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkImage</type> <name>image</name></member> + </type> + <type category="struct" name="VkImageMemoryRequirementsInfo2KHR" alias="VkImageMemoryRequirementsInfo2"/> + <type category="struct" name="VkImageSparseMemoryRequirementsInfo2"> + <member values="VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkImage</type> <name>image</name></member> + </type> + <type category="struct" name="VkImageSparseMemoryRequirementsInfo2KHR" alias="VkImageSparseMemoryRequirementsInfo2"/> + <type category="struct" name="VkMemoryRequirements2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkMemoryRequirements</type> <name>memoryRequirements</name></member> + </type> + <type category="struct" name="VkMemoryRequirements2KHR" alias="VkMemoryRequirements2"/> + <type category="struct" name="VkSparseImageMemoryRequirements2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkSparseImageMemoryRequirements</type> <name>memoryRequirements</name></member> + </type> + <type category="struct" name="VkSparseImageMemoryRequirements2KHR" alias="VkSparseImageMemoryRequirements2"/> + <type category="struct" name="VkPhysicalDevicePointClippingProperties" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkPointClippingBehavior</type> <name>pointClippingBehavior</name></member> + </type> + <type category="struct" name="VkPhysicalDevicePointClippingPropertiesKHR" alias="VkPhysicalDevicePointClippingProperties"/> + <type category="struct" name="VkMemoryDedicatedRequirements" returnedonly="true" structextends="VkMemoryRequirements2"> + <member values="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>prefersDedicatedAllocation</name></member> + <member><type>VkBool32</type> <name>requiresDedicatedAllocation</name></member> </type> - <type category="struct" name="VkTextureLODGatherFormatPropertiesAMD" returnedonly="true"> + <type category="struct" name="VkMemoryDedicatedRequirementsKHR" alias="VkMemoryDedicatedRequirements"/> + <type category="struct" name="VkMemoryDedicatedAllocateInfo" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkImage</type> <name>image</name><comment>Image that this allocation will be bound to</comment></member> + <member optional="true"><type>VkBuffer</type> <name>buffer</name><comment>Buffer that this allocation will be bound to</comment></member> + </type> + <type category="struct" name="VkMemoryDedicatedAllocateInfoKHR" alias="VkMemoryDedicatedAllocateInfo"/> + <type category="struct" name="VkImageViewUsageCreateInfo" structextends="VkImageViewCreateInfo"> + <member values="VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkImageUsageFlags</type> <name>usage</name></member> + </type> + <type category="struct" name="VkImageViewUsageCreateInfoKHR" alias="VkImageViewUsageCreateInfo"/> + <type category="struct" name="VkPipelineTessellationDomainOriginStateCreateInfo" structextends="VkPipelineTessellationStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkTessellationDomainOrigin</type> <name>domainOrigin</name></member> + </type> + <type category="struct" name="VkPipelineTessellationDomainOriginStateCreateInfoKHR" alias="VkPipelineTessellationDomainOriginStateCreateInfo"/> + <type category="struct" name="VkSamplerYcbcrConversionInfo" structextends="VkSamplerCreateInfo,VkImageViewCreateInfo"> + <member values="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkSamplerYcbcrConversion</type> <name>conversion</name></member> + </type> + <type category="struct" name="VkSamplerYcbcrConversionInfoKHR" alias="VkSamplerYcbcrConversionInfo"/> + <type category="struct" name="VkSamplerYcbcrConversionCreateInfo"> + <member values="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkFormat</type> <name>format</name></member> + <member><type>VkSamplerYcbcrModelConversion</type> <name>ycbcrModel</name></member> + <member><type>VkSamplerYcbcrRange</type> <name>ycbcrRange</name></member> + <member><type>VkComponentMapping</type> <name>components</name></member> + <member><type>VkChromaLocation</type> <name>xChromaOffset</name></member> + <member><type>VkChromaLocation</type> <name>yChromaOffset</name></member> + <member><type>VkFilter</type> <name>chromaFilter</name></member> + <member><type>VkBool32</type> <name>forceExplicitReconstruction</name></member> + </type> + <type category="struct" name="VkSamplerYcbcrConversionCreateInfoKHR" alias="VkSamplerYcbcrConversionCreateInfo"/> + <type category="struct" name="VkBindImagePlaneMemoryInfo" structextends="VkBindImageMemoryInfo"> + <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkImageAspectFlagBits</type> <name>planeAspect</name></member> + </type> + <type category="struct" name="VkBindImagePlaneMemoryInfoKHR" alias="VkBindImagePlaneMemoryInfo"/> + <type category="struct" name="VkImagePlaneMemoryRequirementsInfo" structextends="VkImageMemoryRequirementsInfo2"> + <member values="VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkImageAspectFlagBits</type> <name>planeAspect</name></member> + </type> + <type category="struct" name="VkImagePlaneMemoryRequirementsInfoKHR" alias="VkImagePlaneMemoryRequirementsInfo"/> + <type category="struct" name="VkPhysicalDeviceSamplerYcbcrConversionFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>samplerYcbcrConversion</name><comment>Sampler color conversion supported</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR" alias="VkPhysicalDeviceSamplerYcbcrConversionFeatures"/> + <type category="struct" name="VkSamplerYcbcrConversionImageFormatProperties" returnedonly="true" structextends="VkImageFormatProperties2"> + <member values="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>combinedImageSamplerDescriptorCount</name></member> + </type> + <type category="struct" name="VkSamplerYcbcrConversionImageFormatPropertiesKHR" alias="VkSamplerYcbcrConversionImageFormatProperties"/> + <type category="struct" name="VkTextureLODGatherFormatPropertiesAMD" returnedonly="true" structextends="VkImageFormatProperties2"> <member values="VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  + <member><type>void</type>* <name>pNext</name></member> <member><type>VkBool32</type> <name>supportsTextureGatherLODBiasAMD</name></member> </type> + <type category="struct" name="VkProtectedSubmitInfo" structextends="VkSubmitInfo"> + <member values="VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>protectedSubmit</name><comment>Submit protected command buffers</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceProtectedMemoryFeatures" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>protectedMemory</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceProtectedMemoryProperties" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>protectedNoFault</name></member> + </type> + <type category="struct" name="VkDeviceQueueInfo2"> + <member values="VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceQueueCreateFlags</type> <name>flags</name></member> + <member><type>uint32_t</type> <name>queueFamilyIndex</name></member> + <member><type>uint32_t</type> <name>queueIndex</name></member> + </type> + <type category="struct" name="VkPipelineCoverageToColorStateCreateInfoNV" structextends="VkPipelineMultisampleStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineCoverageToColorStateCreateFlagsNV</type> <name>flags</name></member> + <member><type>VkBool32</type> <name>coverageToColorEnable</name></member> + <member optional="true"><type>uint32_t</type> <name>coverageToColorLocation</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>filterMinmaxSingleComponentFormats</name></member> + <member><type>VkBool32</type> <name>filterMinmaxImageComponentMapping</name></member> + </type> + <type category="struct" name="VkSampleLocationEXT"> + <member><type>float</type> <name>x</name></member> + <member><type>float</type> <name>y</name></member> + </type> + <type category="struct" name="VkSampleLocationsInfoEXT" structextends="VkImageMemoryBarrier"> + <member values="VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkSampleCountFlagBits</type> <name>sampleLocationsPerPixel</name></member> + <member><type>VkExtent2D</type> <name>sampleLocationGridSize</name></member> + <member><type>uint32_t</type> <name>sampleLocationsCount</name></member> + <member len="sampleLocationsCount">const <type>VkSampleLocationEXT</type>* <name>pSampleLocations</name></member> + </type> + <type category="struct" name="VkAttachmentSampleLocationsEXT"> + <member><type>uint32_t</type> <name>attachmentIndex</name></member> + <member><type>VkSampleLocationsInfoEXT</type> <name>sampleLocationsInfo</name></member> + </type> + <type category="struct" name="VkSubpassSampleLocationsEXT"> + <member><type>uint32_t</type> <name>subpassIndex</name></member> + <member><type>VkSampleLocationsInfoEXT</type> <name>sampleLocationsInfo</name></member> + </type> + <type category="struct" name="VkRenderPassSampleLocationsBeginInfoEXT" structextends="VkRenderPassBeginInfo"> + <member values="VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>uint32_t</type> <name>attachmentInitialSampleLocationsCount</name></member> + <member len="attachmentInitialSampleLocationsCount">const <type>VkAttachmentSampleLocationsEXT</type>* <name>pAttachmentInitialSampleLocations</name></member> + <member optional="true"><type>uint32_t</type> <name>postSubpassSampleLocationsCount</name></member> + <member len="postSubpassSampleLocationsCount">const <type>VkSubpassSampleLocationsEXT</type>* <name>pPostSubpassSampleLocations</name></member> + </type> + <type category="struct" name="VkPipelineSampleLocationsStateCreateInfoEXT" structextends="VkPipelineMultisampleStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>sampleLocationsEnable</name></member> + <member><type>VkSampleLocationsInfoEXT</type> <name>sampleLocationsInfo</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceSampleLocationsPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkSampleCountFlags</type> <name>sampleLocationSampleCounts</name></member> + <member><type>VkExtent2D</type> <name>maxSampleLocationGridSize</name></member> + <member><type>float</type> <name>sampleLocationCoordinateRange</name>[2]</member> + <member><type>uint32_t</type> <name>sampleLocationSubPixelBits</name></member> + <member><type>VkBool32</type> <name>variableSampleLocations</name></member> + </type> + <type category="struct" name="VkMultisamplePropertiesEXT" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_MULTISAMPLE_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkExtent2D</type> <name>maxSampleLocationGridSize</name></member> + </type> + <type category="struct" name="VkSamplerReductionModeCreateInfoEXT" structextends="VkSamplerCreateInfo"> + <member values="VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkSamplerReductionModeEXT</type> <name>reductionMode</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT" structextends="VkPhysicalDeviceFeatures2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>advancedBlendCoherentOperations</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>advancedBlendMaxColorAttachments</name></member> + <member><type>VkBool32</type> <name>advancedBlendIndependentBlend</name></member> + <member><type>VkBool32</type> <name>advancedBlendNonPremultipliedSrcColor</name></member> + <member><type>VkBool32</type> <name>advancedBlendNonPremultipliedDstColor</name></member> + <member><type>VkBool32</type> <name>advancedBlendCorrelatedOverlap</name></member> + <member><type>VkBool32</type> <name>advancedBlendAllOperations</name></member> + </type> + <type category="struct" name="VkPipelineColorBlendAdvancedStateCreateInfoEXT" structextends="VkPipelineColorBlendStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>srcPremultiplied</name></member> + <member><type>VkBool32</type> <name>dstPremultiplied</name></member> + <member><type>VkBlendOverlapEXT</type> <name>blendOverlap</name></member> + </type> + <type category="struct" name="VkPipelineCoverageModulationStateCreateInfoNV" structextends="VkPipelineMultisampleStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkPipelineCoverageModulationStateCreateFlagsNV</type> <name>flags</name></member> + <member><type>VkCoverageModulationModeNV</type> <name>coverageModulationMode</name></member> + <member><type>VkBool32</type> <name>coverageModulationTableEnable</name></member> + <member><type>uint32_t</type> <name>coverageModulationTableCount</name></member> + <member noautovalidity="true" optional="true" len="coverageModulationTableCount">const <type>float</type>* <name>pCoverageModulationTable</name></member> + </type> + <type category="struct" name="VkImageFormatListCreateInfoKHR" structextends="VkImageCreateInfo"> + <member values="VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>uint32_t</type> <name>viewFormatCount</name></member> + <member len="viewFormatCount">const <type>VkFormat</type>* <name>pViewFormats</name></member> + </type> + <type category="struct" name="VkValidationCacheCreateInfoEXT"> + <member values="VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkValidationCacheCreateFlagsEXT</type> <name>flags</name></member> + <member optional="true"><type>size_t</type> <name>initialDataSize</name></member> + <member len="initialDataSize">const <type>void</type>* <name>pInitialData</name></member> + </type> + <type category="struct" name="VkShaderModuleValidationCacheCreateInfoEXT" structextends="VkShaderModuleCreateInfo"> + <member values="VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkValidationCacheEXT</type> <name>validationCache</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceMaintenance3Properties" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxPerSetDescriptors</name></member> + <member><type>VkDeviceSize</type> <name>maxMemoryAllocationSize</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceMaintenance3PropertiesKHR" alias="VkPhysicalDeviceMaintenance3Properties"/> + <type category="struct" name="VkDescriptorSetLayoutSupport" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>supported</name></member> + </type> + <type category="struct" name="VkDescriptorSetLayoutSupportKHR" alias="VkDescriptorSetLayoutSupport"/> + <type category="struct" name="VkPhysicalDeviceShaderDrawParameterFeatures" structextends="VkPhysicalDeviceFeatures2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>shaderDrawParameters</name></member> + </type> + <type category="struct" name="VkNativeBufferANDROID"> + <member values="VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member>const <type>void</type>* <name>handle</name></member> + <member><type>int</type> <name>stride</name></member> + <member><type>int</type> <name>format</name></member> + <member><type>int</type> <name>usage</name></member> + </type> + <type category="struct" name="VkShaderResourceUsageAMD" returnedonly="true"> + <member><type>uint32_t</type> <name>numUsedVgprs</name></member> + <member><type>uint32_t</type> <name>numUsedSgprs</name></member> + <member><type>uint32_t</type> <name>ldsSizePerLocalWorkGroup</name></member> + <member><type>size_t</type> <name>ldsUsageSizeInBytes</name></member> + <member><type>size_t</type> <name>scratchMemUsageInBytes</name></member> + </type> + <type category="struct" name="VkShaderStatisticsInfoAMD" returnedonly="true"> + <member><type>VkShaderStageFlags</type> <name>shaderStageMask</name></member> + <member><type>VkShaderResourceUsageAMD</type> <name>resourceUsage</name></member> + <member><type>uint32_t</type> <name>numPhysicalVgprs</name></member> + <member><type>uint32_t</type> <name>numPhysicalSgprs</name></member> + <member><type>uint32_t</type> <name>numAvailableVgprs</name></member> + <member><type>uint32_t</type> <name>numAvailableSgprs</name></member> + <member><type>uint32_t</type> <name>computeWorkGroupSize</name>[3]</member> + </type> + <type category="struct" name="VkDeviceQueueGlobalPriorityCreateInfoEXT" structextends="VkDeviceQueueCreateInfo"> + <member values="VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkQueueGlobalPriorityEXT</type> <name>globalPriority</name></member> + </type> + <type category="struct" name="VkDebugUtilsObjectNameInfoEXT"> + <member values="VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkObjectType</type> <name>objectType</name></member> + <member><type>uint64_t</type> <name>objectHandle</name></member> + <member optional="true" len="null-terminated">const <type>char</type>* <name>pObjectName</name></member> + </type> + <type category="struct" name="VkDebugUtilsObjectTagInfoEXT"> + <member values="VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkObjectType</type> <name>objectType</name></member> + <member><type>uint64_t</type> <name>objectHandle</name></member> + <member><type>uint64_t</type> <name>tagName</name></member> + <member><type>size_t</type> <name>tagSize</name></member> + <member len="tagSize">const <type>void</type>* <name>pTag</name></member> + </type> + <type category="struct" name="VkDebugUtilsLabelEXT"> + <member values="VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member len="null-terminated">const <type>char</type>* <name>pLabelName</name></member> + <member optional="true"><type>float</type> <name>color</name>[4]</member> + </type> + <type category="struct" name="VkDebugUtilsMessengerCreateInfoEXT" structextends="VkInstanceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDebugUtilsMessengerCreateFlagsEXT</type> <name>flags</name></member> + <member><type>VkDebugUtilsMessageSeverityFlagsEXT</type> <name>messageSeverity</name></member> + <member><type>VkDebugUtilsMessageTypeFlagsEXT</type> <name>messageType</name></member> + <member><type>PFN_vkDebugUtilsMessengerCallbackEXT</type> <name>pfnUserCallback</name></member> + <member optional="true"><type>void</type>* <name>pUserData</name></member> + </type> + <type category="struct" name="VkDebugUtilsMessengerCallbackDataEXT"> + <member values="VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member optional="true">const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>VkDebugUtilsMessengerCallbackDataFlagsEXT</type> <name>flags</name></member> + <member optional="true" len="null-terminated">const <type>char</type>* <name>pMessageIdName</name></member> + <member optional="true"><type>int32_t</type> <name>messageIdNumber</name></member> + <member len="null-terminated">const <type>char</type>* <name>pMessage</name></member> + <member optional="true"><type>uint32_t</type> <name>queueLabelCount</name></member> + <member noautovalidity="true" optional="true" len="queueLabelCount"><type>VkDebugUtilsLabelEXT</type>* <name>pQueueLabels</name></member> + <member optional="true"><type>uint32_t</type> <name>cmdBufLabelCount</name></member> + <member noautovalidity="true" optional="true" len="cmdBufLabelCount"><type>VkDebugUtilsLabelEXT</type>* <name>pCmdBufLabels</name></member> + <member><type>uint32_t</type> <name>objectCount</name></member> + <member noautovalidity="true" len="objectCount"><type>VkDebugUtilsObjectNameInfoEXT</type>* <name>pObjects</name></member> + </type> + <type category="struct" name="VkImportMemoryHostPointerInfoEXT" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member> + <member optional="false"><type>void</type>* <name>pHostPointer</name></member> + </type> + <type category="struct" name="VkMemoryHostPointerPropertiesEXT"> + <member values="VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>memoryTypeBits</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceExternalMemoryHostPropertiesEXT" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceSize</type> <name>minImportedHostPointerAlignment</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceConservativeRasterizationPropertiesEXT" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name><comment>Pointer to next structure</comment></member> + <member><type>float</type> <name>primitiveOverestimationSize</name><comment>The size in pixels the primitive is enlarged at each edge during conservative rasterization</comment></member> + <member><type>float</type> <name>maxExtraPrimitiveOverestimationSize</name><comment>The maximum additional overestimation the client can specify in the pipeline state</comment></member> + <member><type>float</type> <name>extraPrimitiveOverestimationSizeGranularity</name><comment>The granularity of extra overestimation sizes the implementations supports between 0 and maxExtraOverestimationSize</comment></member> + <member><type>VkBool32</type> <name>primitiveUnderestimation</name><comment>true if the implementation supports conservative rasterization underestimation mode</comment></member> + <member><type>VkBool32</type> <name>conservativePointAndLineRasterization</name><comment>true if conservative rasterization also applies to points and lines</comment></member> + <member><type>VkBool32</type> <name>degenerateTrianglesRasterized</name><comment>true if degenerate triangles (those with zero area after snap) are rasterized</comment></member> + <member><type>VkBool32</type> <name>degenerateLinesRasterized</name><comment>true if degenerate lines (those with zero length after snap) are rasterized</comment></member> + <member><type>VkBool32</type> <name>fullyCoveredFragmentShaderInputVariable</name><comment>true if the implementation supports the FullyCoveredEXT SPIR-V builtin fragment shader input variable</comment></member> + <member><type>VkBool32</type> <name>conservativeRasterizationPostDepthCoverage</name><comment>true if the implementation supports both conservative rasterization and post depth coverage sample coverage mask</comment></member> + </type> + <type category="struct" name="VkPhysicalDeviceShaderCorePropertiesAMD" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name><comment>Pointer to next structure</comment></member> + <member><type>uint32_t</type> <name>shaderEngineCount</name><comment>number of shader engines</comment></member> + <member><type>uint32_t</type> <name>shaderArraysPerEngineCount</name><comment>number of shader arrays</comment></member> + <member><type>uint32_t</type> <name>computeUnitsPerShaderArray</name><comment>number of CUs per shader array</comment></member> + <member><type>uint32_t</type> <name>simdPerComputeUnit</name><comment>number of SIMDs per compute unit</comment></member> + <member><type>uint32_t</type> <name>wavefrontsPerSimd</name><comment>number of wavefront slots in each SIMD</comment></member> + <member><type>uint32_t</type> <name>wavefrontSize</name><comment>number of threads per wavefront</comment></member> + <member><type>uint32_t</type> <name>sgprsPerSimd</name><comment>number of physical SGPRs per SIMD</comment></member> + <member><type>uint32_t</type> <name>minSgprAllocation</name><comment>minimum number of SGPRs that can be allocated by a wave</comment></member> + <member><type>uint32_t</type> <name>maxSgprAllocation</name><comment>number of available SGPRs</comment></member> + <member><type>uint32_t</type> <name>sgprAllocationGranularity</name><comment>SGPRs are allocated in groups of this size</comment></member> + <member><type>uint32_t</type> <name>vgprsPerSimd</name><comment>number of physical VGPRs per SIMD</comment></member> + <member><type>uint32_t</type> <name>minVgprAllocation</name><comment>minimum number of VGPRs that can be allocated by a wave</comment></member> + <member><type>uint32_t</type> <name>maxVgprAllocation</name><comment>number of available VGPRs</comment></member> + <member><type>uint32_t</type> <name>vgprAllocationGranularity</name><comment>VGPRs are allocated in groups of this size</comment></member> + </type> + <type category="struct" name="VkPipelineRasterizationConservativeStateCreateInfoEXT" structextends="VkPipelineRasterizationStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member>  + <member optional="true"><type>VkPipelineRasterizationConservativeStateCreateFlagsEXT</type> <name>flags</name></member>  + <member><type>VkConservativeRasterizationModeEXT</type> <name>conservativeRasterizationMode</name></member>  + <member><type>float</type> <name>extraPrimitiveOverestimationSize</name></member>  + </type> + <type category="struct" name="VkPhysicalDeviceDescriptorIndexingFeaturesEXT" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>VkBool32</type> <name>shaderInputAttachmentArrayDynamicIndexing</name></member> + <member><type>VkBool32</type> <name>shaderUniformTexelBufferArrayDynamicIndexing</name></member> + <member><type>VkBool32</type> <name>shaderStorageTexelBufferArrayDynamicIndexing</name></member> + <member><type>VkBool32</type> <name>shaderUniformBufferArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderSampledImageArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderStorageBufferArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderStorageImageArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderInputAttachmentArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderUniformTexelBufferArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>shaderStorageTexelBufferArrayNonUniformIndexing</name></member> + <member><type>VkBool32</type> <name>descriptorBindingUniformBufferUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingSampledImageUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingStorageImageUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingStorageBufferUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingUniformTexelBufferUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingStorageTexelBufferUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>descriptorBindingUpdateUnusedWhilePending</name></member> + <member><type>VkBool32</type> <name>descriptorBindingPartiallyBound</name></member> + <member><type>VkBool32</type> <name>descriptorBindingVariableDescriptorCount</name></member> + <member><type>VkBool32</type> <name>runtimeDescriptorArray</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceDescriptorIndexingPropertiesEXT" returnedonly="true" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member noautovalidity="true"><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxUpdateAfterBindDescriptorsInAllPools</name></member> + <member><type>VkBool32</type> <name>shaderUniformBufferArrayNonUniformIndexingNative</name></member> + <member><type>VkBool32</type> <name>shaderSampledImageArrayNonUniformIndexingNative</name></member> + <member><type>VkBool32</type> <name>shaderStorageBufferArrayNonUniformIndexingNative</name></member> + <member><type>VkBool32</type> <name>shaderStorageImageArrayNonUniformIndexingNative</name></member> + <member><type>VkBool32</type> <name>shaderInputAttachmentArrayNonUniformIndexingNative</name></member> + <member><type>VkBool32</type> <name>robustBufferAccessUpdateAfterBind</name></member> + <member><type>VkBool32</type> <name>quadDivergentImplicitLod</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindSamplers</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindUniformBuffers</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindStorageBuffers</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindSampledImages</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindStorageImages</name></member> + <member><type>uint32_t</type> <name>maxPerStageDescriptorUpdateAfterBindInputAttachments</name></member> + <member><type>uint32_t</type> <name>maxPerStageUpdateAfterBindResources</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindSamplers</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindUniformBuffers</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindUniformBuffersDynamic</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindStorageBuffers</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindStorageBuffersDynamic</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindSampledImages</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindStorageImages</name></member> + <member><type>uint32_t</type> <name>maxDescriptorSetUpdateAfterBindInputAttachments</name></member> + </type> + <type category="struct" name="VkDescriptorSetLayoutBindingFlagsCreateInfoEXT" structextends="VkDescriptorSetLayoutCreateInfo"> + <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>uint32_t</type> <name>bindingCount</name></member> + <member len="bindingCount">const <type>VkDescriptorBindingFlagsEXT</type>* <name>pBindingFlags</name></member> + </type> + <type category="struct" name="VkDescriptorSetVariableDescriptorCountAllocateInfoEXT" structextends="VkDescriptorSetAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member optional="true"><type>uint32_t</type> <name>descriptorSetCount</name></member> + <member len="descriptorSetCount">const <type>uint32_t</type>* <name>pDescriptorCounts</name></member> + </type> + <type category="struct" name="VkDescriptorSetVariableDescriptorCountLayoutSupportEXT" structextends="VkDescriptorSetLayoutSupport" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxVariableDescriptorCount</name></member> + </type> + <type category="struct" name="VkVertexInputBindingDivisorDescriptionEXT"> + <member><type>uint32_t</type> <name>binding</name></member> + <member><type>uint32_t</type> <name>divisor</name></member> + </type> + <type category="struct" name="VkPipelineVertexInputDivisorStateCreateInfoEXT" structextends="VkPipelineVertexInputStateCreateInfo"> + <member values="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>vertexBindingDivisorCount</name></member> + <member len="vertexBindingDivisorCount">const <type>VkVertexInputBindingDivisorDescriptionEXT</type>* <name>pVertexBindingDivisors</name></member> + </type> + <type category="struct" name="VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT" structextends="VkPhysicalDeviceProperties2"> + <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint32_t</type> <name>maxVertexAttribDivisor</name><comment>max value of vertex attribute divisor</comment></member> + </type> + <type category="struct" name="VkImportAndroidHardwareBufferInfoANDROID" structextends="VkMemoryAllocateInfo"> + <member values="VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member>struct <type>AHardwareBuffer</type>* <name>buffer</name></member> + </type> + <type category="struct" name="VkAndroidHardwareBufferUsageANDROID" structextends="VkImageFormatProperties2" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint64_t</type> <name>androidHardwareBufferUsage</name></member> + </type> + <type category="struct" name="VkAndroidHardwareBufferPropertiesANDROID" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceSize</type> <name>allocationSize</name></member> + <member><type>uint32_t</type> <name>memoryTypeBits</name></member> + </type> + <type category="struct" name="VkMemoryGetAndroidHardwareBufferInfoANDROID"> + <member values="VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member>const <type>void</type>* <name>pNext</name></member> + <member><type>VkDeviceMemory</type> <name>memory</name></member> + </type> + <type category="struct" name="VkAndroidHardwareBufferFormatPropertiesANDROID" structextends="VkAndroidHardwareBufferPropertiesANDROID" returnedonly="true"> + <member values="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>VkFormat</type> <name>format</name></member> + <member><type>uint64_t</type> <name>externalFormat</name></member> + <member><type>VkFormatFeatureFlags</type> <name>formatFeatures</name></member> + <member><type>VkComponentMapping</type> <name>samplerYcbcrConversionComponents</name></member> + <member><type>VkSamplerYcbcrModelConversion</type> <name>suggestedYcbcrModel</name></member> + <member><type>VkSamplerYcbcrRange</type> <name>suggestedYcbcrRange</name></member> + <member><type>VkChromaLocation</type> <name>suggestedXChromaOffset</name></member> + <member><type>VkChromaLocation</type> <name>suggestedYChromaOffset</name></member> + </type> + <type category="struct" name="VkExternalFormatANDROID" structextends="VkImageCreateInfo,VkSamplerYcbcrConversionCreateInfo"> + <member values="VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID"><type>VkStructureType</type> <name>sType</name></member> + <member><type>void</type>* <name>pNext</name></member> + <member><type>uint64_t</type> <name>externalFormat</name></member> + </type> </types> -  + <comment>Vulkan enumerant (token) definitions</comment> - <enums name="API Constants" comment="Misc. hardcoded constants - not an enumerated type"> -  + <enums name="API Constants" comment="Vulkan hardcoded constants - not an enumerated type, part of the header boilerplate"> <enum value="256" name="VK_MAX_PHYSICAL_DEVICE_NAME_SIZE"/> <enum value="16" name="VK_UUID_SIZE"/> - <enum value="8" name="VK_LUID_SIZE_KHX"/> + <enum value="8" name="VK_LUID_SIZE"/> + <enum name="VK_LUID_SIZE_KHR" alias="VK_LUID_SIZE"/> <enum value="256" name="VK_MAX_EXTENSION_NAME_SIZE"/> <enum value="256" name="VK_MAX_DESCRIPTION_SIZE"/> <enum value="32" name="VK_MAX_MEMORY_TYPES"/> - <enum value="16" name="VK_MAX_MEMORY_HEAPS"/>  + <enum value="16" name="VK_MAX_MEMORY_HEAPS" comment="The maximum number of unique memory heaps, each of which supporting 1 or more memory types"/> <enum value="1000.0f" name="VK_LOD_CLAMP_NONE"/> <enum value="(~0U)" name="VK_REMAINING_MIP_LEVELS"/> <enum value="(~0U)" name="VK_REMAINING_ARRAY_LAYERS"/> @@ -2300,17 +3127,22 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum value="1" name="VK_TRUE"/> <enum value="0" name="VK_FALSE"/> <enum value="(~0U)" name="VK_QUEUE_FAMILY_IGNORED"/> - <enum value="(~0U-1)" name="VK_QUEUE_FAMILY_EXTERNAL_KHX"/> + <enum value="(~0U-1)" name="VK_QUEUE_FAMILY_EXTERNAL"/> + <enum name="VK_QUEUE_FAMILY_EXTERNAL_KHR" alias="VK_QUEUE_FAMILY_EXTERNAL"/> + <enum value="(~0U-2)" name="VK_QUEUE_FAMILY_FOREIGN_EXT"/> <enum value="(~0U)" name="VK_SUBPASS_EXTERNAL"/> - <enum value="32" name="VK_MAX_DEVICE_GROUP_SIZE_KHX"/> + <enum value="32" name="VK_MAX_DEVICE_GROUP_SIZE"/> + <enum name="VK_MAX_DEVICE_GROUP_SIZE_KHR" alias="VK_MAX_DEVICE_GROUP_SIZE"/> </enums> -  + <comment> + Unlike OpenGL, most tokens in Vulkan are actual typed enumerants in + their own numeric namespaces. The "name" attribute is the C enum + type name, and is pulled in from a type tag definition above + (slightly clunky, but retains the type / enum distinction). "type" + attributes of "enum" or "bitmask" indicate that these values should + be generated inside an appropriate definition. + </comment> <enums name="VkImageLayout" type="enum"> <enum value="0" name="VK_IMAGE_LAYOUT_UNDEFINED" comment="Implicit layout an image is when its contents are undefined due to various reasons (e.g. right after creation)"/> @@ -2319,8 +3151,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum value="3" name="VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL" comment="Optimal layout when image is only used for depth/stencil attachment read/write"/> <enum value="4" name="VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL" comment="Optimal layout when image is used for read only depth/stencil attachment and shader access"/> <enum value="5" name="VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL" comment="Optimal layout when image is used for read only shader access"/> - <enum value="6" name="VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL" comment="Optimal layout when image is used only as source of transfer operations"/> - <enum value="7" name="VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL" comment="Optimal layout when image is used only as destination of transfer operations"/> + <enum value="6" name="VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL" comment="Optimal layout when image is used only as source of transfer operations"/> + <enum value="7" name="VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL" comment="Optimal layout when image is used only as destination of transfer operations"/> <enum value="8" name="VK_IMAGE_LAYOUT_PREINITIALIZED" comment="Initial layout used when the data is populated by the CPU"/> </enums> <enums name="VkAttachmentLoadOp" type="enum"> @@ -2430,7 +3262,11 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum value="1" name="VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT"/> <enum value="2" name="VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE"/> <enum value="3" name="VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER"/> -  + <comment> + value="4" reserved for VK_KHR_sampler_mirror_clamp_to_edge + enum VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; do not + alias! + </comment> </enums> <enums name="VkCompareOp" type="enum"> <enum value="0" name="VK_COMPARE_OP_NEVER"/> @@ -2769,22 +3605,22 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum value="44" name="VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"/> <enum value="45" name="VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"/> <enum value="46" name="VK_STRUCTURE_TYPE_MEMORY_BARRIER"/> - <enum value="47" name="VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"/>  - <enum value="48" name="VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"/>  + <enum value="47" name="VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO" comment="Reserved for internal use by the loader, layers, and ICDs"/> + <enum value="48" name="VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO" comment="Reserved for internal use by the loader, layers, and ICDs"/> </enums> <enums name="VkSubpassContents" type="enum"> <enum value="0" name="VK_SUBPASS_CONTENTS_INLINE"/> <enum value="1" name="VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS"/> </enums> - <enums name="VkResult" type="enum" comment="Error and return codes"> -  + <enums name="VkResult" type="enum" comment="API result codes"> + <comment>Return codes (positive values)</comment> <enum value="0" name="VK_SUCCESS" comment="Command completed successfully"/> <enum value="1" name="VK_NOT_READY" comment="A fence or query has not yet completed"/> <enum value="2" name="VK_TIMEOUT" comment="A wait operation has not completed in the specified time"/> <enum value="3" name="VK_EVENT_SET" comment="An event is signaled"/> <enum value="4" name="VK_EVENT_RESET" comment="An event is unsignaled"/> <enum value="5" name="VK_INCOMPLETE" comment="A return array was too small for the result"/> -  + <comment>Error codes (negative values)</comment> <enum value="-1" name="VK_ERROR_OUT_OF_HOST_MEMORY" comment="A host memory allocation has failed"/> <enum value="-2" name="VK_ERROR_OUT_OF_DEVICE_MEMORY" comment="A device memory allocation has failed"/> <enum value="-3" name="VK_ERROR_INITIALIZATION_FAILED" comment="Initialization of a object has failed"/> @@ -2800,56 +3636,56 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <unused start="-12"/> </enums> <enums name="VkDynamicState" type="enum"> - <enum value="0" name="VK_DYNAMIC_STATE_VIEWPORT"/> - <enum value="1" name="VK_DYNAMIC_STATE_SCISSOR"/> - <enum value="2" name="VK_DYNAMIC_STATE_LINE_WIDTH"/> - <enum value="3" name="VK_DYNAMIC_STATE_DEPTH_BIAS"/> - <enum value="4" name="VK_DYNAMIC_STATE_BLEND_CONSTANTS"/> - <enum value="5" name="VK_DYNAMIC_STATE_DEPTH_BOUNDS"/> - <enum value="6" name="VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK"/> - <enum value="7" name="VK_DYNAMIC_STATE_STENCIL_WRITE_MASK"/> - <enum value="8" name="VK_DYNAMIC_STATE_STENCIL_REFERENCE"/> + <enum value="0" name="VK_DYNAMIC_STATE_VIEWPORT"/> + <enum value="1" name="VK_DYNAMIC_STATE_SCISSOR"/> + <enum value="2" name="VK_DYNAMIC_STATE_LINE_WIDTH"/> + <enum value="3" name="VK_DYNAMIC_STATE_DEPTH_BIAS"/> + <enum value="4" name="VK_DYNAMIC_STATE_BLEND_CONSTANTS"/> + <enum value="5" name="VK_DYNAMIC_STATE_DEPTH_BOUNDS"/> + <enum value="6" name="VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK"/> + <enum value="7" name="VK_DYNAMIC_STATE_STENCIL_WRITE_MASK"/> + <enum value="8" name="VK_DYNAMIC_STATE_STENCIL_REFERENCE"/> </enums> - <enums name="VkDescriptorUpdateTemplateTypeKHR" type="enum"> - <enum value="0" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR" comment="Create descriptor update template for descriptor set updates"/> - <enum value="1" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/> + <enums name="VkDescriptorUpdateTemplateType" type="enum"> + <enum value="0" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET" comment="Create descriptor update template for descriptor set updates"/> </enums> <enums name="VkObjectType" type="enum" comment="Enums to track objects of various types"> - <enum value="0" name="VK_OBJECT_TYPE_UNKNOWN"/> - <enum value="1" name="VK_OBJECT_TYPE_INSTANCE" comment="VkInstance"/> - <enum value="2" name="VK_OBJECT_TYPE_PHYSICAL_DEVICE" comment="VkPhysicalDevice"/> - <enum value="3" name="VK_OBJECT_TYPE_DEVICE" comment="VkDevice"/> - <enum value="4" name="VK_OBJECT_TYPE_QUEUE" comment="VkQueue"/> - <enum value="5" name="VK_OBJECT_TYPE_SEMAPHORE" comment="VkSemaphore"/> - <enum value="6" name="VK_OBJECT_TYPE_COMMAND_BUFFER" comment="VkCommandBuffer"/> - <enum value="7" name="VK_OBJECT_TYPE_FENCE" comment="VkFence"/> - <enum value="8" name="VK_OBJECT_TYPE_DEVICE_MEMORY" comment="VkDeviceMemory"/> - <enum value="9" name="VK_OBJECT_TYPE_BUFFER" comment="VkBuffer"/> - <enum value="10" name="VK_OBJECT_TYPE_IMAGE" comment="VkImage"/> - <enum value="11" name="VK_OBJECT_TYPE_EVENT" comment="VkEvent"/> - <enum value="12" name="VK_OBJECT_TYPE_QUERY_POOL" comment="VkQueryPool"/> - <enum value="13" name="VK_OBJECT_TYPE_BUFFER_VIEW" comment="VkBufferView"/> - <enum value="14" name="VK_OBJECT_TYPE_IMAGE_VIEW" comment="VkImageView"/> - <enum value="15" name="VK_OBJECT_TYPE_SHADER_MODULE" comment="VkShaderModule"/> - <enum value="16" name="VK_OBJECT_TYPE_PIPELINE_CACHE" comment="VkPipelineCache"/> - <enum value="17" name="VK_OBJECT_TYPE_PIPELINE_LAYOUT" comment="VkPipelineLayout"/> - <enum value="18" name="VK_OBJECT_TYPE_RENDER_PASS" comment="VkRenderPass"/> - <enum value="19" name="VK_OBJECT_TYPE_PIPELINE" comment="VkPipeline"/> - <enum value="20" name="VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT" comment="VkDescriptorSetLayout"/> - <enum value="21" name="VK_OBJECT_TYPE_SAMPLER" comment="VkSampler"/> - <enum value="22" name="VK_OBJECT_TYPE_DESCRIPTOR_POOL" comment="VkDescriptorPool"/> - <enum value="23" name="VK_OBJECT_TYPE_DESCRIPTOR_SET" comment="VkDescriptorSet"/> - <enum value="24" name="VK_OBJECT_TYPE_FRAMEBUFFER" comment="VkFramebuffer"/> - <enum value="25" name="VK_OBJECT_TYPE_COMMAND_POOL" comment="VkCommandPool"/> + <enum value="0" name="VK_OBJECT_TYPE_UNKNOWN"/> + <enum value="1" name="VK_OBJECT_TYPE_INSTANCE" comment="VkInstance"/> + <enum value="2" name="VK_OBJECT_TYPE_PHYSICAL_DEVICE" comment="VkPhysicalDevice"/> + <enum value="3" name="VK_OBJECT_TYPE_DEVICE" comment="VkDevice"/> + <enum value="4" name="VK_OBJECT_TYPE_QUEUE" comment="VkQueue"/> + <enum value="5" name="VK_OBJECT_TYPE_SEMAPHORE" comment="VkSemaphore"/> + <enum value="6" name="VK_OBJECT_TYPE_COMMAND_BUFFER" comment="VkCommandBuffer"/> + <enum value="7" name="VK_OBJECT_TYPE_FENCE" comment="VkFence"/> + <enum value="8" name="VK_OBJECT_TYPE_DEVICE_MEMORY" comment="VkDeviceMemory"/> + <enum value="9" name="VK_OBJECT_TYPE_BUFFER" comment="VkBuffer"/> + <enum value="10" name="VK_OBJECT_TYPE_IMAGE" comment="VkImage"/> + <enum value="11" name="VK_OBJECT_TYPE_EVENT" comment="VkEvent"/> + <enum value="12" name="VK_OBJECT_TYPE_QUERY_POOL" comment="VkQueryPool"/> + <enum value="13" name="VK_OBJECT_TYPE_BUFFER_VIEW" comment="VkBufferView"/> + <enum value="14" name="VK_OBJECT_TYPE_IMAGE_VIEW" comment="VkImageView"/> + <enum value="15" name="VK_OBJECT_TYPE_SHADER_MODULE" comment="VkShaderModule"/> + <enum value="16" name="VK_OBJECT_TYPE_PIPELINE_CACHE" comment="VkPipelineCache"/> + <enum value="17" name="VK_OBJECT_TYPE_PIPELINE_LAYOUT" comment="VkPipelineLayout"/> + <enum value="18" name="VK_OBJECT_TYPE_RENDER_PASS" comment="VkRenderPass"/> + <enum value="19" name="VK_OBJECT_TYPE_PIPELINE" comment="VkPipeline"/> + <enum value="20" name="VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT" comment="VkDescriptorSetLayout"/> + <enum value="21" name="VK_OBJECT_TYPE_SAMPLER" comment="VkSampler"/> + <enum value="22" name="VK_OBJECT_TYPE_DESCRIPTOR_POOL" comment="VkDescriptorPool"/> + <enum value="23" name="VK_OBJECT_TYPE_DESCRIPTOR_SET" comment="VkDescriptorSet"/> + <enum value="24" name="VK_OBJECT_TYPE_FRAMEBUFFER" comment="VkFramebuffer"/> + <enum value="25" name="VK_OBJECT_TYPE_COMMAND_POOL" comment="VkCommandPool"/> </enums> -  + <comment>Flags</comment> <enums name="VkQueueFlagBits" type="bitmask"> <enum bitpos="0" name="VK_QUEUE_GRAPHICS_BIT" comment="Queue supports graphics operations"/> <enum bitpos="1" name="VK_QUEUE_COMPUTE_BIT" comment="Queue supports compute operations"/> <enum bitpos="2" name="VK_QUEUE_TRANSFER_BIT" comment="Queue supports transfer operations"/> <enum bitpos="3" name="VK_QUEUE_SPARSE_BINDING_BIT" comment="Queue supports sparse resource memory management operations"/> </enums> + <enums name="VkDeviceQueueCreateFlagBits" type="bitmask"></enums> <enums name="VkMemoryPropertyFlagBits" type="bitmask"> <enum bitpos="0" name="VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT" comment="If otherwise stated, then allocate memory on device"/> <enum bitpos="1" name="VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT" comment="Memory is mappable by host"/> @@ -2985,8 +3821,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum bitpos="3" name="VK_IMAGE_ASPECT_METADATA_BIT"/> </enums> <enums name="VkSparseImageFormatFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT" comment="Image uses a single mip tail region for all array layers"/> - <enum bitpos="1" name="VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT" comment="Image requires mip level dimensions to be an integer multiple of the sparse image block dimensions for non-tail mip levels."/> + <enum bitpos="0" name="VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT" comment="Image uses a single mip tail region for all array layers"/> + <enum bitpos="1" name="VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT" comment="Image requires mip level dimensions to be an integer multiple of the sparse image block dimensions for non-tail mip levels."/> <enum bitpos="2" name="VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT" comment="Image uses a non-standard sparse image block dimensions"/> </enums> <enums name="VkSparseMemoryBindFlagBits" type="bitmask"> @@ -2997,8 +3833,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum bitpos="1" name="VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT" comment="Draw/DispatchIndirect command fetch"/> <enum bitpos="2" name="VK_PIPELINE_STAGE_VERTEX_INPUT_BIT" comment="Vertex/index fetch"/> <enum bitpos="3" name="VK_PIPELINE_STAGE_VERTEX_SHADER_BIT" comment="Vertex shading"/> - <enum bitpos="4" name="VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT" comment="Tessellation control shading"/> - <enum bitpos="5" name="VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT" comment="Tessellation evaluation shading"/> + <enum bitpos="4" name="VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT" comment="Tessellation control shading"/> + <enum bitpos="5" name="VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT" comment="Tessellation evaluation shading"/> <enum bitpos="6" name="VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT" comment="Geometry shading"/> <enum bitpos="7" name="VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT" comment="Fragment shading"/> <enum bitpos="8" name="VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT" comment="Early fragment (depth and stencil) tests"/> @@ -3044,7 +3880,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enums name="VkDependencyFlagBits" type="bitmask"> <enum bitpos="0" name="VK_DEPENDENCY_BY_REGION_BIT" comment="Dependency is per pixel region "/> </enums> -  + + <comment>WSI Extensions</comment> <enums name="VkPresentModeKHR" type="enum"> <enum value="0" name="VK_PRESENT_MODE_IMMEDIATE_KHR"/> <enum value="1" name="VK_PRESENT_MODE_MAILBOX_KHR"/> @@ -3078,161 +3915,188 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <enum bitpos="8" name="VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR"/> </enums> <enums name="VkDebugReportFlagBitsEXT" type="bitmask"> - <enum bitpos="0" name="VK_DEBUG_REPORT_INFORMATION_BIT_EXT"/> - <enum bitpos="1" name="VK_DEBUG_REPORT_WARNING_BIT_EXT"/> - <enum bitpos="2" name="VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT"/> - <enum bitpos="3" name="VK_DEBUG_REPORT_ERROR_BIT_EXT"/> - <enum bitpos="4" name="VK_DEBUG_REPORT_DEBUG_BIT_EXT"/> + <enum bitpos="0" name="VK_DEBUG_REPORT_INFORMATION_BIT_EXT"/> + <enum bitpos="1" name="VK_DEBUG_REPORT_WARNING_BIT_EXT"/> + <enum bitpos="2" name="VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT"/> + <enum bitpos="3" name="VK_DEBUG_REPORT_ERROR_BIT_EXT"/> + <enum bitpos="4" name="VK_DEBUG_REPORT_DEBUG_BIT_EXT"/> </enums> <enums name="VkDebugReportObjectTypeEXT" type="enum"> - <enum value="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT"/> - <enum value="1" name="VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT"/> - <enum value="2" name="VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT"/> - <enum value="3" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT"/> - <enum value="4" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT"/> - <enum value="5" name="VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT"/> - <enum value="6" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT"/> - <enum value="7" name="VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT"/> - <enum value="8" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT"/> - <enum value="9" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT"/> - <enum value="10" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT"/> - <enum value="11" name="VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT"/> - <enum value="12" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT"/> - <enum value="13" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT"/> - <enum value="14" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT"/> - <enum value="15" name="VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT"/> - <enum value="16" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT"/> - <enum value="17" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT"/> - <enum value="18" name="VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT"/> - <enum value="19" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT"/> - <enum value="20" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT"/> - <enum value="21" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT"/> - <enum value="22" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT"/> - <enum value="23" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT"/> - <enum value="24" name="VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT"/> - <enum value="25" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT"/> - <enum value="26" name="VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT"/> - <enum value="27" name="VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT"/> - <enum value="28" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT"/> - <enum value="29" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT"/> - <enum value="30" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT"/> - <enum value="31" name="VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT"/> - <enum value="32" name="VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT"/> + <enum value="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT"/> + <enum value="1" name="VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT"/> + <enum value="2" name="VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT"/> + <enum value="3" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT"/> + <enum value="4" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT"/> + <enum value="5" name="VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT"/> + <enum value="6" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT"/> + <enum value="7" name="VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT"/> + <enum value="8" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT"/> + <enum value="9" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT"/> + <enum value="10" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT"/> + <enum value="11" name="VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT"/> + <enum value="12" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT"/> + <enum value="13" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT"/> + <enum value="14" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT"/> + <enum value="15" name="VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT"/> + <enum value="16" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT"/> + <enum value="17" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT"/> + <enum value="18" name="VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT"/> + <enum value="19" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT"/> + <enum value="20" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT"/> + <enum value="21" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT"/> + <enum value="22" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT"/> + <enum value="23" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT"/> + <enum value="24" name="VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT"/> + <enum value="25" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT"/> + <enum value="26" name="VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT"/> + <enum value="27" name="VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT"/> + <enum value="28" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT"/> + <enum value="29" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT"/> + <enum value="30" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT"/> + <enum value="31" name="VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT"/> + <enum value="32" name="VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT"/> + <enum value="33" name="VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT"/> </enums> <enums name="VkRasterizationOrderAMD" type="enum"> - <enum value="0" name="VK_RASTERIZATION_ORDER_STRICT_AMD"/>  - <enum value="1" name="VK_RASTERIZATION_ORDER_RELAXED_AMD"/>  + <enum value="0" name="VK_RASTERIZATION_ORDER_STRICT_AMD"/> + <enum value="1" name="VK_RASTERIZATION_ORDER_RELAXED_AMD"/> </enums> <enums name="VkExternalMemoryHandleTypeFlagBitsNV" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_NV"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_NV"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_BIT_NV"/> - <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV"/> + <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_NV"/> + <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_NV"/> + <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_BIT_NV"/> + <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV"/> </enums> <enums name="VkExternalMemoryFeatureFlagBitsNV" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_NV"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_NV"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV"/> + <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_NV"/> + <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_NV"/> + <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV"/> </enums> <enums name="VkValidationCheckEXT" type="enum"> - <enum value="0" name="VK_VALIDATION_CHECK_ALL_EXT"/> - <enum value="1" name="VK_VALIDATION_CHECK_SHADERS_EXT"/> -  + <enum value="0" name="VK_VALIDATION_CHECK_ALL_EXT"/> + <enum value="1" name="VK_VALIDATION_CHECK_SHADERS_EXT"/> + <comment>Placeholder for validation enums to be defined for VK_EXT_Validation_flags extension</comment> + </enums> + <enums name="VkSubgroupFeatureFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_SUBGROUP_FEATURE_BASIC_BIT" comment="Basic subgroup operations"/> + <enum bitpos="1" name="VK_SUBGROUP_FEATURE_VOTE_BIT" comment="Vote subgroup operations"/> + <enum bitpos="2" name="VK_SUBGROUP_FEATURE_ARITHMETIC_BIT" comment="Arithmetic subgroup operations"/> + <enum bitpos="3" name="VK_SUBGROUP_FEATURE_BALLOT_BIT" comment="Ballot subgroup operations"/> + <enum bitpos="4" name="VK_SUBGROUP_FEATURE_SHUFFLE_BIT" comment="Shuffle subgroup operations"/> + <enum bitpos="5" name="VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT" comment="Shuffle relative subgroup operations"/> + <enum bitpos="6" name="VK_SUBGROUP_FEATURE_CLUSTERED_BIT" comment="Clustered subgroup operations"/> + <enum bitpos="7" name="VK_SUBGROUP_FEATURE_QUAD_BIT" comment="Quad subgroup operations"/> </enums> <enums name="VkIndirectCommandsLayoutUsageFlagBitsNVX" type="bitmask"> - <enum bitpos="0" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NVX"/>  - <enum bitpos="1" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_SPARSE_SEQUENCES_BIT_NVX"/>  - <enum bitpos="2" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EMPTY_EXECUTIONS_BIT_NVX"/>  - <enum bitpos="3" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_INDEXED_SEQUENCES_BIT_NVX"/>  + <enum bitpos="0" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NVX"/> + <enum bitpos="1" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_SPARSE_SEQUENCES_BIT_NVX"/> + <enum bitpos="2" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EMPTY_EXECUTIONS_BIT_NVX"/> + <enum bitpos="3" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_INDEXED_SEQUENCES_BIT_NVX"/> </enums> <enums name="VkObjectEntryUsageFlagBitsNVX" type="bitmask"> - <enum bitpos="0" name="VK_OBJECT_ENTRY_USAGE_GRAPHICS_BIT_NVX"/> - <enum bitpos="1" name="VK_OBJECT_ENTRY_USAGE_COMPUTE_BIT_NVX"/> + <enum bitpos="0" name="VK_OBJECT_ENTRY_USAGE_GRAPHICS_BIT_NVX"/> + <enum bitpos="1" name="VK_OBJECT_ENTRY_USAGE_COMPUTE_BIT_NVX"/> </enums> <enums name="VkIndirectCommandsTokenTypeNVX" type="enum"> - <enum value="0" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PIPELINE_NVX"/>  - <enum value="1" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DESCRIPTOR_SET_NVX"/>  - <enum value="2" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_NVX"/>  - <enum value="3" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_NVX"/>  - <enum value="4" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_NVX"/>  - <enum value="5" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_NVX"/>  - <enum value="6" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_NVX"/>  - <enum value="7" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_NVX"/>  + <enum value="0" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PIPELINE_NVX"/> + <enum value="1" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DESCRIPTOR_SET_NVX"/> + <enum value="2" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_NVX"/> + <enum value="3" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_NVX"/> + <enum value="4" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_NVX"/> + <enum value="5" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_NVX"/> + <enum value="6" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_NVX"/> + <enum value="7" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_NVX"/> </enums> <enums name="VkObjectEntryTypeNVX" type="enum"> - <enum value="0" name="VK_OBJECT_ENTRY_TYPE_DESCRIPTOR_SET_NVX"/> - <enum value="1" name="VK_OBJECT_ENTRY_TYPE_PIPELINE_NVX"/> - <enum value="2" name="VK_OBJECT_ENTRY_TYPE_INDEX_BUFFER_NVX"/> - <enum value="3" name="VK_OBJECT_ENTRY_TYPE_VERTEX_BUFFER_NVX"/> - <enum value="4" name="VK_OBJECT_ENTRY_TYPE_PUSH_CONSTANT_NVX"/> + <enum value="0" name="VK_OBJECT_ENTRY_TYPE_DESCRIPTOR_SET_NVX"/> + <enum value="1" name="VK_OBJECT_ENTRY_TYPE_PIPELINE_NVX"/> + <enum value="2" name="VK_OBJECT_ENTRY_TYPE_INDEX_BUFFER_NVX"/> + <enum value="3" name="VK_OBJECT_ENTRY_TYPE_VERTEX_BUFFER_NVX"/> + <enum value="4" name="VK_OBJECT_ENTRY_TYPE_PUSH_CONSTANT_NVX"/> </enums> <enums name="VkDescriptorSetLayoutCreateFlagBits" type="bitmask"> </enums> - <enums name="VkExternalMemoryHandleTypeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHX"/> - <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHX"/> - <enum bitpos="4" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHX"/> - <enum bitpos="5" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHX"/> - <enum bitpos="6" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHX"/> + <enums name="VkExternalMemoryHandleTypeFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT"/> + <enum bitpos="4" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT"/> + <enum bitpos="5" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT"/> + <enum bitpos="6" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT"/> + </enums> + <enums name="VkExternalMemoryFeatureFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT"/> + <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT"/> + </enums> + <enums name="VkExternalSemaphoreHandleTypeFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum bitpos="2" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum bitpos="3" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT"/> + <enum bitpos="4" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT"/> + </enums> + <enums name="VkExternalSemaphoreFeatureFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT"/> </enums> - <enums name="VkExternalMemoryFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHX"/> + <enums name="VkSemaphoreImportFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_SEMAPHORE_IMPORT_TEMPORARY_BIT"/> </enums> - <enums name="VkExternalSemaphoreHandleTypeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHX"/> - <enum bitpos="3" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHX"/> - <enum bitpos="4" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FENCE_FD_BIT_KHX"/> + <enums name="VkExternalFenceHandleTypeFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum bitpos="2" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum bitpos="3" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT"/> </enums> - <enums name="VkExternalSemaphoreFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHX"/> + <enums name="VkExternalFenceFeatureFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT"/> + <enum bitpos="1" name="VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT"/> + </enums> + <enums name="VkFenceImportFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_FENCE_IMPORT_TEMPORARY_BIT"/> </enums> <enums name="VkSurfaceCounterFlagBitsEXT" type="bitmask"> - <enum bitpos="0" name="VK_SURFACE_COUNTER_VBLANK_EXT"/> + <enum bitpos="0" name="VK_SURFACE_COUNTER_VBLANK_EXT"/> </enums> <enums name="VkDisplayPowerStateEXT" type="enum"> - <enum value="0" name="VK_DISPLAY_POWER_STATE_OFF_EXT"/> - <enum value="1" name="VK_DISPLAY_POWER_STATE_SUSPEND_EXT"/> - <enum value="2" name="VK_DISPLAY_POWER_STATE_ON_EXT"/> + <enum value="0" name="VK_DISPLAY_POWER_STATE_OFF_EXT"/> + <enum value="1" name="VK_DISPLAY_POWER_STATE_SUSPEND_EXT"/> + <enum value="2" name="VK_DISPLAY_POWER_STATE_ON_EXT"/> </enums> <enums name="VkDeviceEventTypeEXT" type="enum"> - <enum value="0" name="VK_DEVICE_EVENT_TYPE_DISPLAY_HOTPLUG_EXT"/> + <enum value="0" name="VK_DEVICE_EVENT_TYPE_DISPLAY_HOTPLUG_EXT"/> </enums> <enums name="VkDisplayEventTypeEXT" type="enum"> - <enum value="0" name="VK_DISPLAY_EVENT_TYPE_FIRST_PIXEL_OUT_EXT"/> + <enum value="0" name="VK_DISPLAY_EVENT_TYPE_FIRST_PIXEL_OUT_EXT"/> </enums> - <enums name="VkPeerMemoryFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT_KHX" comment="Can read with vkCmdCopy commands"/> - <enum bitpos="1" name="VK_PEER_MEMORY_FEATURE_COPY_DST_BIT_KHX" comment="Can write with vkCmdCopy commands"/> - <enum bitpos="2" name="VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT_KHX" comment="Can read with any access type/command"/> - <enum bitpos="3" name="VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHX" comment="Can write with and access type/command"/> + <enums name="VkPeerMemoryFeatureFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT" comment="Can read with vkCmdCopy commands"/> + <enum bitpos="1" name="VK_PEER_MEMORY_FEATURE_COPY_DST_BIT" comment="Can write with vkCmdCopy commands"/> + <enum bitpos="2" name="VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT" comment="Can read with any access type/command"/> + <enum bitpos="3" name="VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT" comment="Can write with and access type/command"/> </enums> - <enums name="VkMemoryAllocateFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHX" comment="Force allocation on specific devices"/> + <enums name="VkMemoryAllocateFlagBits" type="bitmask"> + <enum bitpos="0" name="VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT" comment="Force allocation on specific devices"/> </enums> - <enums name="VkDeviceGroupPresentModeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHX" comment="Present from local memory"/> - <enum bitpos="1" name="VK_DEVICE_GROUP_PRESENT_MODE_REMOTE_BIT_KHX" comment="Present from remote memory"/> - <enum bitpos="2" name="VK_DEVICE_GROUP_PRESENT_MODE_SUM_BIT_KHX" comment="Present sum of local and/or remote memory"/> - <enum bitpos="3" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHX" comment="Each physical device presents from local memory"/> + <enums name="VkDeviceGroupPresentModeFlagBitsKHR" type="bitmask"> + <enum bitpos="0" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR" comment="Present from local memory"/> + <enum bitpos="1" name="VK_DEVICE_GROUP_PRESENT_MODE_REMOTE_BIT_KHR" comment="Present from remote memory"/> + <enum bitpos="2" name="VK_DEVICE_GROUP_PRESENT_MODE_SUM_BIT_KHR" comment="Present sum of local and/or remote memory"/> + <enum bitpos="3" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHR" comment="Each physical device presents from local memory"/> </enums> <enums name="VkSwapchainCreateFlagBitsKHR" type="bitmask"> </enums> <enums name="VkViewportCoordinateSwizzleNV" type="enum"> - <enum value="0" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_X_NV"/> - <enum value="1" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_X_NV"/> - <enum value="2" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Y_NV"/> - <enum value="3" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Y_NV"/> - <enum value="4" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Z_NV"/> - <enum value="5" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Z_NV"/> - <enum value="6" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_W_NV"/> - <enum value="7" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_W_NV"/> + <enum value="0" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_X_NV"/> + <enum value="1" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_X_NV"/> + <enum value="2" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Y_NV"/> + <enum value="3" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Y_NV"/> + <enum value="4" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Z_NV"/> + <enum value="5" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Z_NV"/> + <enum value="6" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_W_NV"/> + <enum value="7" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_W_NV"/> </enums> <enums name="VkDiscardRectangleModeEXT" type="enum"> <enum value="0" name="VK_DISCARD_RECTANGLE_MODE_INCLUSIVE_EXT"/> @@ -3240,10 +4104,83 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </enums> <enums name="VkSubpassDescriptionFlagBits" type="bitmask"> </enums> + <enums name="VkPointClippingBehavior" type="enum"> + <enum value="0" name="VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES"/> + <enum value="1" name="VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY"/> + </enums> + <enums name="VkSamplerReductionModeEXT" type="enum"> + <enum value="0" name="VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_EXT"/> + <enum value="1" name="VK_SAMPLER_REDUCTION_MODE_MIN_EXT"/> + <enum value="2" name="VK_SAMPLER_REDUCTION_MODE_MAX_EXT"/> + </enums> + <enums name="VkTessellationDomainOrigin" type="enum"> + <enum value="0" name="VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT"/> + <enum value="1" name="VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT"/> + </enums> + <enums name="VkSamplerYcbcrModelConversion" type="enum"> + <enum value="0" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY"/> + <enum value="1" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY" comment="just range expansion"/> + <enum value="2" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709" comment="aka HD YUV"/> + <enum value="3" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601" comment="aka SD YUV"/> + <enum value="4" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020" comment="aka UHD YUV"/> + </enums> + <enums name="VkSamplerYcbcrRange" type="enum"> + <enum value="0" name="VK_SAMPLER_YCBCR_RANGE_ITU_FULL" comment="Luma 0..1 maps to 0..255, chroma -0.5..0.5 to 1..255 (clamped)"/> + <enum value="1" name="VK_SAMPLER_YCBCR_RANGE_ITU_NARROW" comment="Luma 0..1 maps to 16..235, chroma -0.5..0.5 to 16..240"/> + </enums> + <enums name="VkChromaLocation" type="enum"> + <enum value="0" name="VK_CHROMA_LOCATION_COSITED_EVEN"/> + <enum value="1" name="VK_CHROMA_LOCATION_MIDPOINT"/> + </enums> + <enums name="VkBlendOverlapEXT" type="enum"> + <enum value="0" name="VK_BLEND_OVERLAP_UNCORRELATED_EXT"/> + <enum value="1" name="VK_BLEND_OVERLAP_DISJOINT_EXT"/> + <enum value="2" name="VK_BLEND_OVERLAP_CONJOINT_EXT"/> + </enums> + <enums name="VkCoverageModulationModeNV" type="enum"> + <enum value="0" name="VK_COVERAGE_MODULATION_MODE_NONE_NV"/> + <enum value="1" name="VK_COVERAGE_MODULATION_MODE_RGB_NV"/> + <enum value="2" name="VK_COVERAGE_MODULATION_MODE_ALPHA_NV"/> + <enum value="3" name="VK_COVERAGE_MODULATION_MODE_RGBA_NV"/> + </enums> + <enums name="VkValidationCacheHeaderVersionEXT" type="enum"> + <enum value="1" name="VK_VALIDATION_CACHE_HEADER_VERSION_ONE_EXT"/> + </enums> + <enums name="VkShaderInfoTypeAMD" type="enum"> + <enum value="0" name="VK_SHADER_INFO_TYPE_STATISTICS_AMD"/> + <enum value="1" name="VK_SHADER_INFO_TYPE_BINARY_AMD"/> + <enum value="2" name="VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD"/> + </enums> + <enums name="VkQueueGlobalPriorityEXT" type="enum"> + <enum value="128" name="VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT"/> + <enum value="256" name="VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT"/> + <enum value="512" name="VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT"/> + <enum value="1024" name="VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT"/> + </enums> + <enums name="VkDebugUtilsMessageSeverityFlagBitsEXT" type="bitmask"> + <enum bitpos="0" name="VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT"/> + <enum bitpos="4" name="VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT"/> + <enum bitpos="8" name="VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT"/> + <enum bitpos="12" name="VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT"/> + </enums> + <enums name="VkDebugUtilsMessageTypeFlagBitsEXT" type="bitmask"> + <enum bitpos="0" name="VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT"/> + <enum bitpos="1" name="VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT"/> + <enum bitpos="2" name="VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT"/> + </enums> + <enums name="VkConservativeRasterizationModeEXT" type="enum"> + <enum value="0" name="VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT"/> + <enum value="1" name="VK_CONSERVATIVE_RASTERIZATION_MODE_OVERESTIMATE_EXT"/> + <enum value="2" name="VK_CONSERVATIVE_RASTERIZATION_MODE_UNDERESTIMATE_EXT"/> + </enums> + <enums name="VkDescriptorBindingFlagBitsEXT" type="bitmask"> + <enum bitpos="0" name="VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT"/> + <enum bitpos="1" name="VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT"/> + <enum bitpos="2" name="VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT"/> + <enum bitpos="3" name="VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT"/> + </enums> - -  - <commands> + <commands comment="Vulkan command definitions"> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_LAYER_NOT_PRESENT,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_INCOMPATIBLE_DRIVER"> <proto><type>VkResult</type> <name>vkCreateInstance</name></proto> <param>const <type>VkInstanceCreateInfo</type>* <name>pCreateInfo</name></param> @@ -3320,6 +4257,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param optional="true" externsync="true"><type>VkDevice</type> <name>device</name></param> <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> </command> + <command successcodes="VK_SUCCESS"> + <proto><type>VkResult</type> <name>vkEnumerateInstanceVersion</name></proto> + <param><type>uint32_t</type>* <name>pApiVersion</name></param> + </command> <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> <proto><type>VkResult</type> <name>vkEnumerateInstanceLayerProperties</name></proto> <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> @@ -3369,7 +4310,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param>all sname:VkQueue objects created from pname:device</param> </implicitexternsyncparams> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_INVALID_EXTERNAL_HANDLE"> <proto><type>VkResult</type> <name>vkAllocateMemory</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param>const <type>VkMemoryAllocateInfo</type>* <name>pAllocateInfo</name></param> @@ -3389,7 +4330,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>VkDeviceSize</type> <name>offset</name></param> <param><type>VkDeviceSize</type> <name>size</name></param> <param optional="true"><type>VkMemoryMapFlags</type> <name>flags</name></param> - <param><type>void</type>** <name>ppData</name></param> + <param optional="false,true"><type>void</type>** <name>ppData</name></param> </command> <command> <proto><type>void</type> <name>vkUnmapMemory</name></proto> @@ -3724,7 +4665,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param optional="true" externsync="true"><type>VkDescriptorSetLayout</type> <name>descriptorSetLayout</name></param> <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FRAGMENTATION_EXT"> <proto><type>VkResult</type> <name>vkCreateDescriptorPool</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param>const <type>VkDescriptorPoolCreateInfo</type>* <name>pCreateInfo</name></param> @@ -3746,7 +4687,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param>any sname:VkDescriptorSet objects allocated from pname:descriptorPool</param> </implicitexternsyncparams> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FRAGMENTED_POOL,VK_ERROR_OUT_OF_POOL_MEMORY_KHR"> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FRAGMENTED_POOL,VK_ERROR_OUT_OF_POOL_MEMORY"> <proto><type>VkResult</type> <name>vkAllocateDescriptorSets</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param externsync="pAllocateInfo::descriptorPool">const <type>VkDescriptorSetAllocateInfo</type>* <name>pAllocateInfo</name></param> @@ -3862,7 +4803,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>uint32_t</type> <name>firstViewport</name></param> <param><type>uint32_t</type> <name>viewportCount</name></param> - <param len="viewportCount" noautovalidity="true">const <type>VkViewport</type>* <name>pViewports</name></param> + <param len="viewportCount">const <type>VkViewport</type>* <name>pViewports</name></param> </command> <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdSetScissor</name></proto> @@ -4142,7 +5083,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>uint32_t</type> <name>firstQuery</name></param> <param><type>uint32_t</type> <name>queryCount</name></param> </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" pipeline="transfer"> + <command queues="transfer,graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" pipeline="transfer"> <proto><type>void</type> <name>vkCmdWriteTimestamp</name></proto> <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>VkPipelineStageFlagBits</type> <name>pipelineStage</name></param> @@ -4420,17 +5361,17 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectNameEXT</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pNameInfo.object"><type>VkDebugMarkerObjectNameInfoEXT</type>* <name>pNameInfo</name></param> + <param externsync="pNameInfo.object">const <type>VkDebugMarkerObjectNameInfoEXT</type>* <name>pNameInfo</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectTagEXT</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pTagInfo.object"><type>VkDebugMarkerObjectTagInfoEXT</type>* <name>pTagInfo</name></param> + <param externsync="pTagInfo.object">const <type>VkDebugMarkerObjectTagInfoEXT</type>* <name>pTagInfo</name></param> </command> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdDebugMarkerBeginEXT</name></proto> <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> + <param>const <type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> </command> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdDebugMarkerEndEXT</name></proto> @@ -4439,7 +5380,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdDebugMarkerInsertEXT</name></proto> <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> + <param>const <type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FORMAT_NOT_SUPPORTED"> <proto><type>VkResult</type> <name>vkGetPhysicalDeviceExternalImageFormatPropertiesNV</name></proto> @@ -4538,45 +5479,52 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>VkDeviceGeneratedCommandsLimitsNVX</type>* <name>pLimits</name></param> </command> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFeatures2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceFeatures2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceFeatures2KHR</type>* <name>pFeatures</name></param> + <param><type>VkPhysicalDeviceFeatures2</type>* <name>pFeatures</name></param> </command> + <command name="vkGetPhysicalDeviceFeatures2KHR" alias="vkGetPhysicalDeviceFeatures2"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceProperties2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceProperties2KHR</type>* <name>pProperties</name></param> + <param><type>VkPhysicalDeviceProperties2</type>* <name>pProperties</name></param> </command> + <command name="vkGetPhysicalDeviceProperties2KHR" alias="vkGetPhysicalDeviceProperties2"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFormatProperties2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceFormatProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkFormatProperties2KHR</type>* <name>pFormatProperties</name></param> + <param><type>VkFormatProperties2</type>* <name>pFormatProperties</name></param> </command> + <command name="vkGetPhysicalDeviceFormatProperties2KHR" alias="vkGetPhysicalDeviceFormatProperties2"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FORMAT_NOT_SUPPORTED"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceImageFormatProperties2KHR</name></proto> + <proto><type>VkResult</type> <name>vkGetPhysicalDeviceImageFormatProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceImageFormatInfo2KHR</type>* <name>pImageFormatInfo</name></param> - <param><type>VkImageFormatProperties2KHR</type>* <name>pImageFormatProperties</name></param> + <param>const <type>VkPhysicalDeviceImageFormatInfo2</type>* <name>pImageFormatInfo</name></param> + <param><type>VkImageFormatProperties2</type>* <name>pImageFormatProperties</name></param> </command> + <command name="vkGetPhysicalDeviceImageFormatProperties2KHR" alias="vkGetPhysicalDeviceImageFormatProperties2"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceQueueFamilyProperties2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceQueueFamilyProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> <param optional="false,true"><type>uint32_t</type>* <name>pQueueFamilyPropertyCount</name></param> - <param optional="true" len="pQueueFamilyPropertyCount"><type>VkQueueFamilyProperties2KHR</type>* <name>pQueueFamilyProperties</name></param> + <param optional="true" len="pQueueFamilyPropertyCount"><type>VkQueueFamilyProperties2</type>* <name>pQueueFamilyProperties</name></param> </command> + <command name="vkGetPhysicalDeviceQueueFamilyProperties2KHR" alias="vkGetPhysicalDeviceQueueFamilyProperties2"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceMemoryProperties2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceMemoryProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceMemoryProperties2KHR</type>* <name>pMemoryProperties</name></param> + <param><type>VkPhysicalDeviceMemoryProperties2</type>* <name>pMemoryProperties</name></param> </command> + <command name="vkGetPhysicalDeviceMemoryProperties2KHR" alias="vkGetPhysicalDeviceMemoryProperties2"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceSparseImageFormatProperties2KHR</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceSparseImageFormatProperties2</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceSparseImageFormatInfo2KHR</type>* <name>pFormatInfo</name></param> + <param>const <type>VkPhysicalDeviceSparseImageFormatInfo2</type>* <name>pFormatInfo</name></param> <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkSparseImageFormatProperties2KHR</type>* <name>pProperties</name></param> + <param optional="true" len="pPropertyCount"><type>VkSparseImageFormatProperties2</type>* <name>pProperties</name></param> </command> + <command name="vkGetPhysicalDeviceSparseImageFormatProperties2KHR" alias="vkGetPhysicalDeviceSparseImageFormatProperties2"/> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdPushDescriptorSetKHR</name></proto> <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> @@ -4587,74 +5535,102 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param len="descriptorWriteCount">const <type>VkWriteDescriptorSet</type>* <name>pDescriptorWrites</name></param> </command> <command> - <proto><type>void</type> <name>vkTrimCommandPoolKHR</name></proto> + <proto><type>void</type> <name>vkTrimCommandPool</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param externsync="true"><type>VkCommandPool</type> <name>commandPool</name></param> - <param optional="true"><type>VkCommandPoolTrimFlagsKHR</type> <name>flags</name></param> + <param optional="true"><type>VkCommandPoolTrimFlags</type> <name>flags</name></param> </command> + <command name="vkTrimCommandPoolKHR" alias="vkTrimCommandPool"/> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceExternalBufferPropertiesKHX</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceExternalBufferProperties</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceExternalBufferInfoKHX</type>* <name>pExternalBufferInfo</name></param> - <param><type>VkExternalBufferPropertiesKHX</type>* <name>pExternalBufferProperties</name></param> + <param>const <type>VkPhysicalDeviceExternalBufferInfo</type>* <name>pExternalBufferInfo</name></param> + <param><type>VkExternalBufferProperties</type>* <name>pExternalBufferProperties</name></param> </command> + <command name="vkGetPhysicalDeviceExternalBufferPropertiesKHR" alias="vkGetPhysicalDeviceExternalBufferProperties"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetMemoryWin32HandleKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetMemoryWin32HandleKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param>const <type>VkMemoryGetWin32HandleInfoKHR</type>* <name>pGetWin32HandleInfo</name></param> <param><type>HANDLE</type>* <name>pHandle</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkGetMemoryWin32HandlePropertiesKHX</name></proto> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkGetMemoryWin32HandlePropertiesKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></param> <param><type>HANDLE</type> <name>handle</name></param> - <param><type>VkMemoryWin32HandlePropertiesKHX</type>* <name>pMemoryWin32HandleProperties</name></param> + <param><type>VkMemoryWin32HandlePropertiesKHR</type>* <name>pMemoryWin32HandleProperties</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetMemoryFdKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetMemoryFdKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param>const <type>VkMemoryGetFdInfoKHR</type>* <name>pGetFdInfo</name></param> <param><type>int</type>* <name>pFd</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkGetMemoryFdPropertiesKHX</name></proto> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkGetMemoryFdPropertiesKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></param> <param><type>int</type> <name>fd</name></param> - <param><type>VkMemoryFdPropertiesKHX</type>* <name>pMemoryFdProperties</name></param> + <param><type>VkMemoryFdPropertiesKHR</type>* <name>pMemoryFdProperties</name></param> </command> <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceExternalSemaphorePropertiesKHX</name></proto> + <proto><type>void</type> <name>vkGetPhysicalDeviceExternalSemaphoreProperties</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceExternalSemaphoreInfoKHX</type>* <name>pExternalSemaphoreInfo</name></param> - <param><type>VkExternalSemaphorePropertiesKHX</type>* <name>pExternalSemaphoreProperties</name></param> + <param>const <type>VkPhysicalDeviceExternalSemaphoreInfo</type>* <name>pExternalSemaphoreInfo</name></param> + <param><type>VkExternalSemaphoreProperties</type>* <name>pExternalSemaphoreProperties</name></param> </command> + <command name="vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" alias="vkGetPhysicalDeviceExternalSemaphoreProperties"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetSemaphoreWin32HandleKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetSemaphoreWin32HandleKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSemaphore</type> <name>semaphore</name></param> - <param><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param>const <type>VkSemaphoreGetWin32HandleInfoKHR</type>* <name>pGetWin32HandleInfo</name></param> <param><type>HANDLE</type>* <name>pHandle</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkImportSemaphoreWin32HandleKHX</name></proto> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkImportSemaphoreWin32HandleKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImportSemaphoreWin32HandleInfoKHX</type>* <name>pImportSemaphoreWin32HandleInfo</name></param> + <param>const <type>VkImportSemaphoreWin32HandleInfoKHR</type>* <name>pImportSemaphoreWin32HandleInfo</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetSemaphoreFdKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetSemaphoreFdKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSemaphore</type> <name>semaphore</name></param> - <param><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></param> + <param>const <type>VkSemaphoreGetFdInfoKHR</type>* <name>pGetFdInfo</name></param> <param><type>int</type>* <name>pFd</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkImportSemaphoreFdKHX</name></proto> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkImportSemaphoreFdKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImportSemaphoreFdInfoKHX</type>* <name>pImportSemaphoreFdInfo</name></param> + <param>const <type>VkImportSemaphoreFdInfoKHR</type>* <name>pImportSemaphoreFdInfo</name></param> + </command> + <command> + <proto><type>void</type> <name>vkGetPhysicalDeviceExternalFenceProperties</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param>const <type>VkPhysicalDeviceExternalFenceInfo</type>* <name>pExternalFenceInfo</name></param> + <param><type>VkExternalFenceProperties</type>* <name>pExternalFenceProperties</name></param> + </command> + <command name="vkGetPhysicalDeviceExternalFencePropertiesKHR" alias="vkGetPhysicalDeviceExternalFenceProperties"/> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkGetFenceWin32HandleKHR</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkFenceGetWin32HandleInfoKHR</type>* <name>pGetWin32HandleInfo</name></param> + <param><type>HANDLE</type>* <name>pHandle</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkImportFenceWin32HandleKHR</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkImportFenceWin32HandleInfoKHR</type>* <name>pImportFenceWin32HandleInfo</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkGetFenceFdKHR</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkFenceGetFdInfoKHR</type>* <name>pGetFdInfo</name></param> + <param><type>int</type>* <name>pFd</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkImportFenceFdKHR</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkImportFenceFdInfoKHR</type>* <name>pImportFenceFdInfo</name></param> </command> <command successcodes="VK_SUCCESS"> <proto><type>VkResult</type> <name>vkReleaseDisplayEXT</name></proto> @@ -4684,7 +5660,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <proto><type>VkResult</type> <name>vkRegisterDeviceEventEXT</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param>const <type>VkDeviceEventInfoEXT</type>* <name>pDeviceEventInfo</name></param> - <param>const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> <param><type>VkFence</type>* <name>pFence</name></param> </command> <command successcodes="VK_SUCCESS"> @@ -4692,10 +5668,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>VkDevice</type> <name>device</name></param> <param><type>VkDisplayKHR</type> <name>display</name></param> <param>const <type>VkDisplayEventInfoEXT</type>* <name>pDisplayEventInfo</name></param> - <param>const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> <param><type>VkFence</type>* <name>pFence</name></param> </command> - <command successcodes="VK_SUCCESS,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR"> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR"> <proto><type>VkResult</type> <name>vkGetSwapchainCounterEXT</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param><type>VkSwapchainKHR</type> <name>swapchain</name></param> @@ -4709,55 +5685,60 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>VkSurfaceCapabilities2EXT</type>* <name>pSurfaceCapabilities</name></param> </command> <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED"> - <proto><type>VkResult</type> <name>vkEnumeratePhysicalDeviceGroupsKHX</name></proto> + <proto><type>VkResult</type> <name>vkEnumeratePhysicalDeviceGroups</name></proto> <param><type>VkInstance</type> <name>instance</name></param> <param optional="false,true"><type>uint32_t</type>* <name>pPhysicalDeviceGroupCount</name></param> - <param optional="true" len="pPhysicalDeviceGroupCount"><type>VkPhysicalDeviceGroupPropertiesKHX</type>* <name>pPhysicalDeviceGroupProperties</name></param> + <param optional="true" len="pPhysicalDeviceGroupCount"><type>VkPhysicalDeviceGroupProperties</type>* <name>pPhysicalDeviceGroupProperties</name></param> </command> + <command name="vkEnumeratePhysicalDeviceGroupsKHR" alias="vkEnumeratePhysicalDeviceGroups"/> <command> - <proto><type>void</type> <name>vkGetDeviceGroupPeerMemoryFeaturesKHX</name></proto> + <proto><type>void</type> <name>vkGetDeviceGroupPeerMemoryFeatures</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param><type>uint32_t</type> <name>heapIndex</name></param> <param><type>uint32_t</type> <name>localDeviceIndex</name></param> <param><type>uint32_t</type> <name>remoteDeviceIndex</name></param> - <param><type>VkPeerMemoryFeatureFlagsKHX</type>* <name>pPeerMemoryFeatures</name></param> + <param><type>VkPeerMemoryFeatureFlags</type>* <name>pPeerMemoryFeatures</name></param> </command> + <command name="vkGetDeviceGroupPeerMemoryFeaturesKHR" alias="vkGetDeviceGroupPeerMemoryFeatures"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindBufferMemory2KHX</name></proto> + <proto><type>VkResult</type> <name>vkBindBufferMemory2</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param><type>uint32_t</type> <name>bindInfoCount</name></param> - <param len="bindInfoCount">const <type>VkBindBufferMemoryInfoKHX</type>* <name>pBindInfos</name></param> + <param len="bindInfoCount">const <type>VkBindBufferMemoryInfo</type>* <name>pBindInfos</name></param> </command> + <command name="vkBindBufferMemory2KHR" alias="vkBindBufferMemory2"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindImageMemory2KHX</name></proto> + <proto><type>VkResult</type> <name>vkBindImageMemory2</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param><type>uint32_t</type> <name>bindInfoCount</name></param> - <param len="bindInfoCount">const <type>VkBindImageMemoryInfoKHX</type>* <name>pBindInfos</name></param> + <param len="bindInfoCount">const <type>VkBindImageMemoryInfo</type>* <name>pBindInfos</name></param> </command> + <command name="vkBindImageMemory2KHR" alias="vkBindImageMemory2"/> <command queues="graphics,compute,transfer" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetDeviceMaskKHX</name></proto> + <proto><type>void</type> <name>vkCmdSetDeviceMask</name></proto> <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>uint32_t</type> <name>deviceMask</name></param> </command> + <command name="vkCmdSetDeviceMaskKHR" alias="vkCmdSetDeviceMask"/> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetDeviceGroupPresentCapabilitiesKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetDeviceGroupPresentCapabilitiesKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceGroupPresentCapabilitiesKHX</type>* <name>pDeviceGroupPresentCapabilities</name></param> + <param><type>VkDeviceGroupPresentCapabilitiesKHR</type>* <name>pDeviceGroupPresentCapabilities</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetDeviceGroupSurfacePresentModesKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetDeviceGroupSurfacePresentModesKHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> - <param><type>VkDeviceGroupPresentModeFlagsKHX</type>* <name>pModes</name></param> + <param optional="false,true"><type>VkDeviceGroupPresentModeFlagsKHR</type>* <name>pModes</name></param> </command> <command successcodes="VK_SUCCESS,VK_TIMEOUT,VK_NOT_READY,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkAcquireNextImage2KHX</name></proto> + <proto><type>VkResult</type> <name>vkAcquireNextImage2KHR</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkAcquireNextImageInfoKHX</type>* <name>pAcquireInfo</name></param> + <param>const <type>VkAcquireNextImageInfoKHR</type>* <name>pAcquireInfo</name></param> <param><type>uint32_t</type>* <name>pImageIndex</name></param> </command> <command queues="compute" renderpass="outside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdDispatchBaseKHX</name></proto> + <proto><type>void</type> <name>vkCmdDispatchBase</name></proto> <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>uint32_t</type> <name>baseGroupX</name></param> <param><type>uint32_t</type> <name>baseGroupY</name></param> @@ -4766,46 +5747,50 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>uint32_t</type> <name>groupCountY</name></param> <param><type>uint32_t</type> <name>groupCountZ</name></param> </command> + <command name="vkCmdDispatchBaseKHR" alias="vkCmdDispatchBase"/> <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetPhysicalDevicePresentRectanglesKHX</name></proto> + <proto><type>VkResult</type> <name>vkGetPhysicalDevicePresentRectanglesKHR</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> <param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> <param optional="false,true"><type>uint32_t</type>* <name>pRectCount</name></param> <param optional="true" len="pRectCount"><type>VkRect2D</type>* <name>pRects</name></param> </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDescriptorUpdateTemplateKHR</name></proto> + <proto><type>VkResult</type> <name>vkCreateDescriptorUpdateTemplate</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkDescriptorUpdateTemplateCreateInfoKHR</type>* <name>pCreateInfo</name></param> + <param>const <type>VkDescriptorUpdateTemplateCreateInfo</type>* <name>pCreateInfo</name></param> <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type>* <name>pDescriptorUpdateTemplate</name></param> + <param><type>VkDescriptorUpdateTemplate</type>* <name>pDescriptorUpdateTemplate</name></param> </command> + <command name="vkCreateDescriptorUpdateTemplateKHR" alias="vkCreateDescriptorUpdateTemplate"/> <command> - <proto><type>void</type> <name>vkDestroyDescriptorUpdateTemplateKHR</name></proto> + <proto><type>void</type> <name>vkDestroyDescriptorUpdateTemplate</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> + <param optional="true" externsync="true"><type>VkDescriptorUpdateTemplate</type> <name>descriptorUpdateTemplate</name></param> <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> </command> + <command name="vkDestroyDescriptorUpdateTemplateKHR" alias="vkDestroyDescriptorUpdateTemplate"/> <command> - <proto><type>void</type> <name>vkUpdateDescriptorSetWithTemplateKHR</name></proto> + <proto><type>void</type> <name>vkUpdateDescriptorSetWithTemplate</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param externsync="true"><type>VkDescriptorSet</type> <name>descriptorSet</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> - <param>const <type>void</type>* <name>pData</name></param> + <param><type>VkDescriptorUpdateTemplate</type> <name>descriptorUpdateTemplate</name></param> + <param noautovalidity="true">const <type>void</type>* <name>pData</name></param> </command> + <command name="vkUpdateDescriptorSetWithTemplateKHR" alias="vkUpdateDescriptorSetWithTemplate"/> <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdPushDescriptorSetWithTemplateKHR</name></proto> <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> + <param><type>VkDescriptorUpdateTemplate</type> <name>descriptorUpdateTemplate</name></param> <param><type>VkPipelineLayout</type> <name>layout</name></param> <param><type>uint32_t</type> <name>set</name></param> - <param>const <type>void</type>* <name>pData</name></param> + <param noautovalidity="true">const <type>void</type>* <name>pData</name></param> </command> <command> <proto><type>void</type> <name>vkSetHdrMetadataEXT</name></proto> <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>swapchainCount</name></param>  - <param len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name></param>  + <param><type>uint32_t</type> <name>swapchainCount</name></param> + <param len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name></param> <param len="swapchainCount">const <type>VkHdrMetadataEXT</type>* <name>pMetadata</name></param> </command> <command successcodes="VK_SUCCESS,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> @@ -4819,7 +5804,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> <param><type>VkRefreshCycleDurationGOOGLE</type>* <name>pDisplayTimingProperties</name></param> </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> <proto><type>VkResult</type> <name>vkGetPastPresentationTimingGOOGLE</name></proto> <param><type>VkDevice</type> <name>device</name></param> <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> @@ -4845,7 +5830,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> <param><type>uint32_t</type> <name>firstViewport</name></param> <param><type>uint32_t</type> <name>viewportCount</name></param> - <param len="viewportCount" noautovalidity="true">const <type>VkViewportWScalingNV</type>* <name>pViewportWScalings</name></param> + <param len="viewportCount">const <type>VkViewportWScalingNV</type>* <name>pViewportWScalings</name></param> </command> <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> <proto><type>void</type> <name>vkCmdSetDiscardRectangleEXT</name></proto> @@ -4854,6 +5839,17 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param><type>uint32_t</type> <name>discardRectangleCount</name></param> <param len="discardRectangleCount">const <type>VkRect2D</type>* <name>pDiscardRectangles</name></param> </command> + <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> + <proto><type>void</type> <name>vkCmdSetSampleLocationsEXT</name></proto> + <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param>const <type>VkSampleLocationsInfoEXT</type>* <name>pSampleLocationsInfo</name></param> + </command> + <command> + <proto><type>void</type> <name>vkGetPhysicalDeviceMultisamplePropertiesEXT</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param><type>VkSampleCountFlagBits</type> <name>samples</name></param> + <param><type>VkMultisamplePropertiesEXT</type>* <name>pMultisampleProperties</name></param> + </command> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceCapabilities2KHR</name></proto> <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> @@ -4867,31 +5863,269 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <param optional="false,true"><type>uint32_t</type>* <name>pSurfaceFormatCount</name></param> <param optional="true" len="pSurfaceFormatCount"><type>VkSurfaceFormat2KHR</type>* <name>pSurfaceFormats</name></param> </command> - </commands> - -  - <feature api="vulkan" name="VK_VERSION_1_0" number="1.0"> - <require comment="Header boilerplate"> - <type name="vk_platform"/> - </require> - <require comment="API version"> - <type name="VK_API_VERSION"/> - <type name="VK_API_VERSION_1_0"/> - <type name="VK_VERSION_MAJOR"/> - <type name="VK_VERSION_MINOR"/> - <type name="VK_VERSION_PATCH"/> - <type name="VK_HEADER_VERSION"/> - </require> - <require comment="API constants"> - <enum name="VK_LOD_CLAMP_NONE"/> - <enum name="VK_REMAINING_MIP_LEVELS"/> - <enum name="VK_REMAINING_ARRAY_LAYERS"/> - <enum name="VK_WHOLE_SIZE"/> - <enum name="VK_ATTACHMENT_UNUSED"/> - <enum name="VK_TRUE"/> - <enum name="VK_FALSE"/> - <type name="VK_NULL_HANDLE"/> - <enum name="VK_QUEUE_FAMILY_IGNORED"/> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkGetPhysicalDeviceDisplayProperties2KHR</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> + <param optional="true" len="pPropertyCount"><type>VkDisplayProperties2KHR</type>* <name>pProperties</name></param> + </command> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkGetPhysicalDeviceDisplayPlaneProperties2KHR</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> + <param optional="true" len="pPropertyCount"><type>VkDisplayPlaneProperties2KHR</type>* <name>pProperties</name></param> + </command> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkGetDisplayModeProperties2KHR</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param><type>VkDisplayKHR</type> <name>display</name></param> + <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> + <param optional="true" len="pPropertyCount"><type>VkDisplayModeProperties2KHR</type>* <name>pProperties</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkGetDisplayPlaneCapabilities2KHR</name></proto> + <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> + <param>const <type>VkDisplayPlaneInfo2KHR</type>* <name>pDisplayPlaneInfo</name></param> + <param><type>VkDisplayPlaneCapabilities2KHR</type>* <name>pCapabilities</name></param> + </command> + <command> + <proto><type>void</type> <name>vkGetBufferMemoryRequirements2</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkBufferMemoryRequirementsInfo2</type>* <name>pInfo</name></param> + <param><type>VkMemoryRequirements2</type>* <name>pMemoryRequirements</name></param> + </command> + <command name="vkGetBufferMemoryRequirements2KHR" alias="vkGetBufferMemoryRequirements2"/> + <command> + <proto><type>void</type> <name>vkGetImageMemoryRequirements2</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkImageMemoryRequirementsInfo2</type>* <name>pInfo</name></param> + <param><type>VkMemoryRequirements2</type>* <name>pMemoryRequirements</name></param> + </command> + <command name="vkGetImageMemoryRequirements2KHR" alias="vkGetImageMemoryRequirements2"/> + <command> + <proto><type>void</type> <name>vkGetImageSparseMemoryRequirements2</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkImageSparseMemoryRequirementsInfo2</type>* <name>pInfo</name></param> + <param optional="false,true"><type>uint32_t</type>* <name>pSparseMemoryRequirementCount</name></param> + <param optional="true" len="pSparseMemoryRequirementCount"><type>VkSparseImageMemoryRequirements2</type>* <name>pSparseMemoryRequirements</name></param> + </command> + <command name="vkGetImageSparseMemoryRequirements2KHR" alias="vkGetImageSparseMemoryRequirements2"/> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkCreateSamplerYcbcrConversion</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkSamplerYcbcrConversionCreateInfo</type>* <name>pCreateInfo</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + <param><type>VkSamplerYcbcrConversion</type>* <name>pYcbcrConversion</name></param> + </command> + <command name="vkCreateSamplerYcbcrConversionKHR" alias="vkCreateSamplerYcbcrConversion"/> + <command> + <proto><type>void</type> <name>vkDestroySamplerYcbcrConversion</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param optional="true" externsync="true"><type>VkSamplerYcbcrConversion</type> <name>ycbcrConversion</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + </command> + <command name="vkDestroySamplerYcbcrConversionKHR" alias="vkDestroySamplerYcbcrConversion"/> + <command> + <proto><type>void</type> <name>vkGetDeviceQueue2</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkDeviceQueueInfo2</type>* <name>pQueueInfo</name></param> + <param><type>VkQueue</type>* <name>pQueue</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkCreateValidationCacheEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkValidationCacheCreateInfoEXT</type>* <name>pCreateInfo</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + <param><type>VkValidationCacheEXT</type>* <name>pValidationCache</name></param> + </command> + <command> + <proto><type>void</type> <name>vkDestroyValidationCacheEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param optional="true" externsync="true"><type>VkValidationCacheEXT</type> <name>validationCache</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + </command> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkGetValidationCacheDataEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkValidationCacheEXT</type> <name>validationCache</name></param> + <param optional="false,true"><type>size_t</type>* <name>pDataSize</name></param> + <param optional="true" len="pDataSize"><type>void</type>* <name>pData</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkMergeValidationCachesEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param externsync="true"><type>VkValidationCacheEXT</type> <name>dstCache</name></param> + <param><type>uint32_t</type> <name>srcCacheCount</name></param> + <param len="srcCacheCount">const <type>VkValidationCacheEXT</type>* <name>pSrcCaches</name></param> + </command> + <command> + <proto><type>void</type> <name>vkGetDescriptorSetLayoutSupport</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkDescriptorSetLayoutCreateInfo</type>* <name>pCreateInfo</name></param> + <param><type>VkDescriptorSetLayoutSupport</type>* <name>pSupport</name></param> + </command> + <command name="vkGetDescriptorSetLayoutSupportKHR" alias="vkGetDescriptorSetLayoutSupport"/> + <command> + <proto><type>VkResult</type> <name>vkGetSwapchainGrallocUsageANDROID</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkFormat</type> <name>format</name></param> + <param><type>VkImageUsageFlags</type> <name>imageUsage</name></param> + <param><type>int</type>* <name>grallocUsage</name></param> + </command> + <command> + <proto><type>VkResult</type> <name>vkAcquireImageANDROID</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkImage</type> <name>image</name></param> + <param><type>int</type> <name>nativeFenceFd</name></param> + <param><type>VkSemaphore</type> <name>semaphore</name></param> + <param><type>VkFence</type> <name>fence</name></param> + </command> + <command> + <proto><type>VkResult</type> <name>vkQueueSignalReleaseImageANDROID</name></proto> + <param><type>VkQueue</type> <name>queue</name></param> + <param><type>uint32_t</type> <name>waitSemaphoreCount</name></param> + <param>const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></param> + <param><type>VkImage</type> <name>image</name></param> + <param><type>int</type>* <name>pNativeFenceFd</name></param> + </command> + <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_FEATURE_NOT_PRESENT,VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkGetShaderInfoAMD</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkPipeline</type> <name>pipeline</name></param> + <param><type>VkShaderStageFlagBits</type> <name>shaderStage</name></param> + <param><type>VkShaderInfoTypeAMD</type> <name>infoType</name></param> + <param optional="false,true"><type>size_t</type>* <name>pInfoSize</name></param> + <param optional="true" len="pInfoSize"><type>void</type>* <name>pInfo</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkSetDebugUtilsObjectNameEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param externsync="pNameInfo.objectHandle">const <type>VkDebugUtilsObjectNameInfoEXT</type>* <name>pNameInfo</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> + <proto><type>VkResult</type> <name>vkSetDebugUtilsObjectTagEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param externsync="pTagInfo.objectHandle">const <type>VkDebugUtilsObjectTagInfoEXT</type>* <name>pTagInfo</name></param> + </command> + <command> + <proto><type>void</type> <name>vkQueueBeginDebugUtilsLabelEXT</name></proto> + <param><type>VkQueue</type> <name>queue</name></param> + <param>const <type>VkDebugUtilsLabelEXT</type>* <name>pLabelInfo</name></param> + </command> + <command> + <proto><type>void</type> <name>vkQueueEndDebugUtilsLabelEXT</name></proto> + <param><type>VkQueue</type> <name>queue</name></param> + </command> + <command> + <proto><type>void</type> <name>vkQueueInsertDebugUtilsLabelEXT</name></proto> + <param><type>VkQueue</type> <name>queue</name></param> + <param>const <type>VkDebugUtilsLabelEXT</type>* <name>pLabelInfo</name></param> + </command> + <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> + <proto><type>void</type> <name>vkCmdBeginDebugUtilsLabelEXT</name></proto> + <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param>const <type>VkDebugUtilsLabelEXT</type>* <name>pLabelInfo</name></param> + </command> + <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> + <proto><type>void</type> <name>vkCmdEndDebugUtilsLabelEXT</name></proto> + <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + </command> + <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> + <proto><type>void</type> <name>vkCmdInsertDebugUtilsLabelEXT</name></proto> + <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param>const <type>VkDebugUtilsLabelEXT</type>* <name>pLabelInfo</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkCreateDebugUtilsMessengerEXT</name></proto> + <param><type>VkInstance</type> <name>instance</name></param> + <param>const <type>VkDebugUtilsMessengerCreateInfoEXT</type>* <name>pCreateInfo</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + <param><type>VkDebugUtilsMessengerEXT</type>* <name>pMessenger</name></param> + </command> + <command> + <proto><type>void</type> <name>vkDestroyDebugUtilsMessengerEXT</name></proto> + <param><type>VkInstance</type> <name>instance</name></param> + <param externsync="true"><type>VkDebugUtilsMessengerEXT</type> <name>messenger</name></param> + <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> + </command> + <command> + <proto><type>void</type> <name>vkSubmitDebugUtilsMessageEXT</name></proto> + <param><type>VkInstance</type> <name>instance</name></param> + <param><type>VkDebugUtilsMessageSeverityFlagBitsEXT</type> <name>messageSeverity</name></param> + <param><type>VkDebugUtilsMessageTypeFlagsEXT</type> <name>messageTypes</name></param> + <param>const <type>VkDebugUtilsMessengerCallbackDataEXT</type>* <name>pCallbackData</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE"> + <proto><type>VkResult</type> <name>vkGetMemoryHostPointerPropertiesEXT</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></param> + <param optional="false">const <type>void</type>* <name>pHostPointer</name></param> + <param><type>VkMemoryHostPointerPropertiesEXT</type>* <name>pMemoryHostPointerProperties</name></param> + </command> + <command queues="transfer,graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" pipeline="transfer"> + <proto><type>void</type> <name>vkCmdWriteBufferMarkerAMD</name></proto> + <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param><type>VkPipelineStageFlagBits</type> <name>pipelineStage</name></param> + <param><type>VkBuffer</type> <name>dstBuffer</name></param> + <param><type>VkDeviceSize</type> <name>dstOffset</name></param> + <param><type>uint32_t</type> <name>marker</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR"> + <proto><type>VkResult</type> <name>vkGetAndroidHardwareBufferPropertiesANDROID</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const struct <type>AHardwareBuffer</type>* <name>buffer</name></param> + <param><type>VkAndroidHardwareBufferPropertiesANDROID</type>* <name>pProperties</name></param> + </command> + <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> + <proto><type>VkResult</type> <name>vkGetMemoryAndroidHardwareBufferANDROID</name></proto> + <param><type>VkDevice</type> <name>device</name></param> + <param>const <type>VkMemoryGetAndroidHardwareBufferInfoANDROID</type>* <name>pInfo</name></param> + <param>struct <type>AHardwareBuffer</type>** <name>pBuffer</name></param> + </command> + <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> + <proto><type>void</type> <name>vkCmdDrawIndirectCountKHR</name></proto> + <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param><type>VkBuffer</type> <name>buffer</name></param> + <param><type>VkDeviceSize</type> <name>offset</name></param> + <param><type>VkBuffer</type> <name>countBuffer</name></param> + <param><type>VkDeviceSize</type> <name>countBufferOffset</name></param> + <param><type>uint32_t</type> <name>maxDrawCount</name></param> + <param><type>uint32_t</type> <name>stride</name></param> + </command> + <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> + <proto><type>void</type> <name>vkCmdDrawIndexedIndirectCountKHR</name></proto> + <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> + <param><type>VkBuffer</type> <name>buffer</name></param> + <param><type>VkDeviceSize</type> <name>offset</name></param> + <param><type>VkBuffer</type> <name>countBuffer</name></param> + <param><type>VkDeviceSize</type> <name>countBufferOffset</name></param> + <param><type>uint32_t</type> <name>maxDrawCount</name></param> + <param><type>uint32_t</type> <name>stride</name></param> + </command> + </commands> + + <feature api="vulkan" name="VK_VERSION_1_0" number="1.0" comment="Vulkan core API interface definitions"> + <require comment="Header boilerplate"> + <type name="vk_platform"/> + </require> + <require comment="API version"> + <type name="VK_API_VERSION"/> + <type name="VK_API_VERSION_1_0"/> + <type name="VK_VERSION_MAJOR"/> + <type name="VK_VERSION_MINOR"/> + <type name="VK_VERSION_PATCH"/> + <type name="VK_HEADER_VERSION"/> + </require> + <require comment="API constants"> + <enum name="VK_LOD_CLAMP_NONE"/> + <enum name="VK_REMAINING_MIP_LEVELS"/> + <enum name="VK_REMAINING_ARRAY_LAYERS"/> + <enum name="VK_WHOLE_SIZE"/> + <enum name="VK_ATTACHMENT_UNUSED"/> + <enum name="VK_TRUE"/> + <enum name="VK_FALSE"/> + <type name="VK_NULL_HANDLE"/> + <enum name="VK_QUEUE_FAMILY_IGNORED"/> <enum name="VK_SUBPASS_EXTERNAL"/> <type name="VkPipelineCacheHeaderVersion"/> </require> @@ -5084,11 +6318,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkCmdEndRenderPass"/> <command name="vkCmdExecuteCommands"/> </require> - <require comment="Types not directly used by the API"> -  + <require comment="Types not directly used by the API. Include e.g. structs that are not parameter types of commands, but still defined by the API."> <type name="VkBufferMemoryBarrier"/> <type name="VkDispatchIndirectCommand"/> <type name="VkDrawIndexedIndirectCommand"/> @@ -5096,20 +6326,347 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type name="VkImageMemoryBarrier"/> <type name="VkMemoryBarrier"/> <type name="VkObjectType"/> + <type name="VkBaseOutStructure"/> + <type name="VkBaseInStructure"/> </require> </feature> + <feature api="vulkan" name="VK_VERSION_1_1" number="1.1" comment="Vulkan 1.1 core API interface definitions."> + <require> + <type name="VK_API_VERSION_1_1"/> + </require> + <require comment="Device Initialization"> + <command name="vkEnumerateInstanceVersion"/> + </require> + <require comment="Promoted from VK_KHR_relaxed_block_layout, which has no API"/> + <require comment="Promoted from VK_KHR_storage_buffer_storage_class, which has no API"/> + <require comment="Originally based on VK_KHR_subgroup (extension 94), but the actual enum block used was, incorrectly, that of extension 95"> + <enum extends="VkStructureType" extnumber="95" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES"/> + <type name="VkPhysicalDeviceSubgroupProperties"/> + <type name="VkSubgroupFeatureFlags"/> + <type name="VkSubgroupFeatureFlagBits"/> + </require> + <require comment="Promoted from VK_KHR_bind_memory2"> + <command name="vkBindBufferMemory2"/> + <command name="vkBindImageMemory2"/> + <enum extends="VkStructureType" extnumber="158" offset="0" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO"/> + <enum extends="VkStructureType" extnumber="158" offset="1" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO"/> + <enum bitpos="10" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_ALIAS_BIT"/> + <type name="VkBindBufferMemoryInfo"/> + <type name="VkBindImageMemoryInfo"/> + </require> + <require comment="Promoted from VK_KHR_16bit_storage"> + <enum extends="VkStructureType" extnumber="84" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES"/> + <type name="VkPhysicalDevice16BitStorageFeatures"/> + </require> + <require comment="Promoted from VK_KHR_dedicated_allocation"> + <enum extends="VkStructureType" extnumber="128" offset="0" name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS"/> + <enum extends="VkStructureType" extnumber="128" offset="1" name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO"/> + <type name="VkMemoryDedicatedRequirements"/> + <type name="VkMemoryDedicatedAllocateInfo"/> + </require> + <require comment="Promoted from VK_KHR_device_group"> + <enum extends="VkStructureType" extnumber="61" offset="0" name="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO"/> + <comment>offset 1 reserved for the old VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX enum</comment> + <comment>offset 2 reserved for the old VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX enum</comment> + <enum extends="VkStructureType" extnumber="61" offset="3" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO"/> + <enum extends="VkStructureType" extnumber="61" offset="4" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO"/> + <enum extends="VkStructureType" extnumber="61" offset="5" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO"/> + <enum extends="VkStructureType" extnumber="61" offset="6" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO"/> + <type name="VkPeerMemoryFeatureFlags"/> + <type name="VkPeerMemoryFeatureFlagBits"/> + <type name="VkMemoryAllocateFlags"/> + <type name="VkMemoryAllocateFlagBits"/> + <type name="VkMemoryAllocateFlagsInfo"/> + <type name="VkDeviceGroupRenderPassBeginInfo"/> + <type name="VkDeviceGroupCommandBufferBeginInfo"/> + <type name="VkDeviceGroupSubmitInfo"/> + <type name="VkDeviceGroupBindSparseInfo"/> + <command name="vkGetDeviceGroupPeerMemoryFeatures"/> + <command name="vkCmdSetDeviceMask"/> + <command name="vkCmdDispatchBase"/> + <enum bitpos="3" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT"/> + <enum bitpos="4" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_DISPATCH_BASE"/> + <enum bitpos="2" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_DEVICE_GROUP_BIT" comment="Dependency is across devices"/> + </require> + <require comment="Promoted from VK_KHR_device_group + VK_KHR_bind_memory2"> + <enum extends="VkStructureType" extnumber="61" offset="13" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO"/> + <enum extends="VkStructureType" extnumber="61" offset="14" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO"/> + <type name="VkBindBufferMemoryDeviceGroupInfo"/> + <type name="VkBindImageMemoryDeviceGroupInfo"/> + <enum bitpos="6" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT" comment="Allows using VkBindImageMemoryDeviceGroupInfo::pSplitInstanceBindRegions when binding memory to the image"/> + </require> + <require comment="Promoted from VK_KHR_device_group_creation"> + <enum extends="VkStructureType" extnumber="71" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="71" offset="1" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO"/> + <enum name="VK_MAX_DEVICE_GROUP_SIZE"/> + <type name="VkPhysicalDeviceGroupProperties"/> + <type name="VkDeviceGroupDeviceCreateInfo"/> + <command name="vkEnumeratePhysicalDeviceGroups"/> + <enum bitpos="1" extends="VkMemoryHeapFlagBits" name="VK_MEMORY_HEAP_MULTI_INSTANCE_BIT" comment="If set, heap allocations allocate multiple instances by default"/> + </require> + <require comment="Promoted from VK_KHR_get_memory_requirements2"> + <enum extends="VkStructureType" extnumber="147" offset="0" name="VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" extnumber="147" offset="1" name="VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" extnumber="147" offset="2" name="VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" extnumber="147" offset="3" name="VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2"/> + <enum extends="VkStructureType" extnumber="147" offset="4" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2"/> + <type name="VkBufferMemoryRequirementsInfo2"/> + <type name="VkImageMemoryRequirementsInfo2"/> + <type name="VkImageSparseMemoryRequirementsInfo2"/> + <type name="VkMemoryRequirements2"/> + <type name="VkSparseImageMemoryRequirements2"/> + <command name="vkGetImageMemoryRequirements2"/> + <command name="vkGetBufferMemoryRequirements2"/> + <command name="vkGetImageSparseMemoryRequirements2"/> + </require> + <require comment="Promoted from VK_KHR_get_physical_device_properties2"> + <enum extends="VkStructureType" extnumber="60" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="1" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="2" name="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="3" name="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="4" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2"/> + <enum extends="VkStructureType" extnumber="60" offset="5" name="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="6" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="7" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" extnumber="60" offset="8" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2"/> + <type name="VkPhysicalDeviceFeatures2"/> + <type name="VkPhysicalDeviceProperties2"/> + <type name="VkFormatProperties2"/> + <type name="VkImageFormatProperties2"/> + <type name="VkPhysicalDeviceImageFormatInfo2"/> + <type name="VkQueueFamilyProperties2"/> + <type name="VkPhysicalDeviceMemoryProperties2"/> + <type name="VkSparseImageFormatProperties2"/> + <type name="VkPhysicalDeviceSparseImageFormatInfo2"/> + <command name="vkGetPhysicalDeviceFeatures2"/> + <command name="vkGetPhysicalDeviceProperties2"/> + <command name="vkGetPhysicalDeviceFormatProperties2"/> + <command name="vkGetPhysicalDeviceImageFormatProperties2"/> + <command name="vkGetPhysicalDeviceQueueFamilyProperties2"/> + <command name="vkGetPhysicalDeviceMemoryProperties2"/> + <command name="vkGetPhysicalDeviceSparseImageFormatProperties2"/> + </require> + <require comment="Promoted from VK_KHR_maintenance1"> + <enum extends="VkResult" extnumber="70" offset="0" dir="-" name="VK_ERROR_OUT_OF_POOL_MEMORY"/> + <enum bitpos="14" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT" comment="Format can be used as the source image of image transfer commands"/> + <enum bitpos="15" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_DST_BIT" comment="Format can be used as the destination image of image transfer commands"/> + <enum bitpos="5" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT" comment="The 3D image can be viewed as a 2D or 2D array image"/> + <command name="vkTrimCommandPool"/> + <comment>Additional dependent types / tokens extending enumerants, not explicitly mentioned</comment> + <type name="VkCommandPoolTrimFlags"/> + </require> + <require comment="Promoted from VK_KHR_maintenance2"> + <enum bitpos="7" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT"/> + <enum bitpos="8" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_EXTENDED_USAGE_BIT"/> + <enum extends="VkStructureType" extnumber="118" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="118" offset="1" name="VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="118" offset="2" name="VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="118" offset="3" name="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO"/> + <enum extends="VkImageLayout" extnumber="118" offset="0" name="VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL"/> + <enum extends="VkImageLayout" extnumber="118" offset="1" name="VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL"/> + <type name="VkPhysicalDevicePointClippingProperties"/> + <type name="VkPointClippingBehavior"/> + <type name="VkRenderPassInputAttachmentAspectCreateInfo"/> + <type name="VkInputAttachmentAspectReference"/> + <type name="VkImageViewUsageCreateInfo"/> + <type name="VkTessellationDomainOrigin"/> + <type name="VkPipelineTessellationDomainOriginStateCreateInfo"/> + </require> + <require comment="Promoted from VK_KHR_multiview"> + <enum extends="VkStructureType" extnumber="54" offset="0" name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="54" offset="1" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES"/> + <enum extends="VkStructureType" extnumber="54" offset="2" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES"/> + <enum bitpos="1" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_VIEW_LOCAL_BIT"/> + <type name="VkRenderPassMultiviewCreateInfo"/> + <type name="VkPhysicalDeviceMultiviewFeatures"/> + <type name="VkPhysicalDeviceMultiviewProperties"/> + </require> + <require comment="Promoted from VK_KHR_variable_pointers"> + <enum extends="VkStructureType" extnumber="121" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES"/> + <type name="VkPhysicalDeviceVariablePointerFeatures"/> + </require> + <require comment="Originally based on VK_KHR_protected_memory (extension 146), which was never published; thus the mystifying large value= numbers below. These are not aliased since they weren't actually promoted from an extension."> + <enum extends="VkStructureType" extnumber="146" offset="0" name="VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO"/> + <enum extends="VkStructureType" extnumber="146" offset="1" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES"/> + <enum extends="VkStructureType" extnumber="146" offset="2" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="146" offset="3" name="VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2"/> + <enum bitpos="4" extends="VkQueueFlagBits" name="VK_QUEUE_PROTECTED_BIT" comment="Queues may support protected operations"/> + <enum bitpos="0" extends="VkDeviceQueueCreateFlagBits" name="VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT" comment="Queue is a protected-capable device queue"/> + <enum bitpos="5" extends="VkMemoryPropertyFlagBits" name="VK_MEMORY_PROPERTY_PROTECTED_BIT" comment="Memory is protected"/> + <enum bitpos="3" extends="VkBufferCreateFlagBits" name="VK_BUFFER_CREATE_PROTECTED_BIT" comment="Buffer requires protected memory"/> + <enum bitpos="11" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_PROTECTED_BIT" comment="Image requires protected memory"/> + <enum bitpos="2" extends="VkCommandPoolCreateFlagBits" name="VK_COMMAND_POOL_CREATE_PROTECTED_BIT" comment="Command buffers allocated from pool are protected command buffers"/> + <type name="VkPhysicalDeviceProtectedMemoryFeatures"/> + <type name="VkPhysicalDeviceProtectedMemoryProperties"/> + <type name="VkDeviceQueueInfo2"/> + <type name="VkProtectedSubmitInfo"/> + <command name="vkGetDeviceQueue2"/> + </require> + <require comment="Promoted from VK_KHR_sampler_ycbcr_conversion"> + <enum extends="VkStructureType" extnumber="157" offset="0" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="157" offset="1" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO"/> + <enum extends="VkStructureType" extnumber="157" offset="2" name="VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO"/> + <enum extends="VkStructureType" extnumber="157" offset="3" name="VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO"/> + <enum extends="VkStructureType" extnumber="157" offset="4" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES"/> + <enum extends="VkStructureType" extnumber="157" offset="5" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES"/> + <enum extends="VkObjectType" extnumber="157" offset="0" name="VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION"/> + <enum extends="VkFormat" extnumber="157" offset="0" name="VK_FORMAT_G8B8G8R8_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="1" name="VK_FORMAT_B8G8R8G8_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="2" name="VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="3" name="VK_FORMAT_G8_B8R8_2PLANE_420_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="4" name="VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="5" name="VK_FORMAT_G8_B8R8_2PLANE_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="6" name="VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="7" name="VK_FORMAT_R10X6_UNORM_PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="8" name="VK_FORMAT_R10X6G10X6_UNORM_2PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="9" name="VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="10" name="VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="11" name="VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="12" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="13" name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="14" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="15" name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="16" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="17" name="VK_FORMAT_R12X4_UNORM_PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="18" name="VK_FORMAT_R12X4G12X4_UNORM_2PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="19" name="VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="20" name="VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="21" name="VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="22" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="23" name="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="24" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="25" name="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="26" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16"/> + <enum extends="VkFormat" extnumber="157" offset="27" name="VK_FORMAT_G16B16G16R16_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="28" name="VK_FORMAT_B16G16R16G16_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="29" name="VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="30" name="VK_FORMAT_G16_B16R16_2PLANE_420_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="31" name="VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="32" name="VK_FORMAT_G16_B16R16_2PLANE_422_UNORM"/> + <enum extends="VkFormat" extnumber="157" offset="33" name="VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM"/> + <enum bitpos="4" extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_0_BIT"/> + <enum bitpos="5" extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_1_BIT"/> + <enum bitpos="6" extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_2_BIT"/> + <enum bitpos="9" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_DISJOINT_BIT"/> + <enum bitpos="17" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT" comment="Format can have midpoint rather than cosited chroma samples"/> + <enum bitpos="18" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT" comment="Format can be used with linear filtering whilst color conversion is enabled"/> + <enum bitpos="19" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT" comment="Format can have different chroma, min and mag filters"/> + <enum bitpos="20" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT"/> + <enum bitpos="21" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT"/> + <enum bitpos="22" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_DISJOINT_BIT" comment="Format supports disjoint planes"/> + <enum bitpos="23" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT" comment="Format can have cosited rather than midpoint chroma samples"/> + <type name="VkSamplerYcbcrConversionCreateInfo"/> + <type name="VkSamplerYcbcrConversionInfo"/> + <type name="VkBindImagePlaneMemoryInfo"/> + <type name="VkImagePlaneMemoryRequirementsInfo"/> + <type name="VkPhysicalDeviceSamplerYcbcrConversionFeatures"/> + <type name="VkSamplerYcbcrConversionImageFormatProperties"/> + <command name="vkCreateSamplerYcbcrConversion"/> + <command name="vkDestroySamplerYcbcrConversion"/> + <comment>Additional dependent types / tokens extending enumerants, not explicitly mentioned</comment> + <type name="VkSamplerYcbcrConversion"/> + <type name="VkSamplerYcbcrModelConversion"/> + <type name="VkSamplerYcbcrRange"/> + <type name="VkChromaLocation"/> + </require> + <require comment="Promoted from VK_KHR_descriptor_update_template"> + <enum extends="VkStructureType" extnumber="86" offset="0" name="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO"/> + <enum extends="VkObjectType" extnumber="86" offset="0" name="VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE"/> + <command name="vkCreateDescriptorUpdateTemplate"/> + <command name="vkDestroyDescriptorUpdateTemplate"/> + <command name="vkUpdateDescriptorSetWithTemplate"/> + <type name="VkDescriptorUpdateTemplate"/> + <type name="VkDescriptorUpdateTemplateCreateFlags"/> + <type name="VkDescriptorUpdateTemplateType"/> + <type name="VkDescriptorUpdateTemplateEntry"/> + <type name="VkDescriptorUpdateTemplateCreateInfo"/> + </require> + <require comment="Promoted from VK_KHR_external_memory_capabilities"> + <enum extends="VkStructureType" extnumber="72" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO"/> + <enum extends="VkStructureType" extnumber="72" offset="1" name="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="72" offset="2" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO"/> + <enum extends="VkStructureType" extnumber="72" offset="3" name="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="72" offset="4" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES"/> + <enum name="VK_LUID_SIZE"/> + <type name="VkExternalMemoryHandleTypeFlags"/> + <type name="VkExternalMemoryHandleTypeFlagBits"/> + <type name="VkExternalMemoryFeatureFlags"/> + <type name="VkExternalMemoryFeatureFlagBits"/> + <type name="VkExternalMemoryProperties"/> + <type name="VkPhysicalDeviceExternalImageFormatInfo"/> + <type name="VkExternalImageFormatProperties"/> + <type name="VkPhysicalDeviceExternalBufferInfo"/> + <type name="VkExternalBufferProperties"/> + <type name="VkPhysicalDeviceIDProperties"/> + <command name="vkGetPhysicalDeviceExternalBufferProperties"/> + </require> + <require comment="Promoted from VK_KHR_external_memory"> + <enum extends="VkStructureType" extnumber="73" offset="0" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="73" offset="1" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO"/> + <enum extends="VkStructureType" extnumber="73" offset="2" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO"/> + <enum extends="VkResult" extnumber="73" offset="3" dir="-" name="VK_ERROR_INVALID_EXTERNAL_HANDLE"/> + <enum name="VK_QUEUE_FAMILY_EXTERNAL"/> + <type name="VkExternalMemoryImageCreateInfo"/> + <type name="VkExternalMemoryBufferCreateInfo"/> + <type name="VkExportMemoryAllocateInfo"/> + </require> + <require comment="Promoted from VK_KHR_external_fence_capabilities"> + <enum extends="VkStructureType" extnumber="113" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO"/> + <enum extends="VkStructureType" extnumber="113" offset="1" name="VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES"/> + <type name="VkExternalFenceHandleTypeFlags"/> + <type name="VkExternalFenceHandleTypeFlagBits"/> + <type name="VkExternalFenceFeatureFlags"/> + <type name="VkExternalFenceFeatureFlagBits"/> + <type name="VkPhysicalDeviceExternalFenceInfo"/> + <type name="VkExternalFenceProperties"/> + <command name="vkGetPhysicalDeviceExternalFenceProperties"/> + </require> + <require comment="Promoted from VK_KHR_external_fence"> + <enum extends="VkStructureType" extnumber="114" offset="0" name="VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO"/> + <type name="VkFenceImportFlags"/> + <type name="VkFenceImportFlagBits"/> + <type name="VkExportFenceCreateInfo"/> + </require> + <require comment="Promoted from VK_KHR_external_semaphore"> + <enum extends="VkStructureType" extnumber="78" offset="0" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO"/> + <type name="VkSemaphoreImportFlags"/> + <type name="VkSemaphoreImportFlagBits"/> + <type name="VkExportSemaphoreCreateInfo"/> + </require> + <require comment="Promoted from VK_KHR_external_semaphore_capabilities"> + <enum extends="VkStructureType" extnumber="77" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO"/> + <enum extends="VkStructureType" extnumber="77" offset="1" name="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES"/> + <type name="VkExternalSemaphoreHandleTypeFlags"/> + <type name="VkExternalSemaphoreHandleTypeFlagBits"/> + <type name="VkExternalSemaphoreFeatureFlags"/> + <type name="VkExternalSemaphoreFeatureFlagBits"/> + <type name="VkPhysicalDeviceExternalSemaphoreInfo"/> + <type name="VkExternalSemaphoreProperties"/> + <command name="vkGetPhysicalDeviceExternalSemaphoreProperties"/> + </require> + <require comment="Promoted from VK_KHR_maintenance3"> + <enum extends="VkStructureType" extnumber="169" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES"/> + <enum extends="VkStructureType" extnumber="169" offset="1" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT"/> + <type name="VkPhysicalDeviceMaintenance3Properties"/> + <type name="VkDescriptorSetLayoutSupport"/> + <command name="vkGetDescriptorSetLayoutSupport"/> + </require> + <require comment="Promoted from VK_KHR_shader_draw_parameters, with a feature support query added"> + <enum extends="VkStructureType" extnumber="64" offset="0" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES"/> + <type name="VkPhysicalDeviceShaderDrawParameterFeatures"/> + </require> + </feature> + -  - <extensions> -  - <extension name="VK_KHR_surface" number="1" type="instance" supported="vulkan"> - <require> - <enum value="25" name="VK_KHR_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_surface"" name="VK_KHR_SURFACE_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_SURFACE_LOST_KHR"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"/> - <enum value="VK_COLOR_SPACE_SRGB_NONLINEAR_KHR" name="VK_COLORSPACE_SRGB_NONLINEAR_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SURFACE_KHR" comment="VkSurfaceKHR"/> + <extensions comment="Vulkan extension interface definitions"> + <extension name="VK_KHR_surface" number="1" type="instance" author="KHR" contact="James Jones @cubanismo,Ian Elliott @ianelliottus" supported="vulkan"> + <require> + <enum value="25" name="VK_KHR_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_surface"" name="VK_KHR_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkResult" dir="-" name="VK_ERROR_SURFACE_LOST_KHR"/> + <enum offset="1" extends="VkResult" dir="-" name="VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"/> + <enum value="VK_COLOR_SPACE_SRGB_NONLINEAR_KHR" name="VK_COLORSPACE_SRGB_NONLINEAR_KHR"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SURFACE_KHR" comment="VkSurfaceKHR"/> <command name="vkDestroySurfaceKHR"/> <command name="vkGetPhysicalDeviceSurfaceSupportKHR"/> <command name="vkGetPhysicalDeviceSurfaceCapabilitiesKHR"/> @@ -5117,31 +6674,54 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPhysicalDeviceSurfacePresentModesKHR"/> </require> </extension> - <extension name="VK_KHR_swapchain" number="2" type="device" requires="VK_KHR_surface" supported="vulkan"> + <extension name="VK_KHR_swapchain" number="2" type="device" requires="VK_KHR_surface" author="KHR" contact="James Jones @cubanismo,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="68" name="VK_KHR_SWAPCHAIN_SPEC_VERSION"/> - <enum value=""VK_KHR_swapchain"" name="VK_KHR_SWAPCHAIN_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"/> - <enum offset="2" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_PRESENT_SRC_KHR"/> - <enum offset="3" extends="VkResult" name="VK_SUBOPTIMAL_KHR"/> - <enum offset="4" dir="-" extends="VkResult" name="VK_ERROR_OUT_OF_DATE_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SWAPCHAIN_KHR" comment="VkSwapchainKHR"/> + <enum value="70" name="VK_KHR_SWAPCHAIN_SPEC_VERSION"/> + <enum value=""VK_KHR_swapchain"" name="VK_KHR_SWAPCHAIN_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"/> + <enum offset="2" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_PRESENT_SRC_KHR"/> + <enum offset="3" extends="VkResult" name="VK_SUBOPTIMAL_KHR"/> + <enum offset="4" extends="VkResult" dir="-" name="VK_ERROR_OUT_OF_DATE_KHR"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SWAPCHAIN_KHR" comment="VkSwapchainKHR"/> <command name="vkCreateSwapchainKHR"/> <command name="vkDestroySwapchainKHR"/> <command name="vkGetSwapchainImagesKHR"/> <command name="vkAcquireNextImageKHR"/> <command name="vkQueuePresentKHR"/> </require> - </extension> - <extension name="VK_KHR_display" number="3" type="instance" requires="VK_KHR_surface" supported="vulkan"> - <require> - <enum value="21" name="VK_KHR_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_KHR_display"" name="VK_KHR_DISPLAY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_KHR" comment="VkDisplayKHR"/> - <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_MODE_KHR" comment="VkDisplayModeKHR"/> + <require feature="VK_VERSION_1_1"> + <comment>This duplicates definitions in VK_KHR_device_group below</comment> + <enum extends="VkStructureType" extnumber="61" offset="7" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR"/> + <enum extends="VkStructureType" extnumber="61" offset="8" name="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR"/> + <enum extends="VkStructureType" extnumber="61" offset="9" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR"/> + <enum extends="VkStructureType" extnumber="61" offset="10" name="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR"/> + <enum extends="VkStructureType" extnumber="61" offset="11" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR"/> + <enum extends="VkStructureType" extnumber="61" offset="12" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR"/> + <enum bitpos="0" extends="VkSwapchainCreateFlagBitsKHR" name="VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR" comment="Allow images with VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT"/> + <type name="VkImageSwapchainCreateInfoKHR"/> + <type name="VkBindImageMemorySwapchainInfoKHR"/> + <type name="VkAcquireNextImageInfoKHR"/> + <type name="VkDeviceGroupPresentModeFlagBitsKHR"/> + <type name="VkDeviceGroupPresentModeFlagsKHR"/> + <type name="VkDeviceGroupPresentCapabilitiesKHR"/> + <type name="VkDeviceGroupPresentInfoKHR"/> + <type name="VkDeviceGroupSwapchainCreateInfoKHR"/> + <command name="vkGetDeviceGroupPresentCapabilitiesKHR"/> + <command name="vkGetDeviceGroupSurfacePresentModesKHR"/> + <command name="vkGetPhysicalDevicePresentRectanglesKHR"/> + <command name="vkAcquireNextImage2KHR"/> + <enum bitpos="1" extends="VkSwapchainCreateFlagBitsKHR" name="VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR" comment="Swapchain is protected"/> + </require> + </extension> + <extension name="VK_KHR_display" number="3" type="instance" requires="VK_KHR_surface" author="KHR" contact="James Jones @cubanismo,Norbert Nopper @FslNopper" supported="vulkan"> + <require> + <enum value="21" name="VK_KHR_DISPLAY_SPEC_VERSION"/> + <enum value=""VK_KHR_display"" name="VK_KHR_DISPLAY_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_KHR" comment="VkDisplayKHR"/> + <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_MODE_KHR" comment="VkDisplayModeKHR"/> <type name="VkDisplayPlaneAlphaFlagsKHR"/> <type name="VkDisplayPlaneAlphaFlagBitsKHR"/> <type name="VkDisplayPropertiesKHR"/> @@ -5160,96 +6740,102 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkCreateDisplayPlaneSurfaceKHR"/> </require> </extension> - <extension name="VK_KHR_display_swapchain" number="4" type="device" requires="VK_KHR_swapchain,VK_KHR_display" supported="vulkan"> + <extension name="VK_KHR_display_swapchain" number="4" type="device" requires="VK_KHR_swapchain,VK_KHR_display" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="9" name="VK_KHR_DISPLAY_SWAPCHAIN_SPEC_VERSION"/> - <enum value=""VK_KHR_display_swapchain"" name="VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_INCOMPATIBLE_DISPLAY_KHR"/> + <enum value="9" name="VK_KHR_DISPLAY_SWAPCHAIN_SPEC_VERSION"/> + <enum value=""VK_KHR_display_swapchain"" name="VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"/> + <enum offset="1" extends="VkResult" dir="-" name="VK_ERROR_INCOMPATIBLE_DISPLAY_KHR"/> <type name="VkDisplayPresentInfoKHR"/> <command name="vkCreateSharedSwapchainsKHR"/> </require> </extension> - <extension name="VK_KHR_xlib_surface" number="5" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_XLIB_KHR" supported="vulkan"> + <extension name="VK_KHR_xlib_surface" number="5" type="instance" requires="VK_KHR_surface" platform="xlib" author="KHR" contact="Jesse Hall @critsec,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="6" name="VK_KHR_XLIB_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_xlib_surface"" name="VK_KHR_XLIB_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"/> + <enum value="6" name="VK_KHR_XLIB_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_xlib_surface"" name="VK_KHR_XLIB_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"/> <type name="VkXlibSurfaceCreateFlagsKHR"/> <type name="VkXlibSurfaceCreateInfoKHR"/> <command name="vkCreateXlibSurfaceKHR"/> <command name="vkGetPhysicalDeviceXlibPresentationSupportKHR"/> </require> </extension> - <extension name="VK_KHR_xcb_surface" number="6" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_XCB_KHR" supported="vulkan"> + <extension name="VK_KHR_xcb_surface" number="6" type="instance" requires="VK_KHR_surface" platform="xcb" author="KHR" contact="Jesse Hall @critsec,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="6" name="VK_KHR_XCB_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_xcb_surface"" name="VK_KHR_XCB_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"/> + <enum value="6" name="VK_KHR_XCB_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_xcb_surface"" name="VK_KHR_XCB_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"/> <type name="VkXcbSurfaceCreateFlagsKHR"/> <type name="VkXcbSurfaceCreateInfoKHR"/> <command name="vkCreateXcbSurfaceKHR"/> <command name="vkGetPhysicalDeviceXcbPresentationSupportKHR"/> </require> </extension> - <extension name="VK_KHR_wayland_surface" number="7" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_WAYLAND_KHR" supported="vulkan"> + <extension name="VK_KHR_wayland_surface" number="7" type="instance" requires="VK_KHR_surface" platform="wayland" author="KHR" contact="Jesse Hall @critsec,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="6" name="VK_KHR_WAYLAND_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_wayland_surface"" name="VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"/> + <enum value="6" name="VK_KHR_WAYLAND_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_wayland_surface"" name="VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"/> <type name="VkWaylandSurfaceCreateFlagsKHR"/> <type name="VkWaylandSurfaceCreateInfoKHR"/> <command name="vkCreateWaylandSurfaceKHR"/> <command name="vkGetPhysicalDeviceWaylandPresentationSupportKHR"/> </require> </extension> - <extension name="VK_KHR_mir_surface" number="8" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_MIR_KHR" supported="vulkan"> + <extension name="VK_KHR_mir_surface" number="8" type="instance" requires="VK_KHR_surface" platform="mir" author="KHR" contact="Jesse Hall @critsec,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="4" name="VK_KHR_MIR_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_mir_surface"" name="VK_KHR_MIR_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"/> + <enum value="4" name="VK_KHR_MIR_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_mir_surface"" name="VK_KHR_MIR_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"/> <type name="VkMirSurfaceCreateFlagsKHR"/> <type name="VkMirSurfaceCreateInfoKHR"/> <command name="vkCreateMirSurfaceKHR"/> <command name="vkGetPhysicalDeviceMirPresentationSupportKHR"/> </require> </extension> - <extension name="VK_KHR_android_surface" number="9" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_ANDROID_KHR" supported="vulkan"> + <extension name="VK_KHR_android_surface" number="9" type="instance" requires="VK_KHR_surface" platform="android" author="KHR" contact="Jesse Hall @critsec" supported="vulkan"> <require> - <enum value="6" name="VK_KHR_ANDROID_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_android_surface"" name="VK_KHR_ANDROID_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"/> + <enum value="6" name="VK_KHR_ANDROID_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_android_surface"" name="VK_KHR_ANDROID_SURFACE_EXTENSION_NAME"/> + <type name="ANativeWindow"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"/> <type name="VkAndroidSurfaceCreateFlagsKHR"/> <type name="VkAndroidSurfaceCreateInfoKHR"/> <command name="vkCreateAndroidSurfaceKHR"/> </require> </extension> - <extension name="VK_KHR_win32_surface" number="10" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> + <extension name="VK_KHR_win32_surface" number="10" type="instance" requires="VK_KHR_surface" platform="win32" author="KHR" contact="Jesse Hall @critsec,Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="6" name="VK_KHR_WIN32_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_win32_surface"" name="VK_KHR_WIN32_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"/> + <enum value="6" name="VK_KHR_WIN32_SURFACE_SPEC_VERSION"/> + <enum value=""VK_KHR_win32_surface"" name="VK_KHR_WIN32_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"/> <type name="VkWin32SurfaceCreateFlagsKHR"/> <type name="VkWin32SurfaceCreateInfoKHR"/> <command name="vkCreateWin32SurfaceKHR"/> <command name="vkGetPhysicalDeviceWin32PresentationSupportKHR"/> </require> </extension> - <extension name="VK_ANDROID_native_buffer" number="11" supported="disabled"> + <extension name="VK_ANDROID_native_buffer" number="11" type="device" author="ANDROID" platform="android" contact="Jesse Hall @critsec" supported="disabled"> <require> - <enum value="4" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/> - <enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/> - <enum value=""VK_ANDROID_native_buffer"" name="VK_ANDROID_NATIVE_BUFFER_NAME"/> + <enum value="5" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/> + <enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/> + <enum value=""VK_ANDROID_native_buffer"" name="VK_ANDROID_NATIVE_BUFFER_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID"/> + <type name="VkNativeBufferANDROID"/> + <command name="vkGetSwapchainGrallocUsageANDROID"/> + <command name="vkAcquireImageANDROID"/> + <command name="vkQueueSignalReleaseImageANDROID"/> </require> </extension> - <extension name="VK_EXT_debug_report" number="12" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtney" supported="vulkan"> + <extension name="VK_EXT_debug_report" number="12" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtney-g" supported="vulkan"> <require> - <enum value="8" name="VK_EXT_DEBUG_REPORT_SPEC_VERSION"/> - <enum value=""VK_EXT_debug_report"" name="VK_EXT_DEBUG_REPORT_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_VALIDATION_FAILED_EXT"/> + <enum value="9" name="VK_EXT_DEBUG_REPORT_SPEC_VERSION"/> + <enum value=""VK_EXT_debug_report"" name="VK_EXT_DEBUG_REPORT_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"/> + <enum offset="1" extends="VkResult" dir="-" name="VK_ERROR_VALIDATION_FAILED_EXT"/> <enum value="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT" name="VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT" comment="VkDebugReportCallbackEXT"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT" comment="VkDebugReportCallbackEXT"/> <enum value="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT"/> <type name="VkDebugReportObjectTypeEXT"/> <type name="VkDebugReportCallbackCreateInfoEXT"/> @@ -5257,82 +6843,86 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkDestroyDebugReportCallbackEXT"/> <command name="vkDebugReportMessageEXT"/> </require> + <require feature="VK_VERSION_1_1"> + <comment>This duplicates definitions in other extensions, below</comment> + <enum extends="VkDebugReportObjectTypeEXT" extnumber="157" offset="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT"/> + <enum extends="VkDebugReportObjectTypeEXT" extnumber="86" offset="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT"/> + </require> </extension> - <extension name="VK_NV_glsl_shader" number="13" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> + <extension name="VK_NV_glsl_shader" number="13" type="device" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="1" name="VK_NV_GLSL_SHADER_SPEC_VERSION"/> - <enum value=""VK_NV_glsl_shader"" name="VK_NV_GLSL_SHADER_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_INVALID_SHADER_NV"/> + <enum value="1" name="VK_NV_GLSL_SHADER_SPEC_VERSION"/> + <enum value=""VK_NV_glsl_shader"" name="VK_NV_GLSL_SHADER_EXTENSION_NAME"/> + <enum offset="0" extends="VkResult" dir="-" name="VK_ERROR_INVALID_SHADER_NV"/> </require> </extension> - <extension name="VK_NV_extension_1" number="14" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="disabled"> + <extension name="VK_EXT_depth_range_unrestricted" type="device" number="14" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="0" name="VK_NV_EXTENSION_1_SPEC_VERSION"/> - <enum value=""VK_NV_extension_1"" name="VK_NV_EXTENSION_1_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_NV_EXTENSION_1_ERROR"/> + <enum value="1" name="VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION"/> + <enum value=""VK_EXT_depth_range_unrestricted"" name="VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_sampler_mirror_clamp_to_edge" type="device" number="15" author="KHR" contact="Tobias Hector @tobias" supported="vulkan"> + <extension name="VK_KHR_sampler_mirror_clamp_to_edge" type="device" number="15" author="KHR" contact="Tobias Hector @tobski" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION"/> - <enum value=""VK_KHR_sampler_mirror_clamp_to_edge"" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME"/> - <enum value="4" extends="VkSamplerAddressMode" name="VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE" comment="Note that this defines what was previously a core enum, and so uses the 'value' attribute rather than 'offset', and does not have a suffix. This is a special case, and should not be repeated"/> + <enum value="1" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION"/> + <enum value=""VK_KHR_sampler_mirror_clamp_to_edge"" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME"/> + <enum value="4" extends="VkSamplerAddressMode" name="VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE" comment="Note that this defines what was previously a core enum, and so uses the 'value' attribute rather than 'offset', and does not have a suffix. This is a special case, and should not be repeated"/> </require> </extension> - <extension name="VK_IMG_filter_cubic" number="16" type="device" author="IMG" contact="Tobias Hector @tobias" supported="vulkan"> + <extension name="VK_IMG_filter_cubic" number="16" type="device" author="IMG" contact="Tobias Hector @tobski" supported="vulkan"> <require> - <enum value="1" name="VK_IMG_FILTER_CUBIC_SPEC_VERSION"/> - <enum value=""VK_IMG_filter_cubic"" name="VK_IMG_FILTER_CUBIC_EXTENSION_NAME"/> - <enum offset="0" extends="VkFilter" name="VK_FILTER_CUBIC_IMG"/> - <enum bitpos="13" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG" comment="Format can be filtered with VK_FILTER_CUBIC_IMG when being sampled"/> + <enum value="1" name="VK_IMG_FILTER_CUBIC_SPEC_VERSION"/> + <enum value=""VK_IMG_filter_cubic"" name="VK_IMG_FILTER_CUBIC_EXTENSION_NAME"/> + <enum offset="0" extends="VkFilter" name="VK_FILTER_CUBIC_IMG"/> + <enum bitpos="13" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG" comment="Format can be filtered with VK_FILTER_CUBIC_IMG when being sampled"/> </require> </extension> - <extension name="VK_AMD_extension_17" number="17" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_17" number="17" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_17_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_17"" name="VK_AMD_EXTENSION_17_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_17_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_17"" name="VK_AMD_EXTENSION_17_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_18" number="18" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_18" number="18" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_18_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_18"" name="VK_AMD_EXTENSION_18_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_18_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_18"" name="VK_AMD_EXTENSION_18_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_rasterization_order" number="19" type="device" author="AMD" contact="Daniel Rakos @aqnuep" supported="vulkan"> + <extension name="VK_AMD_rasterization_order" number="19" type="device" author="AMD" contact="Daniel Rakos @drakos-amd" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION"/> - <enum value=""VK_AMD_rasterization_order"" name="VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"/> + <enum value="1" name="VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION"/> + <enum value=""VK_AMD_rasterization_order"" name="VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"/> <type name="VkRasterizationOrderAMD"/> <type name="VkPipelineRasterizationStateRasterizationOrderAMD"/> </require> </extension> - <extension name="VK_AMD_extension_20" number="20" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_20" number="20" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_20_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_20"" name="VK_AMD_EXTENSION_20_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_20_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_20"" name="VK_AMD_EXTENSION_20_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_shader_trinary_minmax" number="21" type="device" author="AMD" contact="quentin.lin(a)amd.com" supported="vulkan"> + <extension name="VK_AMD_shader_trinary_minmax" number="21" type="device" author="AMD" contact="Qun Lin, AMD @linqun" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION"/> - <enum value=""VK_AMD_shader_trinary_minmax"" name="VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_trinary_minmax"" name="VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_shader_explicit_vertex_parameter" number="22" type="device" author="AMD" contact="quentin.lin(a)amd.com" supported="vulkan"> + <extension name="VK_AMD_shader_explicit_vertex_parameter" number="22" type="device" author="AMD" contact="Qun Lin, AMD @linqun" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION"/> + <enum value="1" name="VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION"/> <enum value=""VK_AMD_shader_explicit_vertex_parameter"" name="VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_EXT_debug_marker" number="23" type="device" requires="VK_EXT_debug_report" author="Baldur Karlsson" contact="baldurk(a)baldurk.org" supported="vulkan"> + <extension name="VK_EXT_debug_marker" number="23" type="device" requires="VK_EXT_debug_report" author="Baldur Karlsson" contact="Baldur Karlsson @baldurk" supported="vulkan"> <require> - <enum value="4" name="VK_EXT_DEBUG_MARKER_SPEC_VERSION"/> - <enum value=""VK_EXT_debug_marker"" name="VK_EXT_DEBUG_MARKER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"/> + <enum value="4" name="VK_EXT_DEBUG_MARKER_SPEC_VERSION"/> + <enum value=""VK_EXT_debug_marker"" name="VK_EXT_DEBUG_MARKER_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"/> <type name="VkDebugReportObjectTypeEXT"/> <type name="VkDebugMarkerObjectNameInfoEXT"/> <type name="VkDebugMarkerObjectTagInfoEXT"/> @@ -5344,227 +6934,231 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkCmdDebugMarkerInsertEXT"/> </require> </extension> - <extension name="VK_AMD_extension_24" number="24" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_24" number="24" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_24_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_24"" name="VK_AMD_EXTENSION_24_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_24_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_24"" name="VK_AMD_EXTENSION_24_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_25" number="25" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_25" number="25" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_25_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_25"" name="VK_AMD_EXTENSION_25_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_25_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_25"" name="VK_AMD_EXTENSION_25_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_gcn_shader" number="26" type="device" author="AMD" contact="dominik.witczak(a)amd.com" supported="vulkan"> + <extension name="VK_AMD_gcn_shader" number="26" type="device" author="AMD" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_GCN_SHADER_SPEC_VERSION"/> - <enum value=""VK_AMD_gcn_shader"" name="VK_AMD_GCN_SHADER_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_GCN_SHADER_SPEC_VERSION"/> + <enum value=""VK_AMD_gcn_shader"" name="VK_AMD_GCN_SHADER_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_dedicated_allocation" number="27" type="device" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="vulkan"> + <extension name="VK_NV_dedicated_allocation" number="27" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="1" name="VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION"/> - <enum value=""VK_NV_dedicated_allocation"" name="VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV"/> + <enum value="1" name="VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION"/> + <enum value=""VK_NV_dedicated_allocation"" name="VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV"/> <type name="VkDedicatedAllocationImageCreateInfoNV"/> <type name="VkDedicatedAllocationBufferCreateInfoNV"/> <type name="VkDedicatedAllocationMemoryAllocateInfoNV"/> </require> </extension> - <extension name="VK_EXT_extension_28" number="28" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="disabled"> + <extension name="VK_EXT_extension_28" number="28" author="NV" contact="Piers Daniell @pdaniell-nv" supported="disabled"> <require> - <enum value="0" name="VK_EXT_EXTENSION_28_SPEC_VERSION"/> - <enum value=""VK_NV_extension_28"" name="VK_EXT_EXTENSION_28_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_28_SPEC_VERSION"/> + <enum value=""VK_NV_extension_28"" name="VK_EXT_EXTENSION_28_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_29" number="29" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> + <extension name="VK_NVX_extension_29" number="29" author="NVX" contact="Jeff Juliano @jjulianoatnv" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_29_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_29"" name="VK_NVX_EXTENSION_29_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_29_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_29"" name="VK_NVX_EXTENSION_29_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_30" number="30" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> + <extension name="VK_NVX_extension_30" number="30" author="NVX" contact="Jeff Juliano @jjulianoatnv" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_30_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_30"" name="VK_NVX_EXTENSION_30_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_30_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_30"" name="VK_NVX_EXTENSION_30_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_31" number="31" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> + <extension name="VK_NVX_extension_31" number="31" author="NVX" contact="Jeff Juliano @jjulianoatnv" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_31_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_31"" name="VK_NVX_EXTENSION_31_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_31_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_31"" name="VK_NVX_EXTENSION_31_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_32" number="32" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_32" number="32" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_32_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_32"" name="VK_AMD_EXTENSION_32_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_32_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_32"" name="VK_AMD_EXTENSION_32_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_33" number="33" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_33" number="33" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_33_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_33"" name="VK_AMD_EXTENSION_33_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_33_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_33"" name="VK_AMD_EXTENSION_33_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_draw_indirect_count" number="34" type="device" author="AMD" contact="Daniel Rakos @aqnuep" supported="vulkan"> + <extension name="VK_AMD_draw_indirect_count" number="34" type="device" author="AMD" contact="Daniel Rakos @drakos-amd" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION"/> - <enum value=""VK_AMD_draw_indirect_count"" name="VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION"/> + <enum value=""VK_AMD_draw_indirect_count"" name="VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME"/> <command name="vkCmdDrawIndirectCountAMD"/> <command name="vkCmdDrawIndexedIndirectCountAMD"/> </require> </extension> - <extension name="VK_AMD_extension_35" number="35" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_35" number="35" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_35_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_35"" name="VK_AMD_EXTENSION_35_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_35_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_35"" name="VK_AMD_EXTENSION_35_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_negative_viewport_height" number="36" type="device" author="AMD" contact="Matthaeus G. Chajdas @anteru" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_SPEC_VERSION"/> - <enum value=""VK_AMD_negative_viewport_height"" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_SPEC_VERSION"/> + <enum value=""VK_AMD_negative_viewport_height"" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_gpu_shader_half_float" number="37" type="device" author="AMD" contact="Dominik Witczak @dominikwitczak_amd" supported="vulkan"> + <extension name="VK_AMD_gpu_shader_half_float" number="37" type="device" author="AMD" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_GPU_SHADER_HALF_FLOAT_SPEC_VERSION"/> - <enum value=""VK_AMD_gpu_shader_half_float"" name="VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_GPU_SHADER_HALF_FLOAT_SPEC_VERSION"/> + <enum value=""VK_AMD_gpu_shader_half_float"" name="VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_shader_ballot" number="38" type="device" author="AMD" contact="Dominik Witczak @dominikwitczak_amd" supported="vulkan"> + <extension name="VK_AMD_shader_ballot" number="38" type="device" author="AMD" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan"> <require> - <enum value="1" name="VK_AMD_SHADER_BALLOT_SPEC_VERSION"/> - <enum value=""VK_AMD_shader_ballot"" name="VK_AMD_SHADER_BALLOT_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_SHADER_BALLOT_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_ballot"" name="VK_AMD_SHADER_BALLOT_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_39" number="39" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_39" number="39" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_39_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_39"" name="VK_AMD_EXTENSION_39_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_39_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_39"" name="VK_AMD_EXTENSION_39_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_40" number="40" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_40" number="40" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_40_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_40"" name="VK_AMD_EXTENSION_40_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_40_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_40"" name="VK_AMD_EXTENSION_40_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_41" number="41" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_41" number="41" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_41_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_41"" name="VK_AMD_EXTENSION_41_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_41_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_41"" name="VK_AMD_EXTENSION_41_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_texture_gather_bias_lod" number="42" author="AMD" contact="Rex Xu @amdrexu" supported="vulkan" type="device" requires="VK_KHR_get_physical_device_properties2"> <require> - <enum value="1" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_SPEC_VERSION"/> - <enum value=""VK_AMD_texture_gather_bias_lod"" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD"/> + <enum value="1" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_SPEC_VERSION"/> + <enum value=""VK_AMD_texture_gather_bias_lod"" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD"/> <type name="VkTextureLODGatherFormatPropertiesAMD"/> </require> </extension> - <extension name="VK_AMD_extension_43" number="43" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_shader_info" number="43" author="AMD" contact="Jaakko Konttinen @jaakkoamd" supported="vulkan" type="device"> <require> - <enum value="0" name="VK_AMD_EXTENSION_43_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_43"" name="VK_AMD_EXTENSION_43_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_SHADER_INFO_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_info"" name="VK_AMD_SHADER_INFO_EXTENSION_NAME"/> + <type name="VkShaderInfoTypeAMD"/> + <type name="VkShaderResourceUsageAMD"/> + <type name="VkShaderStatisticsInfoAMD"/> + <command name="vkGetShaderInfoAMD"/> </require> </extension> - <extension name="VK_AMD_extension_44" number="44" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_44" number="44" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_44_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_44"" name="VK_AMD_EXTENSION_44_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_44_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_44"" name="VK_AMD_EXTENSION_44_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_45" number="45" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_45" number="45" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_45_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_45"" name="VK_AMD_EXTENSION_45_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_45_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_45"" name="VK_AMD_EXTENSION_45_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_46" number="46" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_extension_46" number="46" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_46_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_46"" name="VK_AMD_EXTENSION_46_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_46_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_46"" name="VK_AMD_EXTENSION_46_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_47" number="47" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> + <extension name="VK_AMD_shader_image_load_store_lod" number="47" author="AMD" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan" type="device"> <require> - <enum value="0" name="VK_AMD_EXTENSION_47_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_47"" name="VK_AMD_EXTENSION_47_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_image_load_store_lod"" name="VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_48" number="48" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> + <extension name="VK_NVX_extension_48" number="48" author="NVX" contact="James Jones @cubanismo" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_48_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_48"" name="VK_NVX_EXTENSION_48_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_48_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_48"" name="VK_NVX_EXTENSION_48_EXTENSION_NAME"/> </require> </extension> <extension name="VK_GOOGLE_extension_49" number="49" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> <require> - <enum value="0" name="VK_GOOGLE_EXTENSION_49_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_extension_49"" name="VK_GOOGLE_EXTENSION_49_EXTENSION_NAME"/> + <enum value="0" name="VK_GOOGLE_EXTENSION_49_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_49"" name="VK_GOOGLE_EXTENSION_49_EXTENSION_NAME"/> </require> </extension> <extension name="VK_GOOGLE_extension_50" number="50" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> <require> - <enum value="0" name="VK_GOOGLE_EXTENSION_50_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_extension_50"" name="VK_GOOGLE_EXTENSION_50_EXTENSION_NAME"/> + <enum value="0" name="VK_GOOGLE_EXTENSION_50_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_50"" name="VK_GOOGLE_EXTENSION_50_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_51" number="51" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> + <extension name="VK_NVX_extension_51" number="51" author="NVX" contact="James Jones @cubanismo" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_51_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_51"" name="VK_NVX_EXTENSION_51_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_51_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_51"" name="VK_NVX_EXTENSION_51_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_extension_52" number="52" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> + <extension name="VK_NVX_extension_52" number="52" author="NVX" contact="James Jones @cubanismo" supported="disabled"> <require> - <enum value="0" name="VK_NVX_EXTENSION_52_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_52"" name="VK_NVX_EXTENSION_52_EXTENSION_NAME"/> + <enum value="0" name="VK_NVX_EXTENSION_52_SPEC_VERSION"/> + <enum value=""VK_NVX_extension_52"" name="VK_NVX_EXTENSION_52_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_53" number="53" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_53" number="53" author="NV" contact="Jeff Bolz @jeffbolznv" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_53_SPEC_VERSION"/> - <enum value=""VK_NV_extension_53"" name="VK_NV_EXTENSION_53_EXTENSION_NAME"/> + <enum value="0" name="VK_NV_EXTENSION_53_SPEC_VERSION"/> + <enum value=""VK_NV_extension_53"" name="VK_NV_EXTENSION_53_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHX_multiview" number="54" type="device" author="NVIDIA" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jbolz" supported="vulkan"> + <extension name="VK_KHR_multiview" number="54" type="device" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="1" name="VK_KHX_MULTIVIEW_SPEC_VERSION"/> - <enum value=""VK_KHX_multiview"" name="VK_KHX_MULTIVIEW_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"/> - <enum bitpos="1" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_VIEW_LOCAL_BIT_KHX"/> - <type name="VkRenderPassMultiviewCreateInfoKHX"/> - <type name="VkPhysicalDeviceMultiviewFeaturesKHX"/> - <type name="VkPhysicalDeviceMultiviewPropertiesKHX"/> + <enum value="1" name="VK_KHR_MULTIVIEW_SPEC_VERSION"/> + <enum value=""VK_KHR_multiview"" name="VK_KHR_MULTIVIEW_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES"/> + <enum extends="VkDependencyFlagBits" name="VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR" alias="VK_DEPENDENCY_VIEW_LOCAL_BIT"/> + <type name="VkRenderPassMultiviewCreateInfoKHR"/> + <type name="VkPhysicalDeviceMultiviewFeaturesKHR"/> + <type name="VkPhysicalDeviceMultiviewPropertiesKHR"/> </require> </extension> - <extension name="VK_IMG_format_pvrtc" number="55" type="device" author="IMG" contact="Tobias Hector @tobias" supported="vulkan"> + <extension name="VK_IMG_format_pvrtc" number="55" type="device" author="IMG" contact="Tobias Hector @tobski" supported="vulkan"> <require> - <enum value="1" name="VK_IMG_FORMAT_PVRTC_SPEC_VERSION"/> - <enum value=""VK_IMG_format_pvrtc"" name="VK_IMG_FORMAT_PVRTC_EXTENSION_NAME"/> - <enum offset="0" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG"/> - <enum offset="1" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG"/> - <enum offset="2" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG"/> - <enum offset="3" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG"/> - <enum offset="4" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG"/> - <enum offset="5" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG"/> - <enum offset="6" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG"/> - <enum offset="7" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG"/> + <enum value="1" name="VK_IMG_FORMAT_PVRTC_SPEC_VERSION"/> + <enum value=""VK_IMG_format_pvrtc"" name="VK_IMG_FORMAT_PVRTC_EXTENSION_NAME"/> + <enum offset="0" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG"/> + <enum offset="1" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG"/> + <enum offset="2" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG"/> + <enum offset="3" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG"/> + <enum offset="4" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG"/> + <enum offset="5" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG"/> + <enum offset="6" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG"/> + <enum offset="7" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG"/> </require> </extension> - <extension name="VK_NV_external_memory_capabilities" number="56" type="instance" author="NVIDIA" contact="James jones @cubanismo" supported="vulkan"> + <extension name="VK_NV_external_memory_capabilities" number="56" type="instance" author="NV" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory_capabilities"" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> + <enum value="1" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> + <enum value=""VK_NV_external_memory_capabilities"" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> <type name="VkExternalMemoryHandleTypeFlagsNV"/> <type name="VkExternalMemoryHandleTypeFlagBitsNV"/> <type name="VkExternalMemoryFeatureFlagsNV"/> @@ -5573,48 +7167,48 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPhysicalDeviceExternalImageFormatPropertiesNV"/> </require> </extension> - <extension name="VK_NV_external_memory" number="57" type="device" requires="VK_NV_external_memory_capabilities" author="NVIDIA" contact="James jones @cubanismo" supported="vulkan"> + <extension name="VK_NV_external_memory" number="57" type="device" requires="VK_NV_external_memory_capabilities" author="NV" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory"" name="VK_NV_EXTERNAL_MEMORY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV"/> + <enum value="1" name="VK_NV_EXTERNAL_MEMORY_SPEC_VERSION"/> + <enum value=""VK_NV_external_memory"" name="VK_NV_EXTERNAL_MEMORY_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV"/> <type name="VkExternalMemoryImageCreateInfoNV"/> <type name="VkExportMemoryAllocateInfoNV"/> </require> </extension> - <extension name="VK_NV_external_memory_win32" number="58" type="device" requires="VK_NV_external_memory_capabilities,VK_NV_external_memory" author="NVIDIA" contact="James jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> + <extension name="VK_NV_external_memory_win32" number="58" type="device" requires="VK_NV_external_memory" author="NV" contact="James Jones @cubanismo" platform="win32" supported="vulkan"> <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory_win32"" name="VK_NV_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> + <enum value="1" name="VK_NV_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> + <enum value=""VK_NV_external_memory_win32"" name="VK_NV_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> <type name="VkImportMemoryWin32HandleInfoNV"/> <type name="VkExportMemoryWin32HandleInfoNV"/> <command name="vkGetMemoryWin32HandleNV"/> </require> </extension> - <extension name="VK_NV_win32_keyed_mutex" number="59" type="device" requires="VK_NV_external_memory_capabilities,VK_NV_external_memory_win32" author="NVIDIA" contact="Carsten Rohde" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> + <extension name="VK_NV_win32_keyed_mutex" number="59" type="device" requires="VK_NV_external_memory_win32" author="NV" contact="Carsten Rohde @crohde" platform="win32" supported="vulkan"> <require> - <enum value="1" name="VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION"/> - <enum value=""VK_NV_win32_keyed_mutex"" name="VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"/> + <enum value="1" name="VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION"/> + <enum value=""VK_NV_win32_keyed_mutex"" name="VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"/> <type name="VkWin32KeyedMutexAcquireReleaseInfoNV"/> </require> </extension> - <extension name="VK_KHR_get_physical_device_properties2" number="60" type="instance" author="KHR" contact="Jeff Bolz @jbolz" supported="vulkan"> + <extension name="VK_KHR_get_physical_device_properties2" number="60" type="instance" author="KHR" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION"/> + <enum value="1" name="VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION"/> <enum value=""VK_KHR_get_physical_device_properties2"" name="VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR"/> - <enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR"/> - <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR" alias="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2"/> <type name="VkPhysicalDeviceFeatures2KHR"/> <type name="VkPhysicalDeviceProperties2KHR"/> <type name="VkFormatProperties2KHR"/> @@ -5633,71 +7227,80 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPhysicalDeviceSparseImageFormatProperties2KHR"/> </require> </extension> - <extension name="VK_KHX_device_group" number="61" type="device" author="KHX" requires="VK_KHR_swapchain" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_DEVICE_GROUP_SPEC_VERSION"/> - <enum value=""VK_KHX_device_group"" name="VK_KHX_DEVICE_GROUP_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHX"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHX"/> - <enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHX"/> - <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHX"/> - <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHX"/> - <enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHX"/> - <enum offset="10" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHX"/> - <enum offset="11" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHX"/> - <enum offset="12" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHX"/> - <type name="VkPeerMemoryFeatureFlagsKHX"/> - <type name="VkPeerMemoryFeatureFlagBitsKHX"/> - <type name="VkMemoryAllocateFlagsKHX"/> - <type name="VkMemoryAllocateFlagBitsKHX"/> - <type name="VkDeviceGroupPresentModeFlagBitsKHX"/> - <type name="VkDeviceGroupPresentModeFlagsKHX"/> - <type name="VkMemoryAllocateFlagsInfoKHX"/> - <type name="VkBindBufferMemoryInfoKHX"/> - <type name="VkBindImageMemoryInfoKHX"/> - <type name="VkDeviceGroupRenderPassBeginInfoKHX"/> - <type name="VkDeviceGroupCommandBufferBeginInfoKHX"/> - <type name="VkDeviceGroupSubmitInfoKHX"/> - <type name="VkDeviceGroupBindSparseInfoKHX"/> - <type name="VkDeviceGroupPresentCapabilitiesKHX"/> - <type name="VkImageSwapchainCreateInfoKHX"/> - <type name="VkBindImageMemorySwapchainInfoKHX"/> - <type name="VkAcquireNextImageInfoKHX"/> - <type name="VkDeviceGroupPresentInfoKHX"/> - <type name="VkDeviceGroupSwapchainCreateInfoKHX"/> - <command name="vkGetDeviceGroupPeerMemoryFeaturesKHX"/> - <command name="vkBindBufferMemory2KHX"/> - <command name="vkBindImageMemory2KHX"/> - <command name="vkCmdSetDeviceMaskKHX"/> - <command name="vkGetDeviceGroupPresentCapabilitiesKHX"/> - <command name="vkGetDeviceGroupSurfacePresentModesKHX"/> - <command name="vkAcquireNextImage2KHX"/> - <command name="vkCmdDispatchBaseKHX"/> - <command name="vkGetPhysicalDevicePresentRectanglesKHX"/> - <enum bitpos="6" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_BIND_SFR_BIT_KHX" comment="Allows using VkBindImageMemoryInfoKHX::pSFRRects when binding memory to the image"/> - <enum bitpos="3" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHX"/> - <enum bitpos="4" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_DISPATCH_BASE_KHX"/> - <enum bitpos="2" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_DEVICE_GROUP_BIT_KHX" comment="Dependency is across devices"/> - <enum bitpos="0" extends="VkSwapchainCreateFlagBitsKHR" name="VK_SWAPCHAIN_CREATE_BIND_SFR_BIT_KHX" comment="Allow images with VK_IMAGE_CREATE_BIND_SFR_BIT_KHX"/> + <extension name="VK_KHR_device_group" number="61" type="device" author="KHR" requires="VK_KHR_device_group_creation" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="3" name="VK_KHR_DEVICE_GROUP_SPEC_VERSION"/> + <enum value=""VK_KHR_device_group"" name="VK_KHR_DEVICE_GROUP_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR" alias="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHR" alias="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHR" alias="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHR" alias="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHR" alias="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO"/> + <type name="VkPeerMemoryFeatureFlagsKHR"/> + <type name="VkPeerMemoryFeatureFlagBitsKHR"/> + <enum extends="VkPeerMemoryFeatureFlagBits" name="VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT_KHR" alias="VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT"/> + <enum extends="VkPeerMemoryFeatureFlagBits" name="VK_PEER_MEMORY_FEATURE_COPY_DST_BIT_KHR" alias="VK_PEER_MEMORY_FEATURE_COPY_DST_BIT"/> + <enum extends="VkPeerMemoryFeatureFlagBits" name="VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT_KHR" alias="VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT"/> + <enum extends="VkPeerMemoryFeatureFlagBits" name="VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHR" alias="VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT"/> + <type name="VkMemoryAllocateFlagsKHR"/> + <type name="VkMemoryAllocateFlagBitsKHR"/> + <enum extends="VkMemoryAllocateFlagBits" name="VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHR" alias="VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT"/> + <type name="VkMemoryAllocateFlagsInfoKHR"/> + <type name="VkDeviceGroupRenderPassBeginInfoKHR"/> + <type name="VkDeviceGroupCommandBufferBeginInfoKHR"/> + <type name="VkDeviceGroupSubmitInfoKHR"/> + <type name="VkDeviceGroupBindSparseInfoKHR"/> + <command name="vkGetDeviceGroupPeerMemoryFeaturesKHR"/> + <command name="vkCmdSetDeviceMaskKHR"/> + <command name="vkCmdDispatchBaseKHR"/> + <enum extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR" alias="VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT"/> + <enum extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_DISPATCH_BASE_KHR" alias="VK_PIPELINE_CREATE_DISPATCH_BASE"/> + <enum extends="VkDependencyFlagBits" name="VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR" alias="VK_DEPENDENCY_DEVICE_GROUP_BIT"/> + </require> + <require extension="VK_KHR_bind_memory2"> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR" alias="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR" alias="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO"/> + <type name="VkBindBufferMemoryDeviceGroupInfoKHR"/> + <type name="VkBindImageMemoryDeviceGroupInfoKHR"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR" alias="VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT"/> + </require> + <require extension="VK_KHR_surface"> + <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR"/> + <type name="VkDeviceGroupPresentModeFlagBitsKHR"/> + <type name="VkDeviceGroupPresentModeFlagsKHR"/> + <type name="VkDeviceGroupPresentCapabilitiesKHR"/> + <command name="vkGetDeviceGroupPresentCapabilitiesKHR"/> + <command name="vkGetDeviceGroupSurfacePresentModesKHR"/> + <command name="vkGetPhysicalDevicePresentRectanglesKHR"/> + </require> + <require extension="VK_KHR_swapchain"> + <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR"/> + <enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR"/> + <enum offset="10" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR"/> + <enum offset="11" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR"/> + <enum offset="12" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR"/> + <enum bitpos="0" extends="VkSwapchainCreateFlagBitsKHR" name="VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR" comment="Allow images with VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT"/> + <type name="VkImageSwapchainCreateInfoKHR"/> + <type name="VkBindImageMemorySwapchainInfoKHR"/> + <type name="VkAcquireNextImageInfoKHR"/> + <type name="VkDeviceGroupPresentInfoKHR"/> + <type name="VkDeviceGroupSwapchainCreateInfoKHR"/> + <command name="vkAcquireNextImage2KHR"/> </require> </extension> <extension name="VK_EXT_validation_flags" number="62" type="instance" author="GOOGLE" contact="Tobin Ehlis @tobine" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_VALIDATION_FLAGS_SPEC_VERSION"/> - <enum value=""VK_EXT_validation_flags"" name="VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"/> + <enum value="1" name="VK_EXT_VALIDATION_FLAGS_SPEC_VERSION"/> + <enum value=""VK_EXT_validation_flags"" name="VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"/> <type name="VkValidationFlagsEXT"/> </require> </extension> - <extension name="VK_NN_vi_surface" number="63" type="instance" author="NN" contact="Mathias Heyer @mheyer" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_VI_NN" supported="vulkan"> + <extension name="VK_NN_vi_surface" number="63" type="instance" author="NN" contact="Mathias Heyer gitlab:@mheyer" requires="VK_KHR_surface" platform="vi" supported="vulkan"> <require> - <enum value="1" name="VK_NN_VI_SURFACE_SPEC_VERSION"/> - <enum value=""VK_NN_vi_surface"" name="VK_NN_VI_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN"/> + <enum value="1" name="VK_NN_VI_SURFACE_SPEC_VERSION"/> + <enum value=""VK_NN_vi_surface"" name="VK_NN_VI_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN"/> <type name="VkViSurfaceCreateFlagsNN"/> <type name="VkViSurfaceCreateInfoNN"/> <command name="vkCreateViSurfaceNN"/> @@ -5705,217 +7308,252 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </extension> <extension name="VK_KHR_shader_draw_parameters" number="64" type="device" author="KHR" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION"/> - <enum value=""VK_KHR_shader_draw_parameters"" name="VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION"/> + <enum value=""VK_KHR_shader_draw_parameters"" name="VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_EXT_shader_subgroup_ballot" number="65" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> + <extension name="VK_EXT_shader_subgroup_ballot" number="65" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_SHADER_SUBGROUP_BALLOT_SPEC_VERSION"/> - <enum value=""VK_EXT_shader_subgroup_ballot"" name="VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_SHADER_SUBGROUP_BALLOT_SPEC_VERSION"/> + <enum value=""VK_EXT_shader_subgroup_ballot"" name="VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_EXT_shader_subgroup_vote" number="66" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> + <extension name="VK_EXT_shader_subgroup_vote" number="66" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION"/> - <enum value=""VK_EXT_shader_subgroup_vote"" name="VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION"/> + <enum value=""VK_EXT_shader_subgroup_vote"" name="VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_ARM_extension_01" number="67" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> + <extension name="VK_ARM_extension_01" number="67" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled"> <require> - <enum value="0" name="VK_ARM_EXTENSION_01_SPEC_VERSION"/> - <enum value=""VK_ARM_extension_01"" name="VK_ARM_EXTENSION_01_EXTENSION_NAME"/> + <enum value="0" name="VK_ARM_EXTENSION_01_SPEC_VERSION"/> + <enum value=""VK_ARM_extension_01"" name="VK_ARM_EXTENSION_01_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_ARM_extension_02" number="68" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> + <extension name="VK_ARM_extension_02" number="68" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled"> <require> - <enum value="0" name="VK_ARM_EXTENSION_02_SPEC_VERSION"/> - <enum value=""VK_ARM_extension_02"" name="VK_ARM_EXTENSION_02_EXTENSION_NAME"/> + <enum value="0" name="VK_ARM_EXTENSION_02_SPEC_VERSION"/> + <enum value=""VK_ARM_extension_02"" name="VK_ARM_EXTENSION_02_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_IMG_extension_69" number="69" type="device" author="IMG" contact="Tobias Hector @tobias" supported="disabled"> + <extension name="VK_IMG_extension_69" number="69" type="device" author="IMG" contact="Tobias Hector @tobski" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_69_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_69"" name="VK_IMG_EXTENSION_69_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_69_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_69"" name="VK_IMG_EXTENSION_69_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_maintenance1" number="70" type="device" author="KHR" contact="Piers Daniell @pdaniell" supported="vulkan"> + <extension name="VK_KHR_maintenance1" number="70" type="device" author="KHR" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_MAINTENANCE1_SPEC_VERSION"/> - <enum value=""VK_KHR_maintenance1"" name="VK_KHR_MAINTENANCE1_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_OUT_OF_POOL_MEMORY_KHR"/> - <enum bitpos="14" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR" comment="Format can be used as the source image of image transfer commands"/> - <enum bitpos="15" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR" comment="Format can be used as the destination image of image transfer commands"/> - <enum bitpos="5" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR" comment="The 3D image can be viewed as a 2D or 2D array image"/> + <enum value="2" name="VK_KHR_MAINTENANCE1_SPEC_VERSION"/> + <enum value=""VK_KHR_maintenance1"" name="VK_KHR_MAINTENANCE1_EXTENSION_NAME"/> + <enum extends="VkResult" name="VK_ERROR_OUT_OF_POOL_MEMORY_KHR" alias="VK_ERROR_OUT_OF_POOL_MEMORY"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR" alias="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR" alias="VK_FORMAT_FEATURE_TRANSFER_DST_BIT"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR" alias="VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT"/> + <type name="VkCommandPoolTrimFlagsKHR"/> <command name="vkTrimCommandPoolKHR"/> </require> </extension> - <extension name="VK_KHX_device_group_creation" number="71" type="instance" author="KHX" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_DEVICE_GROUP_CREATION_SPEC_VERSION"/> - <enum value=""VK_KHX_device_group_creation"" name="VK_KHX_DEVICE_GROUP_CREATION_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHX"/> - <enum name="VK_MAX_DEVICE_GROUP_SIZE_KHX"/> - <type name="VkPhysicalDeviceGroupPropertiesKHX"/> - <type name="VkDeviceGroupDeviceCreateInfoKHX"/> - <command name="vkEnumeratePhysicalDeviceGroupsKHX"/> - <enum bitpos="1" extends="VkMemoryHeapFlagBits" name="VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHX" comment="If set, heap allocations allocate multiple instances by default"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_capabilities" number="72" type="instance" author="KHX" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_capabilities"" name="VK_KHX_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX"/> - <enum name="VK_LUID_SIZE_KHX"/> - <type name="VkExternalMemoryHandleTypeFlagsKHX"/> - <type name="VkExternalMemoryHandleTypeFlagBitsKHX"/> - <type name="VkExternalMemoryFeatureFlagsKHX"/> - <type name="VkExternalMemoryFeatureFlagBitsKHX"/> - <type name="VkExternalMemoryPropertiesKHX"/> - <type name="VkPhysicalDeviceExternalImageFormatInfoKHX"/> - <type name="VkExternalImageFormatPropertiesKHX"/> - <type name="VkPhysicalDeviceExternalBufferInfoKHX"/> - <type name="VkExternalBufferPropertiesKHX"/> - <type name="VkPhysicalDeviceIDPropertiesKHX"/> - <command name="vkGetPhysicalDeviceExternalBufferPropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory" number="73" type="device" requires="VK_KHX_external_memory_capabilities" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory"" name="VK_KHX_EXTERNAL_MEMORY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX"/> - <enum offset="3" dir="-" extends="VkResult" name="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"/> - <enum name="VK_QUEUE_FAMILY_EXTERNAL_KHX"/> - <type name="VkExternalMemoryImageCreateInfoKHX"/> - <type name="VkExternalMemoryBufferCreateInfoKHX"/> - <type name="VkExportMemoryAllocateInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_win32" number="74" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory" author="KHX" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHX" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_win32"" name="VK_KHX_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHX"/> - <type name="VkImportMemoryWin32HandleInfoKHX"/> - <type name="VkExportMemoryWin32HandleInfoKHX"/> - <type name="VkMemoryWin32HandlePropertiesKHX"/> - <command name="vkGetMemoryWin32HandleKHX"/> - <command name="vkGetMemoryWin32HandlePropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_fd" number="75" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_FD_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_fd"" name="VK_KHX_EXTERNAL_MEMORY_FD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHX"/> - <type name="VkImportMemoryFdInfoKHX"/> - <type name="VkMemoryFdPropertiesKHX"/> - <command name="vkGetMemoryFdKHX"/> - <command name="vkGetMemoryFdPropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_win32_keyed_mutex" number="76" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory,VK_KHX_external_memory_win32" author="KHX" contact="Carsten Rohde" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_WIN32_KEYED_MUTEX_SPEC_VERSION"/> - <enum value=""VK_KHX_win32_keyed_mutex"" name="VK_KHX_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHX"/> - <type name="VkWin32KeyedMutexAcquireReleaseInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_capabilities" number="77" type="instance" author="KHX" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_capabilities"" name="VK_KHX_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHX"/> - <enum name="VK_LUID_SIZE_KHX"/> - <type name="VkExternalSemaphoreHandleTypeFlagsKHX"/> - <type name="VkExternalSemaphoreHandleTypeFlagBitsKHX"/> - <type name="VkExternalSemaphoreFeatureFlagsKHX"/> - <type name="VkExternalSemaphoreFeatureFlagBitsKHX"/> - <type name="VkPhysicalDeviceExternalSemaphoreInfoKHX"/> - <type name="VkExternalSemaphorePropertiesKHX"/> - <type name="VkPhysicalDeviceIDPropertiesKHX"/> - <command name="vkGetPhysicalDeviceExternalSemaphorePropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore" number="78" type="device" requires="VK_KHX_external_semaphore_capabilities" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore"" name="VK_KHX_EXTERNAL_SEMAPHORE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHX"/> - <type name="VkExportSemaphoreCreateInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_win32" number="79" type="device" requires="VK_KHX_external_semaphore_capabilities,VK_KHX_external_semaphore" author="KHX" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHX" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_WIN32_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_win32"" name="VK_KHX_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHX"/> - <type name="VkImportSemaphoreWin32HandleInfoKHX"/> - <type name="VkExportSemaphoreWin32HandleInfoKHX"/> - <type name="VkD3D12FenceSubmitInfoKHX"/> - <command name="vkImportSemaphoreWin32HandleKHX"/> - <command name="vkGetSemaphoreWin32HandleKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_fd" number="80" type="device" requires="VK_KHX_external_semaphore_capabilities,VK_KHX_external_semaphore" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_FD_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_fd"" name="VK_KHX_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHX"/> - <type name="VkImportSemaphoreFdInfoKHX"/> - <command name="vkImportSemaphoreFdKHX"/> - <command name="vkGetSemaphoreFdKHX"/> - </require> - </extension> - <extension name="VK_KHR_push_descriptor" number="81" type="device" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION"/> - <enum value=""VK_KHR_push_descriptor"" name="VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR"/> + <extension name="VK_KHR_device_group_creation" number="71" type="instance" author="KHR" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_DEVICE_GROUP_CREATION_SPEC_VERSION"/> + <enum value=""VK_KHR_device_group_creation"" name="VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO"/> + <enum name="VK_MAX_DEVICE_GROUP_SIZE_KHR"/> + <type name="VkPhysicalDeviceGroupPropertiesKHR"/> + <type name="VkDeviceGroupDeviceCreateInfoKHR"/> + <command name="vkEnumeratePhysicalDeviceGroupsKHR"/> + <enum extends="VkMemoryHeapFlagBits" name="VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHR" alias="VK_MEMORY_HEAP_MULTI_INSTANCE_BIT"/> + </require> + </extension> + <extension name="VK_KHR_external_memory_capabilities" number="72" type="instance" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> + <enum value=""VK_KHR_external_memory_capabilities"" name="VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES"/> + <enum name="VK_LUID_SIZE_KHR"/> + <type name="VkExternalMemoryHandleTypeFlagsKHR"/> + <type name="VkExternalMemoryHandleTypeFlagBitsKHR"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT"/> + <enum extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR" alias="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT"/> + <type name="VkExternalMemoryFeatureFlagsKHR"/> + <type name="VkExternalMemoryFeatureFlagBitsKHR"/> + <enum extends="VkExternalMemoryFeatureFlagBits" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR" alias="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT"/> + <enum extends="VkExternalMemoryFeatureFlagBits" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR" alias="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT"/> + <enum extends="VkExternalMemoryFeatureFlagBits" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR" alias="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT"/> + <type name="VkExternalMemoryPropertiesKHR"/> + <type name="VkPhysicalDeviceExternalImageFormatInfoKHR"/> + <type name="VkExternalImageFormatPropertiesKHR"/> + <type name="VkPhysicalDeviceExternalBufferInfoKHR"/> + <type name="VkExternalBufferPropertiesKHR"/> + <type name="VkPhysicalDeviceIDPropertiesKHR"/> + <command name="vkGetPhysicalDeviceExternalBufferPropertiesKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_memory" number="73" type="device" requires="VK_KHR_external_memory_capabilities" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_MEMORY_SPEC_VERSION"/> + <enum value=""VK_KHR_external_memory"" name="VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO"/> + <enum extends="VkResult" name="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR" alias="VK_ERROR_INVALID_EXTERNAL_HANDLE"/> + <enum name="VK_QUEUE_FAMILY_EXTERNAL_KHR"/> + <type name="VkExternalMemoryImageCreateInfoKHR"/> + <type name="VkExternalMemoryBufferCreateInfoKHR"/> + <type name="VkExportMemoryAllocateInfoKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_memory_win32" number="74" type="device" requires="VK_KHR_external_memory" author="KHR" contact="James Jones @cubanismo" platform="win32" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> + <enum value=""VK_KHR_external_memory_win32"" name="VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHR"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR"/> + <type name="VkImportMemoryWin32HandleInfoKHR"/> + <type name="VkExportMemoryWin32HandleInfoKHR"/> + <type name="VkMemoryWin32HandlePropertiesKHR"/> + <type name="VkMemoryGetWin32HandleInfoKHR"/> + <command name="vkGetMemoryWin32HandleKHR"/> + <command name="vkGetMemoryWin32HandlePropertiesKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_memory_fd" number="75" type="device" requires="VK_KHR_external_memory" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_MEMORY_FD_SPEC_VERSION"/> + <enum value=""VK_KHR_external_memory_fd"" name="VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR"/> + <type name="VkImportMemoryFdInfoKHR"/> + <type name="VkMemoryFdPropertiesKHR"/> + <type name="VkMemoryGetFdInfoKHR"/> + <command name="vkGetMemoryFdKHR"/> + <command name="vkGetMemoryFdPropertiesKHR"/> + </require> + </extension> + <extension name="VK_KHR_win32_keyed_mutex" number="76" type="device" requires="VK_KHR_external_memory_win32" author="KHR" contact="Carsten Rohde @crohde" platform="win32" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_WIN32_KEYED_MUTEX_SPEC_VERSION"/> + <enum value=""VK_KHR_win32_keyed_mutex"" name="VK_KHR_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR"/> + <type name="VkWin32KeyedMutexAcquireReleaseInfoKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_semaphore_capabilities" number="77" type="instance" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION"/> + <enum value=""VK_KHR_external_semaphore_capabilities"" name="VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES"/> + <enum name="VK_LUID_SIZE_KHR"/> + <type name="VkExternalSemaphoreHandleTypeFlagsKHR"/> + <type name="VkExternalSemaphoreHandleTypeFlagBitsKHR"/> + <enum extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT"/> + <enum extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT"/> + <type name="VkExternalSemaphoreFeatureFlagsKHR"/> + <type name="VkExternalSemaphoreFeatureFlagBitsKHR"/> + <enum extends="VkExternalSemaphoreFeatureFlagBits" name="VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT"/> + <enum extends="VkExternalSemaphoreFeatureFlagBits" name="VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR" alias="VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT"/> + <type name="VkPhysicalDeviceExternalSemaphoreInfoKHR"/> + <type name="VkExternalSemaphorePropertiesKHR"/> + <type name="VkPhysicalDeviceIDPropertiesKHR"/> + <command name="vkGetPhysicalDeviceExternalSemaphorePropertiesKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_semaphore" number="78" type="device" requires="VK_KHR_external_semaphore_capabilities" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_SEMAPHORE_SPEC_VERSION"/> + <enum value=""VK_KHR_external_semaphore"" name="VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO"/> + <type name="VkSemaphoreImportFlagsKHR"/> + <type name="VkSemaphoreImportFlagBitsKHR"/> + <enum extends="VkSemaphoreImportFlagBits" name="VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR" alias="VK_SEMAPHORE_IMPORT_TEMPORARY_BIT"/> + <type name="VkExportSemaphoreCreateInfoKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_semaphore_win32" number="79" type="device" requires="VK_KHR_external_semaphore" author="KHR" contact="James Jones @cubanismo" platform="win32" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_SEMAPHORE_WIN32_SPEC_VERSION"/> + <enum value=""VK_KHR_external_semaphore_win32"" name="VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHR"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR"/> + <type name="VkImportSemaphoreWin32HandleInfoKHR"/> + <type name="VkExportSemaphoreWin32HandleInfoKHR"/> + <type name="VkD3D12FenceSubmitInfoKHR"/> + <type name="VkSemaphoreGetWin32HandleInfoKHR"/> + <command name="vkImportSemaphoreWin32HandleKHR"/> + <command name="vkGetSemaphoreWin32HandleKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_semaphore_fd" number="80" type="device" requires="VK_KHR_external_semaphore" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_SEMAPHORE_FD_SPEC_VERSION"/> + <enum value=""VK_KHR_external_semaphore_fd"" name="VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR"/> + <type name="VkImportSemaphoreFdInfoKHR"/> + <type name="VkSemaphoreGetFdInfoKHR"/> + <command name="vkImportSemaphoreFdKHR"/> + <command name="vkGetSemaphoreFdKHR"/> + </require> + </extension> + <extension name="VK_KHR_push_descriptor" number="81" type="device" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="2" name="VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION"/> + <enum value=""VK_KHR_push_descriptor"" name="VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR"/> <enum bitpos="0" extends="VkDescriptorSetLayoutCreateFlagBits" name="VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR" comment="Descriptors are pushed via flink:vkCmdPushDescriptorSetKHR"/> <command name="vkCmdPushDescriptorSetKHR"/> <type name="VkPhysicalDevicePushDescriptorPropertiesKHR"/> </require> + <require feature="VK_VERSION_1_1"> + <command name="vkCmdPushDescriptorSetWithTemplateKHR"/> + <enum value="1" extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/> + </require> </extension> - <extension name="VK_KHR_extension_82" number="82" author="KHR" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_EXT_extension_82" number="82" type="device" author="EXT" contact="Piers Daniell @pdaniell-nv" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_82_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_82"" name="VK_KHR_EXTENSION_82_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_82_SPEC_VERSION"/> + <enum value=""VK_EXT_extension_82"" name="VK_EXT_EXTENSION_82_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_83" number="83" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> + <extension name="VK_KHR_extension_83" number="83" author="KHR" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_83_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_83"" name="VK_KHR_EXTENSION_83_EXTENSION_NAME"/> + <enum value="0" name="VK_KHR_EXTENSION_83_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_83"" name="VK_KHR_EXTENSION_83_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_84" number="84" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> + <extension name="VK_KHR_16bit_storage" number="84" type="device" requires="VK_KHR_get_physical_device_properties2,VK_KHR_storage_buffer_storage_class" author="KHR" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_84_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_84"" name="VK_KHR_EXTENSION_84_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_16BIT_STORAGE_SPEC_VERSION"/> + <enum value=""VK_KHR_16bit_storage"" name="VK_KHR_16BIT_STORAGE_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES"/> + <type name="VkPhysicalDevice16BitStorageFeaturesKHR"/> </require> </extension> - <extension name="VK_KHR_incremental_present" number="85" type="device" author="KHR" requires="VK_KHR_swapchain" contact="Ian Elliott ianelliott(a)google.com" supported="vulkan"> + <extension name="VK_KHR_incremental_present" number="85" type="device" author="KHR" requires="VK_KHR_swapchain" contact="Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION"/> - <enum value=""VK_KHR_incremental_present"" name="VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR"/> + <enum value="1" name="VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION"/> + <enum value=""VK_KHR_incremental_present"" name="VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR"/> <type name="VkPresentRegionsKHR"/> <type name="VkPresentRegionKHR"/> <type name="VkRectLayerKHR"/> @@ -5923,37 +7561,43 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </extension> <extension name="VK_KHR_descriptor_update_template" number="86" type="device" author="KHR" contact="Markus Tavenrath @mtavenrath" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION"/> + <enum value="1" name="VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION"/> <enum value=""VK_KHR_descriptor_update_template"" name="VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR"/> - <enum offset="0" extends="VkDebugReportObjectTypeEXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR" comment="VkDescriptorUpdateTemplateKHR"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO"/> + <enum extends="VkObjectType" name="VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR" alias="VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE"/> <command name="vkCreateDescriptorUpdateTemplateKHR"/> <command name="vkDestroyDescriptorUpdateTemplateKHR"/> <command name="vkUpdateDescriptorSetWithTemplateKHR"/> - <command name="vkCmdPushDescriptorSetWithTemplateKHR"/> <type name="VkDescriptorUpdateTemplateKHR"/> <type name="VkDescriptorUpdateTemplateCreateFlagsKHR"/> <type name="VkDescriptorUpdateTemplateTypeKHR"/> <type name="VkDescriptorUpdateTemplateEntryKHR"/> <type name="VkDescriptorUpdateTemplateCreateInfoKHR"/> + <enum extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR" alias="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET"/> </require> - </extension> - <extension name="VK_NVX_device_generated_commands" number="87" type="device" author="NVIDIA" contact="Christoph Kubisch @pixeljetstream" supported="vulkan"> - <require> - <enum value="1" name="VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION"/> - <enum value=""VK_NVX_device_generated_commands"" name="VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX"/> - <enum bitpos="17" extends="VkPipelineStageFlagBits" name="VK_PIPELINE_STAGE_COMMAND_PROCESS_BIT_NVX"/> - <enum bitpos="17" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_READ_BIT_NVX"/> - <enum bitpos="18" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_WRITE_BIT_NVX"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_OBJECT_TABLE_NVX" comment="VkobjectTableNVX"/> - <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX" comment="VkIndirectCommandsLayoutNVX"/> + <require extension="VK_KHR_push_descriptor"> + <command name="vkCmdPushDescriptorSetWithTemplateKHR"/> + <enum value="1" extends="VkDescriptorUpdateTemplateType" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/> + </require> + <require extension="VK_EXT_debug_report"> + <enum extends="VkDebugReportObjectTypeEXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT" alias="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT"/> + </require> + </extension> + <extension name="VK_NVX_device_generated_commands" number="87" type="device" author="NVX" contact="Christoph Kubisch @pixeljetstream" supported="vulkan"> + <require> + <enum value="3" name="VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION"/> + <enum value=""VK_NVX_device_generated_commands"" name="VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX"/> + <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX"/> + <enum bitpos="17" extends="VkPipelineStageFlagBits" name="VK_PIPELINE_STAGE_COMMAND_PROCESS_BIT_NVX"/> + <enum bitpos="17" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_READ_BIT_NVX"/> + <enum bitpos="18" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_WRITE_BIT_NVX"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_OBJECT_TABLE_NVX" comment="VkobjectTableNVX"/> + <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX" comment="VkIndirectCommandsLayoutNVX"/> <type name="VkObjectTableNVX"/> <type name="VkIndirectCommandsLayoutNVX"/> <type name="VkIndirectCommandsLayoutUsageFlagsNVX"/> @@ -5987,51 +7631,52 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX"/> </require> </extension> - <extension name="VK_NV_clip_space_w_scaling" number="88" type="device" author="NV" contact="Eric Werness @ewerness" supported="vulkan"> + <extension name="VK_NV_clip_space_w_scaling" number="88" type="device" author="NV" contact="Eric Werness @ewerness-nv" supported="vulkan"> <require> - <enum value="1" name="VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION"/> - <enum value=""VK_NV_clip_space_w_scaling"" name="VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV"/> - <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV"/> + <enum value="1" name="VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION"/> + <enum value=""VK_NV_clip_space_w_scaling"" name="VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV"/> + <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV"/> <type name="VkViewportWScalingNV"/> <type name="VkPipelineViewportWScalingStateCreateInfoNV"/> <command name="vkCmdSetViewportWScalingNV"/> </require> </extension> - <extension name="VK_EXT_direct_mode_display" number="89" type="instance" requires="VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> + <extension name="VK_EXT_direct_mode_display" number="89" type="instance" requires="VK_KHR_display" author="NV" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_DIRECT_MODE_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_EXT_direct_mode_display"" name="VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_DIRECT_MODE_DISPLAY_SPEC_VERSION"/> + <enum value=""VK_EXT_direct_mode_display"" name="VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME"/> <command name="vkReleaseDisplayEXT"/> </require> </extension> - <extension name="VK_EXT_acquire_xlib_display" number="90" type="instance" requires="VK_EXT_direct_mode_display,VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_XLIB_XRANDR_EXT" supported="vulkan"> + <extension name="VK_EXT_acquire_xlib_display" number="90" type="instance" requires="VK_EXT_direct_mode_display" author="NV" contact="James Jones @cubanismo" platform="xlib_xrandr" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_EXT_acquire_xlib_display"" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION"/> + <enum value=""VK_EXT_acquire_xlib_display"" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME"/> <command name="vkAcquireXlibDisplayEXT"/> <command name="vkGetRandROutputDisplayEXT"/> </require> </extension> - <extension name="VK_EXT_display_surface_counter" number="91" type="instance" requires="VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> + <extension name="VK_EXT_display_surface_counter" number="91" type="instance" requires="VK_KHR_display" author="NV" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_DISPLAY_SURFACE_COUNTER_SPEC_VERSION"/> - <enum value=""VK_EXT_display_surface_counter"" name="VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT"/> + <enum value="1" name="VK_EXT_DISPLAY_SURFACE_COUNTER_SPEC_VERSION"/> + <enum value=""VK_EXT_display_surface_counter"" name="VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT"/> + <enum value="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT"/> <type name="VkSurfaceCounterFlagsEXT"/> <type name="VkSurfaceCounterFlagBitsEXT"/> <type name="VkSurfaceCapabilities2EXT"/> <command name="vkGetPhysicalDeviceSurfaceCapabilities2EXT"/> </require> </extension> - <extension name="VK_EXT_display_control" number="92" type="device" requires="VK_KHR_display,VK_EXT_display_surface_counter,VK_KHR_swapchain" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> + <extension name="VK_EXT_display_control" number="92" type="device" requires="VK_EXT_display_surface_counter,VK_KHR_swapchain" author="NV" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_DISPLAY_CONTROL_SPEC_VERSION"/> - <enum value=""VK_EXT_display_control"" name="VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT"/> + <enum value="1" name="VK_EXT_DISPLAY_CONTROL_SPEC_VERSION"/> + <enum value=""VK_EXT_display_control"" name="VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT"/> <type name="VkDisplayPowerStateEXT"/> <type name="VkDeviceEventTypeEXT"/> <type name="VkDisplayEventTypeEXT"/> @@ -6045,11 +7690,11 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetSwapchainCounterEXT"/> </require> </extension> - <extension name="VK_GOOGLE_display_timing" number="93" type="device" author="GOOGLE" requires="VK_KHR_swapchain" contact="Ian Elliott ianelliott(a)google.com" supported="vulkan"> + <extension name="VK_GOOGLE_display_timing" number="93" type="device" author="GOOGLE" requires="VK_KHR_swapchain" contact="Ian Elliott @ianelliottus" supported="vulkan"> <require> - <enum value="1" name="VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_display_timing"" name="VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE"/> + <enum value="1" name="VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_display_timing"" name="VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE"/> <type name="VkRefreshCycleDurationGOOGLE"/> <type name="VkPastPresentationTimingGOOGLE"/> <type name="VkPresentTimesInfoGOOGLE"/> @@ -6058,58 +7703,59 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPastPresentationTimingGOOGLE"/> </require> </extension> - <extension name="VK_KHR_extension_94" number="94" author="Codeplay" contact="Neil Henning @neil_henning" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_94_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_94"" name="VK_KHR_EXTENSION_94_EXTENSION_NAME"/> - </require> + <extension name="RESERVED_DO_NOT_USE_94" number="94" supported="disabled" comment="Used for functionality subsumed into Vulkan 1.1 and not published as an extension"> </extension> - <extension name="VK_NV_sample_mask_override_coverage" number="95" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> + <extension name="VK_NV_sample_mask_override_coverage" number="95" type="device" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="1" name="VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION"/> + <enum value="1" name="VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION"/> <enum value=""VK_NV_sample_mask_override_coverage"" name="VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME"/> + <comment> + enum offset=0 was mistakenly used for the 1.1 core enum + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES + (value=1000094000). Fortunately, no conflict resulted. + </comment> </require> </extension> - <extension name="VK_NV_geometry_shader_passthrough" number="96" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> + <extension name="VK_NV_geometry_shader_passthrough" number="96" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="1" name="VK_NV_GEOMETRY_SHADER_PASSTHROUGH_SPEC_VERSION"/> + <enum value="1" name="VK_NV_GEOMETRY_SHADER_PASSTHROUGH_SPEC_VERSION"/> <enum value=""VK_NV_geometry_shader_passthrough"" name="VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_viewport_array2" number="97" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> + <extension name="VK_NV_viewport_array2" number="97" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="1" name="VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION"/> - <enum value=""VK_NV_viewport_array2"" name="VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME"/> + <enum value="1" name="VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION"/> + <enum value=""VK_NV_viewport_array2"" name="VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NVX_multiview_per_view_attributes" number="98" type="device" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="vulkan"> + <extension name="VK_NVX_multiview_per_view_attributes" number="98" type="device" requires="VK_KHR_multiview" author="NVX" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="1" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_SPEC_VERSION"/> - <enum value=""VK_NVX_multiview_per_view_attributes"" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX"/> - <enum bitpos="0" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX"/> - <enum bitpos="1" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX"/> + <enum value="1" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_SPEC_VERSION"/> + <enum value=""VK_NVX_multiview_per_view_attributes"" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX"/> + <enum bitpos="0" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX"/> + <enum bitpos="1" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX"/> <type name="VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX"/> </require> </extension> - <extension name="VK_NV_viewport_swizzle" number="99" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> + <extension name="VK_NV_viewport_swizzle" number="99" type="device" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="1" name="VK_NV_VIEWPORT_SWIZZLE_SPEC_VERSION"/> - <enum value=""VK_NV_viewport_swizzle"" name="VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV"/> + <enum value="1" name="VK_NV_VIEWPORT_SWIZZLE_SPEC_VERSION"/> + <enum value=""VK_NV_viewport_swizzle"" name="VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV"/> <type name="VkViewportSwizzleNV"/> <type name="VkViewportCoordinateSwizzleNV"/> <type name="VkPipelineViewportSwizzleStateCreateInfoNV"/> <type name="VkPipelineViewportSwizzleStateCreateFlagsNV"/> </require> </extension> - <extension name="VK_EXT_discard_rectangles" number="100" type="device" requires="VK_KHR_get_physical_device_properties2" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> + <extension name="VK_EXT_discard_rectangles" number="100" type="device" requires="VK_KHR_get_physical_device_properties2" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION"/> - <enum value=""VK_EXT_discard_rectangles"" name="VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT"/> - <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT"/> + <enum value="1" name="VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION"/> + <enum value=""VK_EXT_discard_rectangles"" name="VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT"/> + <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT"/> <type name="VkPhysicalDeviceDiscardRectanglePropertiesEXT"/> <type name="VkPipelineDiscardRectangleStateCreateInfoEXT"/> <type name="VkPipelineDiscardRectangleStateCreateFlagsEXT"/> @@ -6117,54 +7763,61 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkCmdSetDiscardRectangleEXT"/> </require> </extension> - <extension name="VK_NV_extension_101" number="101" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> + <extension name="VK_NV_extension_101" number="101" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_101_SPEC_VERSION"/> - <enum value=""VK_NV_extension_101"" name="VK_NV_EXTENSION_101_EXTENSION_NAME"/> + <enum value="0" name="VK_NV_EXTENSION_101_SPEC_VERSION"/> + <enum value=""VK_NV_extension_101"" name="VK_NV_EXTENSION_101_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_102" number="102" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> + <extension name="VK_EXT_conservative_rasterization" number="102" type="device" requires="VK_KHR_get_physical_device_properties2" author="NV" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="0" name="VK_NV_EXTENSION_102_SPEC_VERSION"/> - <enum value=""VK_NV_extension_102"" name="VK_NV_EXTENSION_102_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_CONSERVATIVE_RASTERIZATION_SPEC_VERSION"/> + <enum value=""VK_EXT_conservative_rasterization"" name="VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT"/> + <type name="VkPhysicalDeviceConservativeRasterizationPropertiesEXT"/> + <type name="VkPipelineRasterizationConservativeStateCreateInfoEXT"/> + <type name="VkPipelineRasterizationConservativeStateCreateFlagsEXT"/> + <type name="VkConservativeRasterizationModeEXT"/> </require> </extension> - <extension name="VK_NV_extension_103" number="103" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> + <extension name="VK_NV_extension_103" number="103" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_103_SPEC_VERSION"/> - <enum value=""VK_NV_extension_103"" name="VK_NV_EXTENSION_103_EXTENSION_NAME"/> + <enum value="0" name="VK_NV_EXTENSION_103_SPEC_VERSION"/> + <enum value=""VK_NV_extension_103"" name="VK_NV_EXTENSION_103_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_104" number="104" author="NVIDIA" contact="Mathias Schott @mschott" supported="disabled"> + <extension name="VK_NV_extension_104" number="104" author="NV" contact="Mathias Schott gitlab:@mschott" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_104_SPEC_VERSION"/> - <enum value=""VK_NV_extension_104"" name="VK_NV_EXTENSION_104_EXTENSION_NAME"/> + <enum value="0" name="VK_NV_EXTENSION_104_SPEC_VERSION"/> + <enum value=""VK_NV_extension_104"" name="VK_NV_EXTENSION_104_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_EXT_swapchain_colorspace" number="105" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtneygo" requires="VK_KHR_surface" supported="vulkan"> + <extension name="VK_EXT_swapchain_colorspace" number="105" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtney-g" requires="VK_KHR_surface" supported="vulkan"> <require> - <enum value="2" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION"/> - <enum value=""VK_EXT_swapchain_colorspace"" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME"/> - <enum offset="1" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT"/> - <enum offset="2" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT"/> - <enum offset="3" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_LINEAR_EXT"/> - <enum offset="4" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT"/> - <enum offset="5" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_LINEAR_EXT"/> - <enum offset="6" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_NONLINEAR_EXT"/> - <enum offset="7" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT2020_LINEAR_EXT"/> - <enum offset="8" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_ST2084_EXT"/> - <enum offset="9" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DOLBYVISION_EXT"/> - <enum offset="10" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_HLG_EXT"/> - <enum offset="11" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT"/> - <enum offset="12" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT"/> - <enum offset="13" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_PASS_THROUGH_EXT"/> + <enum value="3" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION"/> + <enum value=""VK_EXT_swapchain_colorspace"" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME"/> + <enum offset="1" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT"/> + <enum offset="2" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT"/> + <enum offset="3" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_LINEAR_EXT"/> + <enum offset="4" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT"/> + <enum offset="5" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_LINEAR_EXT"/> + <enum offset="6" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_NONLINEAR_EXT"/> + <enum offset="7" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT2020_LINEAR_EXT"/> + <enum offset="8" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_ST2084_EXT"/> + <enum offset="9" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DOLBYVISION_EXT"/> + <enum offset="10" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_HLG_EXT"/> + <enum offset="11" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT"/> + <enum offset="12" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT"/> + <enum offset="13" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_PASS_THROUGH_EXT"/> + <enum offset="14" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT"/> </require> </extension> - <extension name="VK_EXT_hdr_metadata" number="106" type="device" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtneygo" supported="vulkan"> + <extension name="VK_EXT_hdr_metadata" number="106" type="device" requires="VK_KHR_swapchain" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtney-g" supported="vulkan"> <require> - <enum value="1" name="VK_EXT_HDR_METADATA_SPEC_VERSION"/> - <enum value=""VK_EXT_hdr_metadata"" name="VK_EXT_HDR_METADATA_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_HDR_METADATA_EXT"/> + <enum value="1" name="VK_EXT_HDR_METADATA_SPEC_VERSION"/> + <enum value=""VK_EXT_hdr_metadata"" name="VK_EXT_HDR_METADATA_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_HDR_METADATA_EXT"/> <type name="VkHdrMetadataEXT"/> <type name="VkXYColorEXT"/> <command name="vkSetHdrMetadataEXT"/> @@ -6172,95 +7825,150 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </extension> <extension name="VK_IMG_extension_107" number="107" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_107_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_107"" name="VK_IMG_EXTENSION_107_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_107_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_107"" name="VK_IMG_EXTENSION_107_EXTENSION_NAME"/> </require> </extension> <extension name="VK_IMG_extension_108" number="108" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_108_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_108"" name="VK_IMG_EXTENSION_108_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_108_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_108"" name="VK_IMG_EXTENSION_108_EXTENSION_NAME"/> </require> </extension> <extension name="VK_IMG_extension_109" number="109" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_109_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_109"" name="VK_IMG_EXTENSION_109_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_109_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_109"" name="VK_IMG_EXTENSION_109_EXTENSION_NAME"/> </require> </extension> <extension name="VK_IMG_extension_110" number="110" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_110_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_110"" name="VK_IMG_EXTENSION_110_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_110_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_110"" name="VK_IMG_EXTENSION_110_EXTENSION_NAME"/> </require> </extension> <extension name="VK_IMG_extension_111" number="111" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_IMG_EXTENSION_111_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_111"" name="VK_IMG_EXTENSION_111_EXTENSION_NAME"/> + <enum value="0" name="VK_IMG_EXTENSION_111_SPEC_VERSION"/> + <enum value=""VK_IMG_extension_111"" name="VK_IMG_EXTENSION_111_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_shared_presentable_image" number="112" type="device" requires="VK_KHR_surface,VK_KHR_swapchain,VK_KHR_get_physical_device_properties2,VK_KHR_get_surface_capabilities2" author="KHR" contact="Alon Or-bach @alonorbach" supported="vulkan"> + <extension name="VK_KHR_shared_presentable_image" number="112" type="device" requires="VK_KHR_swapchain,VK_KHR_get_physical_device_properties2,VK_KHR_get_surface_capabilities2" author="KHR" contact="Alon Or-bach @alonorbach" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION"/> + <enum value="1" name="VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION"/> <enum value=""VK_KHR_shared_presentable_image"" name="VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR"/> - <enum offset="0" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR"/> - <enum offset="1" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR"/> - <enum offset="0" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR"/> + <enum offset="0" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR"/> + <enum offset="1" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR"/> + <enum offset="0" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR"/> <type name="VkSharedPresentSurfaceCapabilitiesKHR"/> <command name="vkGetSwapchainStatusKHR"/> </require> </extension> - <extension name="VK_KHR_extension_113" number="113" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_113_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_113"" name="VK_KHR_EXTENSION_113_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_114" number="114" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_114_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_114"" name="VK_KHR_EXTENSION_114_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_115" number="115" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_115_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_115"" name="VK_KHR_EXTENSION_115_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_116" number="116" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_116_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_116"" name="VK_KHR_EXTENSION_116_EXTENSION_NAME"/> + <extension name="VK_KHR_external_fence_capabilities" number="113" type="instance" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="Jesse Hall @critsec" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_FENCE_CAPABILITIES_SPEC_VERSION"/> + <enum value=""VK_KHR_external_fence_capabilities"" name="VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES"/> + <enum name="VK_LUID_SIZE_KHR"/> + <type name="VkExternalFenceHandleTypeFlagsKHR"/> + <type name="VkExternalFenceHandleTypeFlagBitsKHR"/> + <enum extends="VkExternalFenceHandleTypeFlagBits" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR" alias="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT"/> + <enum extends="VkExternalFenceHandleTypeFlagBits" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR" alias="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT"/> + <enum extends="VkExternalFenceHandleTypeFlagBits" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR" alias="VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT"/> + <enum extends="VkExternalFenceHandleTypeFlagBits" name="VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR" alias="VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT"/> + <type name="VkExternalFenceFeatureFlagsKHR"/> + <type name="VkExternalFenceFeatureFlagBitsKHR"/> + <enum extends="VkExternalFenceFeatureFlagBits" name="VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR" alias="VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT"/> + <enum extends="VkExternalFenceFeatureFlagBits" name="VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR" alias="VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT"/> + <type name="VkPhysicalDeviceExternalFenceInfoKHR"/> + <type name="VkExternalFencePropertiesKHR"/> + <type name="VkPhysicalDeviceIDPropertiesKHR"/> + <command name="vkGetPhysicalDeviceExternalFencePropertiesKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_fence" number="114" type="device" requires="VK_KHR_external_fence_capabilities" author="KHR" contact="Jesse Hall @critsec" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_FENCE_SPEC_VERSION"/> + <enum value=""VK_KHR_external_fence"" name="VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO"/> + <type name="VkFenceImportFlagsKHR"/> + <type name="VkFenceImportFlagBitsKHR"/> + <enum extends="VkFenceImportFlagBits" name="VK_FENCE_IMPORT_TEMPORARY_BIT_KHR" alias="VK_FENCE_IMPORT_TEMPORARY_BIT"/> + <type name="VkExportFenceCreateInfoKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_fence_win32" number="115" type="device" requires="VK_KHR_external_fence" author="KHR" contact="Jesse Hall @critsec" platform="win32" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_FENCE_WIN32_SPEC_VERSION"/> + <enum value=""VK_KHR_external_fence_win32"" name="VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_FENCE_GET_WIN32_HANDLE_INFO_KHR"/> + <type name="VkImportFenceWin32HandleInfoKHR"/> + <type name="VkExportFenceWin32HandleInfoKHR"/> + <type name="VkFenceGetWin32HandleInfoKHR"/> + <command name="vkImportFenceWin32HandleKHR"/> + <command name="vkGetFenceWin32HandleKHR"/> + </require> + </extension> + <extension name="VK_KHR_external_fence_fd" number="116" type="device" requires="VK_KHR_external_fence" author="KHR" contact="Jesse Hall @critsec" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_EXTERNAL_FENCE_FD_SPEC_VERSION"/> + <enum value=""VK_KHR_external_fence_fd"" name="VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR"/> + <type name="VkImportFenceFdInfoKHR"/> + <type name="VkFenceGetFdInfoKHR"/> + <command name="vkImportFenceFdKHR"/> + <command name="vkGetFenceFdKHR"/> </require> </extension> <extension name="VK_KHR_extension_117" number="117" author="KHR" contact="Kenneth Benzie @kbenzie" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_117_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_117"" name="VK_KHR_EXTENSION_117_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_118" number="118" author="KHR" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_118_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_118"" name="VK_KHR_EXTENSION_118_EXTENSION_NAME"/> + <enum value="0" name="VK_KHR_EXTENSION_117_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_117"" name="VK_KHR_EXTENSION_117_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_KHR_maintenance2" number="118" type="device" author="KHR" contact="Michael Worcester @michaelworcester" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_MAINTENANCE2_SPEC_VERSION"/> + <enum value=""VK_KHR_maintenance2"" name="VK_KHR_MAINTENANCE2_EXTENSION_NAME"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR" alias="VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR" alias="VK_IMAGE_CREATE_EXTENDED_USAGE_BIT"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO"/> + <enum extends="VkImageLayout" name="VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR" alias="VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL"/> + <enum extends="VkImageLayout" name="VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR" alias="VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL"/> + <type name="VkPhysicalDevicePointClippingPropertiesKHR"/> + <type name="VkPointClippingBehaviorKHR"/> + <enum extends="VkPointClippingBehavior" name="VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES_KHR" alias="VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES"/> + <enum extends="VkPointClippingBehavior" name="VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY_KHR" alias="VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY"/> + <type name="VkRenderPassInputAttachmentAspectCreateInfoKHR"/> + <type name="VkInputAttachmentAspectReferenceKHR"/> + <type name="VkImageViewUsageCreateInfoKHR"/> + <type name="VkTessellationDomainOriginKHR"/> + <enum extends="VkTessellationDomainOrigin" name="VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT_KHR" alias="VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT"/> + <enum extends="VkTessellationDomainOrigin" name="VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT_KHR" alias="VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT"/> + <type name="VkPipelineTessellationDomainOriginStateCreateInfoKHR"/> </require> </extension> <extension name="VK_KHR_extension_119" number="119" author="KHR" contact="Michael Worcester @michaelworcester" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_119_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_119"" name="VK_KHR_EXTENSION_119_EXTENSION_NAME"/> + <enum value="0" name="VK_KHR_EXTENSION_119_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_119"" name="VK_KHR_EXTENSION_119_EXTENSION_NAME"/> </require> </extension> <extension name="VK_KHR_get_surface_capabilities2" number="120" type="instance" requires="VK_KHR_surface" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="1" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION"/> - <enum value=""VK_KHR_get_surface_capabilities2"" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR"/> + <enum value="1" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION"/> + <enum value=""VK_KHR_get_surface_capabilities2"" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR"/> <type name="VkPhysicalDeviceSurfaceInfo2KHR"/> <type name="VkSurfaceCapabilities2KHR"/> <type name="VkSurfaceFormat2KHR"/> @@ -6268,33 +7976,49 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <command name="vkGetPhysicalDeviceSurfaceFormats2KHR"/> </require> </extension> - <extension name="VK_KHR_variable_pointers" number="121" author="KHR" contact="John Kessenich @johnk" supported="disabled"> + <extension name="VK_KHR_variable_pointers" number="121" type="device" author="KHR" contact="Jesse Hall @critsec" requires="VK_KHR_get_physical_device_properties2,VK_KHR_storage_buffer_storage_class" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_variable_pointers_SPEC_VERSION"/> - <enum value=""VK_KHR_variable_pointers"" name="VK_KHR_variable_pointers_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_VARIABLE_POINTERS_SPEC_VERSION"/> + <enum value=""VK_KHR_variable_pointers"" name="VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES"/> + <type name="VkPhysicalDeviceVariablePointerFeaturesKHR"/> </require> </extension> - <extension name="VK_KHR_extension_122" number="122" author="KHR" contact="James Jones @cubanismo" supported="disabled"> + <extension name="VK_KHR_get_display_properties2" number="122" type="instance" requires="VK_KHR_display" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_122_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_122"" name="VK_KHR_EXTENSION_122_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_GET_DISPLAY_PROPERTIES_2_SPEC_VERSION"/> + <enum value=""VK_KHR_get_display_properties2"" name="VK_KHR_GET_DISPLAY_PROPERTIES_2_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR"/> + <type name="VkDisplayProperties2KHR"/> + <type name="VkDisplayPlaneProperties2KHR"/> + <type name="VkDisplayModeProperties2KHR"/> + <type name="VkDisplayPlaneInfo2KHR"/> + <type name="VkDisplayPlaneCapabilities2KHR"/> + <command name="vkGetPhysicalDeviceDisplayProperties2KHR"/> + <command name="vkGetPhysicalDeviceDisplayPlaneProperties2KHR"/> + <command name="vkGetDisplayModeProperties2KHR"/> + <command name="vkGetDisplayPlaneCapabilities2KHR"/> </require> </extension> - <extension name="VK_MVK_ios_surface" number="123" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_IOS_MVK" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> + <extension name="VK_MVK_ios_surface" number="123" type="instance" requires="VK_KHR_surface" platform="ios" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> <require> - <enum value="2" name="VK_MVK_IOS_SURFACE_SPEC_VERSION"/> - <enum value=""VK_MVK_ios_surface"" name="VK_MVK_IOS_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK"/> + <enum value="2" name="VK_MVK_IOS_SURFACE_SPEC_VERSION"/> + <enum value=""VK_MVK_ios_surface"" name="VK_MVK_IOS_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK"/> <type name="VkIOSSurfaceCreateFlagsMVK"/> <type name="VkIOSSurfaceCreateInfoMVK"/> <command name="vkCreateIOSSurfaceMVK"/> </require> </extension> - <extension name="VK_MVK_macos_surface" number="124" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_MACOS_MVK" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> + <extension name="VK_MVK_macos_surface" number="124" type="instance" requires="VK_KHR_surface" platform="macos" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> <require> - <enum value="2" name="VK_MVK_MACOS_SURFACE_SPEC_VERSION"/> - <enum value=""VK_MVK_macos_surface"" name="VK_MVK_MACOS_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK"/> + <enum value="2" name="VK_MVK_MACOS_SURFACE_SPEC_VERSION"/> + <enum value=""VK_MVK_macos_surface"" name="VK_MVK_MACOS_SURFACE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK"/> <type name="VkMacOSSurfaceCreateFlagsMVK"/> <type name="VkMacOSSurfaceCreateInfoMVK"/> <command name="vkCreateMacOSSurfaceMVK"/> @@ -6302,212 +8026,804 @@ maintained in the master branch of the Khronos Vulkan GitHub project. </extension> <extension name="VK_MVK_moltenvk" number="125" type="instance" author="MVK" contact="Bill Hollings @billhollings" supported="disabled"> <require> - <enum value="0" name="VK_MVK_MOLTENVK_SPEC_VERSION"/> - <enum value=""VK_MVK_moltenvk"" name="VK_MVK_MOLTENVK_EXTENSION_NAME"/> + <enum value="0" name="VK_MVK_MOLTENVK_SPEC_VERSION"/> + <enum value=""VK_MVK_moltenvk"" name="VK_MVK_MOLTENVK_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_MESA_extension_126" number="126" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> + <extension name="VK_EXT_external_memory_dma_buf" number="126" type="device" requires="VK_KHR_external_memory_fd" author="EXT" contact="Chad Versace @chadversary" supported="vulkan"> <require> - <enum value="0" name="VK_MESA_EXTENSION_126_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_126"" name="VK_MESA_EXTENSION_126_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_EXTERNAL_MEMORY_DMA_BUF_SPEC_VERSION"/> + <enum value=""VK_EXT_external_memory_dma_buf"" name="VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME"/> + <enum bitpos="9" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT"/> </require> </extension> - <extension name="VK_MESA_extension_127" number="127" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> + <extension name="VK_EXT_queue_family_foreign" number="127" type="device" author="EXT" requires="VK_KHR_external_memory" contact="Chad Versace @chadversary" supported="vulkan"> <require> - <enum value="0" name="VK_MESA_EXTENSION_127_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_127"" name="VK_MESA_EXTENSION_127_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION"/> + <enum value=""VK_EXT_queue_family_foreign"" name="VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME"/> + <enum name="VK_QUEUE_FAMILY_FOREIGN_EXT"/> </require> </extension> - <extension name="VK_KHR_extension_128" number="128" author="KHR" contact="James Jones @cubanismo" supported="disabled"> + <extension name="VK_KHR_dedicated_allocation" number="128" type="device" author="KHR" requires="VK_KHR_get_memory_requirements2" contact="James Jones @cubanismo" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_128_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_128"" name="VK_KHR_EXTENSION_128_EXTENSION_NAME"/> + <enum value="3" name="VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION"/> + <enum value=""VK_KHR_dedicated_allocation"" name="VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR" alias="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO"/> + <type name="VkMemoryDedicatedRequirementsKHR"/> + <type name="VkMemoryDedicatedAllocateInfoKHR"/> </require> </extension> - <extension name="VK_EXT_extension_129" number="129" author="LUNARG" contact="Mark Young @MarkY_LunarG" supported="disabled"> + <extension name="VK_EXT_debug_utils" number="129" type="instance" author="EXT" contact="Mark Young @marky-lunarg" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_129_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_129"" name="VK_KHR_EXTENSION_129_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_DEBUG_UTILS_SPEC_VERSION"/> + <enum value=""VK_EXT_debug_utils"" name="VK_EXT_DEBUG_UTILS_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT" comment="VkDebugUtilsMessengerEXT"/> + <type name="VkDebugUtilsObjectNameInfoEXT"/> + <type name="VkDebugUtilsObjectTagInfoEXT"/> + <type name="VkDebugUtilsLabelEXT"/> + <type name="VkDebugUtilsMessengerCallbackDataEXT"/> + <type name="VkDebugUtilsMessengerCreateInfoEXT"/> + <command name="vkSetDebugUtilsObjectNameEXT"/> + <command name="vkSetDebugUtilsObjectTagEXT"/> + <command name="vkQueueBeginDebugUtilsLabelEXT"/> + <command name="vkQueueEndDebugUtilsLabelEXT"/> + <command name="vkQueueInsertDebugUtilsLabelEXT"/> + <command name="vkCmdBeginDebugUtilsLabelEXT"/> + <command name="vkCmdEndDebugUtilsLabelEXT"/> + <command name="vkCmdInsertDebugUtilsLabelEXT"/> + <command name="vkCreateDebugUtilsMessengerEXT"/> + <command name="vkDestroyDebugUtilsMessengerEXT"/> + <command name="vkSubmitDebugUtilsMessageEXT"/> </require> </extension> - <extension name="VK_KHR_extension_130" number="130" author="KHR" contact="Jesse Hall @jessehall" supported="disabled"> + <extension name="VK_ANDROID_external_memory_android_hardware_buffer" number="130" type="device" author="ANDROID" requires="VK_KHR_sampler_ycbcr_conversion,VK_KHR_external_memory,VK_EXT_queue_family_foreign" platform="android" contact="Jesse Hall @critsec" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_130_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_130"" name="VK_KHR_EXTENSION_130_EXTENSION_NAME"/> + <enum value="3" name="VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_SPEC_VERSION"/> + <enum value=""VK_ANDROID_external_memory_android_hardware_buffer"" name="VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME"/> + <enum bitpos="10" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID"/> + <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID"/> + <type name="VkAndroidHardwareBufferUsageANDROID"/> + <type name="VkAndroidHardwareBufferPropertiesANDROID"/> + <type name="VkAndroidHardwareBufferFormatPropertiesANDROID"/> + <type name="VkImportAndroidHardwareBufferInfoANDROID"/> + <type name="VkMemoryGetAndroidHardwareBufferInfoANDROID"/> + <type name="VkExternalFormatANDROID"/> + <command name="vkGetAndroidHardwareBufferPropertiesANDROID"/> + <command name="vkGetMemoryAndroidHardwareBufferANDROID"/> </require> </extension> - <extension name="VK_KHR_extension_131" number="131" author="KHR" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_EXT_sampler_filter_minmax" number="131" type="device" author="NV" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_131_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_131"" name="VK_KHR_EXTENSION_131_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION"/> + <enum value=""VK_EXT_sampler_filter_minmax"" name="VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT"/> + <enum bitpos="16" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT" comment="Format can be used with min/max reduction filtering"/> + <type name="VkSamplerReductionModeEXT"/> + <type name="VkSamplerReductionModeCreateInfoEXT"/> + <type name="VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT"/> </require> </extension> - <extension name="VK_KHR_extension_132" number="132" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> + <extension name="VK_KHR_storage_buffer_storage_class" number="132" type="device" author="KHR" contact="Alexander Galazin @alegal-arm" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_132_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_132"" name="VK_KHR_EXTENSION_132_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_SPEC_VERSION"/> + <enum value=""VK_KHR_storage_buffer_storage_class"" name="VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_133" number="133" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> + <extension name="VK_AMD_gpu_shader_int16" number="133" type="device" author="AMD" contact="Qun Lin, AMD @linqun" supported="vulkan"> <require> - <enum value="0" name="VK_AMD_EXTENSION_133_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_133"" name="VK_AMD_EXTENSION_133_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_GPU_SHADER_INT16_SPEC_VERSION"/> + <enum value=""VK_AMD_gpu_shader_int16"" name="VK_AMD_GPU_SHADER_INT16_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_134" number="134" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_134_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_134"" name="VK_AMD_EXTENSION_134_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_134_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_134"" name="VK_AMD_EXTENSION_134_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_135" number="135" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_135_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_135"" name="VK_AMD_EXTENSION_135_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_135_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_135"" name="VK_AMD_EXTENSION_135_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_136" number="136" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_136_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_136"" name="VK_AMD_EXTENSION_136_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_136_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_136"" name="VK_AMD_EXTENSION_136_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_137" number="137" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> + <extension name="VK_AMD_mixed_attachment_samples" number="137" type="device" author="AMD" contact="Matthaeus G. Chajdas @anteru" supported="vulkan"> <require> - <enum value="0" name="VK_AMD_EXTENSION_137_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_137"" name="VK_AMD_EXTENSION_137_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_MIXED_ATTACHMENT_SAMPLES_SPEC_VERSION"/> + <enum value=""VK_AMD_mixed_attachment_samples"" name="VK_AMD_MIXED_ATTACHMENT_SAMPLES_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_138" number="138" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> + <extension name="VK_AMD_shader_fragment_mask" number="138" author="AMD" contact="Aaron Hagan @AaronHaganAMD" supported="vulkan" type="device"> <require> - <enum value="0" name="VK_AMD_EXTENSION_138_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_138"" name="VK_AMD_EXTENSION_138_EXTENSION_NAME"/> + <enum value="1" name="VK_AMD_SHADER_FRAGMENT_MASK_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_fragment_mask"" name="VK_AMD_SHADER_FRAGMENT_MASK_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_139" number="139" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_139_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_139"" name="VK_AMD_EXTENSION_139_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_139_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_139"" name="VK_AMD_EXTENSION_139_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_140" number="140" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_140_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_140"" name="VK_AMD_EXTENSION_140_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_140_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_140"" name="VK_AMD_EXTENSION_140_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_AMD_extension_141" number="141" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> + <extension name="VK_EXT_shader_stencil_export" number="141" type="device" author="EXT" contact="Dominik Witczak @dominikwitczakamd" supported="vulkan"> <require> - <enum value="0" name="VK_AMD_EXTENSION_141_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_141"" name="VK_AMD_EXTENSION_141_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_SHADER_STENCIL_EXPORT_SPEC_VERSION"/> + <enum value=""VK_EXT_shader_stencil_export"" name="VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_142" number="142" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_142_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_142"" name="VK_AMD_EXTENSION_142_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_142_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_142"" name="VK_AMD_EXTENSION_142_EXTENSION_NAME"/> </require> </extension> <extension name="VK_AMD_extension_143" number="143" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_143_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_143"" name="VK_AMD_EXTENSION_143_EXTENSION_NAME"/> + <enum value="0" name="VK_AMD_EXTENSION_143_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_143"" name="VK_AMD_EXTENSION_143_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_sample_locations" number="144" type="device" author="AMD" contact="Daniel Rakos @drakos-amd" supported="vulkan"> + <require> + <enum value="1" name="VK_EXT_SAMPLE_LOCATIONS_SPEC_VERSION"/> + <enum value=""VK_EXT_sample_locations"" name="VK_EXT_SAMPLE_LOCATIONS_EXTENSION_NAME"/> + <enum bitpos="12" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MULTISAMPLE_PROPERTIES_EXT"/> + <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT"/> + <type name="VkSampleLocationEXT"/> + <type name="VkSampleLocationsInfoEXT"/> + <type name="VkAttachmentSampleLocationsEXT"/> + <type name="VkSubpassSampleLocationsEXT"/> + <type name="VkRenderPassSampleLocationsBeginInfoEXT"/> + <type name="VkPipelineSampleLocationsStateCreateInfoEXT"/> + <type name="VkPhysicalDeviceSampleLocationsPropertiesEXT"/> + <type name="VkMultisamplePropertiesEXT"/> + <command name="vkCmdSetSampleLocationsEXT"/> + <command name="vkGetPhysicalDeviceMultisamplePropertiesEXT"/> + </require> + </extension> + <extension name="VK_KHR_relaxed_block_layout" number="145" type="device" author="KHR" contact="John Kessenich @johnkslang" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_RELAXED_BLOCK_LAYOUT_SPEC_VERSION"/> + <enum value=""VK_KHR_relaxed_block_layout"" name="VK_KHR_RELAXED_BLOCK_LAYOUT_EXTENSION_NAME"/> + </require> + </extension> + <extension name="RESERVED_DO_NOT_USE_146" number="146" supported="disabled" comment="Used for functionality subsumed into Vulkan 1.1 and not published as an extension"> + </extension> + <extension name="VK_KHR_get_memory_requirements2" number="147" type="device" author="KHR" contact="Jason Ekstrand @jekstrand" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_GET_MEMORY_REQUIREMENTS_2_SPEC_VERSION"/> + <enum value=""VK_KHR_get_memory_requirements2"" name="VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR" alias="VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR" alias="VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR" alias="VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR" alias="VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR" alias="VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2"/> + <type name="VkBufferMemoryRequirementsInfo2KHR"/> + <type name="VkImageMemoryRequirementsInfo2KHR"/> + <type name="VkImageSparseMemoryRequirementsInfo2KHR"/> + <type name="VkMemoryRequirements2KHR"/> + <type name="VkSparseImageMemoryRequirements2KHR"/> + <command name="vkGetImageMemoryRequirements2KHR"/> + <command name="vkGetBufferMemoryRequirements2KHR"/> + <command name="vkGetImageSparseMemoryRequirements2KHR"/> + </require> + </extension> + <extension name="VK_KHR_image_format_list" number="148" type="device" author="KHR" contact="Jason Ekstrand @jekstrand" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_IMAGE_FORMAT_LIST_SPEC_VERSION"/> + <enum value=""VK_KHR_image_format_list"" name="VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR"/> + <type name="VkImageFormatListCreateInfoKHR"/> + </require> + </extension> + <extension name="VK_EXT_blend_operation_advanced" number="149" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="2" name="VK_EXT_BLEND_OPERATION_ADVANCED_SPEC_VERSION"/> + <enum value=""VK_EXT_blend_operation_advanced"" name="VK_EXT_BLEND_OPERATION_ADVANCED_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT"/> + <type name="VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT"/> + <type name="VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT"/> + <type name="VkPipelineColorBlendAdvancedStateCreateInfoEXT"/> + <type name="VkBlendOverlapEXT"/> + <enum offset="0" extends="VkBlendOp" name="VK_BLEND_OP_ZERO_EXT"/> + <enum offset="1" extends="VkBlendOp" name="VK_BLEND_OP_SRC_EXT"/> + <enum offset="2" extends="VkBlendOp" name="VK_BLEND_OP_DST_EXT"/> + <enum offset="3" extends="VkBlendOp" name="VK_BLEND_OP_SRC_OVER_EXT"/> + <enum offset="4" extends="VkBlendOp" name="VK_BLEND_OP_DST_OVER_EXT"/> + <enum offset="5" extends="VkBlendOp" name="VK_BLEND_OP_SRC_IN_EXT"/> + <enum offset="6" extends="VkBlendOp" name="VK_BLEND_OP_DST_IN_EXT"/> + <enum offset="7" extends="VkBlendOp" name="VK_BLEND_OP_SRC_OUT_EXT"/> + <enum offset="8" extends="VkBlendOp" name="VK_BLEND_OP_DST_OUT_EXT"/> + <enum offset="9" extends="VkBlendOp" name="VK_BLEND_OP_SRC_ATOP_EXT"/> + <enum offset="10" extends="VkBlendOp" name="VK_BLEND_OP_DST_ATOP_EXT"/> + <enum offset="11" extends="VkBlendOp" name="VK_BLEND_OP_XOR_EXT"/> + <enum offset="12" extends="VkBlendOp" name="VK_BLEND_OP_MULTIPLY_EXT"/> + <enum offset="13" extends="VkBlendOp" name="VK_BLEND_OP_SCREEN_EXT"/> + <enum offset="14" extends="VkBlendOp" name="VK_BLEND_OP_OVERLAY_EXT"/> + <enum offset="15" extends="VkBlendOp" name="VK_BLEND_OP_DARKEN_EXT"/> + <enum offset="16" extends="VkBlendOp" name="VK_BLEND_OP_LIGHTEN_EXT"/> + <enum offset="17" extends="VkBlendOp" name="VK_BLEND_OP_COLORDODGE_EXT"/> + <enum offset="18" extends="VkBlendOp" name="VK_BLEND_OP_COLORBURN_EXT"/> + <enum offset="19" extends="VkBlendOp" name="VK_BLEND_OP_HARDLIGHT_EXT"/> + <enum offset="20" extends="VkBlendOp" name="VK_BLEND_OP_SOFTLIGHT_EXT"/> + <enum offset="21" extends="VkBlendOp" name="VK_BLEND_OP_DIFFERENCE_EXT"/> + <enum offset="22" extends="VkBlendOp" name="VK_BLEND_OP_EXCLUSION_EXT"/> + <enum offset="23" extends="VkBlendOp" name="VK_BLEND_OP_INVERT_EXT"/> + <enum offset="24" extends="VkBlendOp" name="VK_BLEND_OP_INVERT_RGB_EXT"/> + <enum offset="25" extends="VkBlendOp" name="VK_BLEND_OP_LINEARDODGE_EXT"/> + <enum offset="26" extends="VkBlendOp" name="VK_BLEND_OP_LINEARBURN_EXT"/> + <enum offset="27" extends="VkBlendOp" name="VK_BLEND_OP_VIVIDLIGHT_EXT"/> + <enum offset="28" extends="VkBlendOp" name="VK_BLEND_OP_LINEARLIGHT_EXT"/> + <enum offset="29" extends="VkBlendOp" name="VK_BLEND_OP_PINLIGHT_EXT"/> + <enum offset="30" extends="VkBlendOp" name="VK_BLEND_OP_HARDMIX_EXT"/> + <enum offset="31" extends="VkBlendOp" name="VK_BLEND_OP_HSL_HUE_EXT"/> + <enum offset="32" extends="VkBlendOp" name="VK_BLEND_OP_HSL_SATURATION_EXT"/> + <enum offset="33" extends="VkBlendOp" name="VK_BLEND_OP_HSL_COLOR_EXT"/> + <enum offset="34" extends="VkBlendOp" name="VK_BLEND_OP_HSL_LUMINOSITY_EXT"/> + <enum offset="35" extends="VkBlendOp" name="VK_BLEND_OP_PLUS_EXT"/> + <enum offset="36" extends="VkBlendOp" name="VK_BLEND_OP_PLUS_CLAMPED_EXT"/> + <enum offset="37" extends="VkBlendOp" name="VK_BLEND_OP_PLUS_CLAMPED_ALPHA_EXT"/> + <enum offset="38" extends="VkBlendOp" name="VK_BLEND_OP_PLUS_DARKER_EXT"/> + <enum offset="39" extends="VkBlendOp" name="VK_BLEND_OP_MINUS_EXT"/> + <enum offset="40" extends="VkBlendOp" name="VK_BLEND_OP_MINUS_CLAMPED_EXT"/> + <enum offset="41" extends="VkBlendOp" name="VK_BLEND_OP_CONTRAST_EXT"/> + <enum offset="42" extends="VkBlendOp" name="VK_BLEND_OP_INVERT_OVG_EXT"/> + <enum offset="43" extends="VkBlendOp" name="VK_BLEND_OP_RED_EXT"/> + <enum offset="44" extends="VkBlendOp" name="VK_BLEND_OP_GREEN_EXT"/> + <enum offset="45" extends="VkBlendOp" name="VK_BLEND_OP_BLUE_EXT"/> + <enum bitpos="19" extends="VkAccessFlagBits" name="VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT"/> + </require> + </extension> + <extension name="VK_NV_fragment_coverage_to_color" number="150" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="1" name="VK_NV_FRAGMENT_COVERAGE_TO_COLOR_SPEC_VERSION"/> + <enum value=""VK_NV_fragment_coverage_to_color"" name="VK_NV_FRAGMENT_COVERAGE_TO_COLOR_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV"/> + <type name="VkPipelineCoverageToColorStateCreateFlagsNV"/> + <type name="VkPipelineCoverageToColorStateCreateInfoNV"/> + </require> + </extension> + <extension name="VK_NV_extension_151" number="151" author="NV" contact="Jeff Bolz @jeffbolznv" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_151_SPEC_VERSION"/> + <enum value=""VK_NV_extension_151"" name="VK_NV_EXTENSION_151_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_152" number="152" author="NV" contact="Jeff Bolz @jeffbolznv" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_152_SPEC_VERSION"/> + <enum value=""VK_NV_extension_152"" name="VK_NV_EXTENSION_152_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_framebuffer_mixed_samples" number="153" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="1" name="VK_NV_FRAMEBUFFER_MIXED_SAMPLES_SPEC_VERSION"/> + <enum value=""VK_NV_framebuffer_mixed_samples"" name="VK_NV_FRAMEBUFFER_MIXED_SAMPLES_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV"/> + <type name="VkPipelineCoverageModulationStateCreateInfoNV"/> + <type name="VkPipelineCoverageModulationStateCreateFlagsNV"/> + <type name="VkCoverageModulationModeNV"/> + </require> + </extension> + <extension name="VK_NV_fill_rectangle" number="154" type="device" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="1" name="VK_NV_FILL_RECTANGLE_SPEC_VERSION"/> + <enum value=""VK_NV_fill_rectangle"" name="VK_NV_FILL_RECTANGLE_EXTENSION_NAME"/> + <enum offset="0" extends="VkPolygonMode" name="VK_POLYGON_MODE_FILL_RECTANGLE_NV"/> + </require> + </extension> + <extension name="VK_NV_extension_155" number="155" author="NV" contact="Jeff Bolz @jeffbolznv" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_155_SPEC_VERSION"/> + <enum value=""VK_NV_extension_155"" name="VK_NV_EXTENSION_155_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_post_depth_coverage" number="156" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> + <require> + <enum value="1" name="VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION"/> + <enum value=""VK_EXT_post_depth_coverage"" name="VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_KHR_sampler_ycbcr_conversion" number="157" type="device" requires="VK_KHR_maintenance1,VK_KHR_bind_memory2,VK_KHR_get_memory_requirements2,VK_KHR_get_physical_device_properties2" author="KHR" contact="Andrew Garrard @fluppeteer" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_SAMPLER_YCBCR_CONVERSION_SPEC_VERSION"/> + <enum value=""VK_KHR_sampler_ycbcr_conversion"" name="VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR" alias="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR" alias="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO_KHR" alias="VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR" alias="VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES"/> + <enum extends="VkDebugReportObjectTypeEXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR_EXT" alias="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT"/> + <enum extends="VkObjectType" name="VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR" alias="VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION"/> + <enum extends="VkFormat" name="VK_FORMAT_G8B8G8R8_422_UNORM_KHR" alias="VK_FORMAT_G8B8G8R8_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_B8G8R8G8_422_UNORM_KHR" alias="VK_FORMAT_B8G8R8G8_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR" alias="VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G8_B8R8_2PLANE_420_UNORM_KHR" alias="VK_FORMAT_G8_B8R8_2PLANE_420_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM_KHR" alias="VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G8_B8R8_2PLANE_422_UNORM_KHR" alias="VK_FORMAT_G8_B8R8_2PLANE_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM_KHR" alias="VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_R10X6_UNORM_PACK16_KHR" alias="VK_FORMAT_R10X6_UNORM_PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_R10X6G10X6_UNORM_2PACK16_KHR" alias="VK_FORMAT_R10X6G10X6_UNORM_2PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16_KHR" alias="VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16_KHR" alias="VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16_KHR" alias="VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_KHR" alias="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_KHR" alias="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16_KHR" alias="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16_KHR" alias="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16_KHR" alias="VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_R12X4_UNORM_PACK16_KHR" alias="VK_FORMAT_R12X4_UNORM_PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_R12X4G12X4_UNORM_2PACK16_KHR" alias="VK_FORMAT_R12X4G12X4_UNORM_2PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16_KHR" alias="VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16_KHR" alias="VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16_KHR" alias="VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_KHR" alias="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_KHR" alias="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16_KHR" alias="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16_KHR" alias="VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16_KHR" alias="VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16"/> + <enum extends="VkFormat" name="VK_FORMAT_G16B16G16R16_422_UNORM_KHR" alias="VK_FORMAT_G16B16G16R16_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_B16G16R16G16_422_UNORM_KHR" alias="VK_FORMAT_B16G16R16G16_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM_KHR" alias="VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G16_B16R16_2PLANE_420_UNORM_KHR" alias="VK_FORMAT_G16_B16R16_2PLANE_420_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR" alias="VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR" alias="VK_FORMAT_G16_B16R16_2PLANE_422_UNORM"/> + <enum extends="VkFormat" name="VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR" alias="VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM"/> + <enum extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_0_BIT_KHR" alias="VK_IMAGE_ASPECT_PLANE_0_BIT"/> + <enum extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_1_BIT_KHR" alias="VK_IMAGE_ASPECT_PLANE_1_BIT"/> + <enum extends="VkImageAspectFlagBits" name="VK_IMAGE_ASPECT_PLANE_2_BIT_KHR" alias="VK_IMAGE_ASPECT_PLANE_2_BIT"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_DISJOINT_BIT_KHR" alias="VK_IMAGE_CREATE_DISJOINT_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT_KHR" alias="VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR" alias="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR" alias="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR" alias="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR" alias="VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_DISJOINT_BIT_KHR" alias="VK_FORMAT_FEATURE_DISJOINT_BIT"/> + <enum extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT_KHR" alias="VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT"/> + <type name="VkSamplerYcbcrConversionCreateInfoKHR"/> + <type name="VkSamplerYcbcrConversionInfoKHR"/> + <type name="VkBindImagePlaneMemoryInfoKHR"/> + <type name="VkImagePlaneMemoryRequirementsInfoKHR"/> + <type name="VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR"/> + <type name="VkSamplerYcbcrConversionImageFormatPropertiesKHR"/> + <command name="vkCreateSamplerYcbcrConversionKHR"/> + <command name="vkDestroySamplerYcbcrConversionKHR"/> + <type name="VkSamplerYcbcrConversionKHR"/> + <type name="VkSamplerYcbcrModelConversionKHR"/> + <enum extends="VkSamplerYcbcrModelConversion" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY_KHR" alias="VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY"/> + <enum extends="VkSamplerYcbcrModelConversion" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY_KHR" alias="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY"/> + <enum extends="VkSamplerYcbcrModelConversion" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709_KHR" alias="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709"/> + <enum extends="VkSamplerYcbcrModelConversion" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601_KHR" alias="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601"/> + <enum extends="VkSamplerYcbcrModelConversion" name="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020_KHR" alias="VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020"/> + <type name="VkSamplerYcbcrRangeKHR"/> + <enum extends="VkSamplerYcbcrRange" name="VK_SAMPLER_YCBCR_RANGE_ITU_FULL_KHR" alias="VK_SAMPLER_YCBCR_RANGE_ITU_FULL"/> + <enum extends="VkSamplerYcbcrRange" name="VK_SAMPLER_YCBCR_RANGE_ITU_NARROW_KHR" alias="VK_SAMPLER_YCBCR_RANGE_ITU_NARROW"/> + <type name="VkChromaLocationKHR"/> + <enum extends="VkChromaLocation" name="VK_CHROMA_LOCATION_COSITED_EVEN_KHR" alias="VK_CHROMA_LOCATION_COSITED_EVEN"/> + <enum extends="VkChromaLocation" name="VK_CHROMA_LOCATION_MIDPOINT_KHR" alias="VK_CHROMA_LOCATION_MIDPOINT"/> + </require> + <require extension="VK_EXT_debug_report"> + <enum extends="VkDebugReportObjectTypeEXT" offset="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT"/> + </require> + </extension> + <extension name="VK_KHR_bind_memory2" number="158" type="device" author="KHR" contact="Tobias Hector @tobski" supported="vulkan"> + <require> + <enum value="1" name="VK_KHR_BIND_MEMORY_2_SPEC_VERSION"/> + <enum value=""VK_KHR_bind_memory2"" name="VK_KHR_BIND_MEMORY_2_EXTENSION_NAME"/> + <command name="vkBindBufferMemory2KHR"/> + <command name="vkBindImageMemory2KHR"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR" alias="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR" alias="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO"/> + <enum extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_ALIAS_BIT_KHR" alias="VK_IMAGE_CREATE_ALIAS_BIT"/> + <type name="VkBindBufferMemoryInfoKHR"/> + <type name="VkBindImageMemoryInfoKHR"/> </require> </extension> - <extension name="VK_AMD_extension_144" number="144" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> + <extension name="VK_EXT_extension_159" number="159" author="EXT" contact="Chad Versace @chadversary" supported="disabled"> <require> - <enum value="0" name="VK_AMD_EXTENSION_144_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_144"" name="VK_AMD_EXTENSION_144_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_159_SPEC_VERSION"/> + <enum value=""VK_EXT_extension_159"" name="VK_EXT_EXTENSION_159_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_relaxed_block_layout" number="145" author="KHR" contact="John Kessenich @johnk" supported="disabled"> + <extension name="VK_EXT_extension_160" number="160" author="EXT" contact="Mark Young @marky-lunarg" supported="disabled"> <require> - <enum value="0" name="VK_KHR_relaxed_block_layout_SPEC_VERSION"/> - <enum value=""VK_KHR_relaxed_block_layout"" name="VK_KHR_relaxed_block_layout_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_160_SPEC_VERSION"/> + <enum value=""VK_EXT_extension_160"" name="VK_EXT_EXTENSION_160_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_146" number="146" author="KHR" contact="Bill Licea-Kane @billl" supported="disabled"> + <extension name="VK_EXT_validation_cache" number="161" type="device" author="GOOGLE" contact="Cort Stratton @cdwfs" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_extension_146_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_146"" name="VK_KHR_extension_146_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_VALIDATION_CACHE_SPEC_VERSION"/> + <enum value=""VK_EXT_validation_cache"" name="VK_EXT_VALIDATION_CACHE_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT"/> + <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_VALIDATION_CACHE_EXT" comment="VkValidationCacheEXT"/> + <enum value="VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT"/> + <type name="VkValidationCacheEXT"/> + <type name="VkValidationCacheCreateInfoEXT"/> + <type name="VkShaderModuleValidationCacheCreateInfoEXT"/> + <type name="VkValidationCacheHeaderVersionEXT"/> + <type name="VkValidationCacheCreateFlagsEXT"/> + <command name="vkCreateValidationCacheEXT"/> + <command name="vkDestroyValidationCacheEXT"/> + <command name="vkMergeValidationCachesEXT"/> + <command name="vkGetValidationCacheDataEXT"/> </require> </extension> - <extension name="VK_KHR_extension_147" number="147" author="KHR" contact="Jason Ekstrand @jekstrand" supported="disabled"> + <extension name="VK_EXT_descriptor_indexing" number="162" type="device" requires="VK_KHR_get_physical_device_properties2,VK_KHR_maintenance3" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_extension_147_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_147"" name="VK_KHR_extension_147_EXTENSION_NAME"/> + <enum value="2" name="VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION"/> + <enum value=""VK_EXT_descriptor_indexing"" name="VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT"/> + <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT"/> + <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT"/> + <enum bitpos="1" extends="VkDescriptorPoolCreateFlagBits" name="VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT"/> + <enum bitpos="1" extends="VkDescriptorSetLayoutCreateFlagBits" name="VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT"/> + <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_FRAGMENTATION_EXT"/> + <type name="VkDescriptorSetLayoutBindingFlagsCreateInfoEXT"/> + <type name="VkPhysicalDeviceDescriptorIndexingFeaturesEXT"/> + <type name="VkPhysicalDeviceDescriptorIndexingPropertiesEXT"/> + <type name="VkDescriptorSetVariableDescriptorCountAllocateInfoEXT"/> + <type name="VkDescriptorSetVariableDescriptorCountLayoutSupportEXT"/> </require> </extension> - <extension name="VK_EXT_extension_148" number="148" author="EXT" contact="Jason Ekstrand @jekstrand" supported="disabled"> + <extension name="VK_EXT_shader_viewport_index_layer" number="163" type="device" author="NV" contact="Daniel Koch @dgkoch" supported="vulkan"> <require> - <enum value="0" name="VK_KHR_EXTENSION_148_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_148"" name="VK_KHR_EXTENSION_148_EXTENSION_NAME"/> + <enum value="1" name="VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_SPEC_VERSION"/> + <enum value=""VK_EXT_shader_viewport_index_layer"" name="VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_149" number="149" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_164" number="164" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_149_SPEC_VERSION"/> - <enum value=""VK_NV_extension_149"" name="VK_NV_EXTENSION_149_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_164_SPEC_VERSION"/> + <enum value=""VK_NV_extension_164"" name="VK_EXT_EXTENSION_164_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_150" number="150" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_165" number="165" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_150_SPEC_VERSION"/> - <enum value=""VK_NV_extension_150"" name="VK_NV_EXTENSION_150_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_165_SPEC_VERSION"/> + <enum value=""VK_NV_extension_165"" name="VK_EXT_EXTENSION_165_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_151" number="151" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_166" number="166" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_151_SPEC_VERSION"/> - <enum value=""VK_NV_extension_151"" name="VK_NV_EXTENSION_151_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_166_SPEC_VERSION"/> + <enum value=""VK_NV_extension_166"" name="VK_EXT_EXTENSION_166_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_152" number="152" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_167" number="167" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_152_SPEC_VERSION"/> - <enum value=""VK_NV_extension_152"" name="VK_NV_EXTENSION_152_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_167_SPEC_VERSION"/> + <enum value=""VK_NV_extension_167"" name="VK_EXT_EXTENSION_167_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_153" number="153" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_NV_extension_168" number="168" author="NV" contact="Daniel Koch @dgkoch" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_153_SPEC_VERSION"/> - <enum value=""VK_NV_extension_153"" name="VK_NV_EXTENSION_153_EXTENSION_NAME"/> + <enum value="0" name="VK_EXT_EXTENSION_168_SPEC_VERSION"/> + <enum value=""VK_NV_extension_168"" name="VK_EXT_EXTENSION_168_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_NV_extension_154" number="154" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_KHR_maintenance3" number="169" type="device" requires="VK_KHR_get_physical_device_properties2" author="KHR" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> <require> - <enum value="0" name="VK_NV_EXTENSION_154_SPEC_VERSION"/> - <enum value=""VK_NV_extension_154"" name="VK_NV_EXTENSION_154_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_MAINTENANCE3_SPEC_VERSION"/> + <enum value=""VK_KHR_maintenance3"" name="VK_KHR_MAINTENANCE3_EXTENSION_NAME"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR" alias="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES"/> + <enum extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR" alias="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT"/> + <type name="VkPhysicalDeviceMaintenance3PropertiesKHR"/> + <type name="VkDescriptorSetLayoutSupportKHR"/> + <command name="vkGetDescriptorSetLayoutSupportKHR"/> </require> </extension> - <extension name="VK_NV_extension_155" number="155" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_KHR_draw_indirect_count" number="170" type="device" author="KHR" contact="Piers Daniell @pdaniell-nv" supported="vulkan"> <require> - <enum value="0" name="VK_NV_EXTENSION_155_SPEC_VERSION"/> - <enum value=""VK_NV_extension_155"" name="VK_NV_EXTENSION_155_EXTENSION_NAME"/> + <enum value="1" name="VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION"/> + <enum value=""VK_KHR_draw_indirect_count"" name="VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME"/> + <command name="vkCmdDrawIndirectCountKHR"/> + <command name="vkCmdDrawIndexedIndirectCountKHR"/> </require> </extension> - <extension name="VK_NV_extension_156" number="156" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> + <extension name="VK_QCOM_extension_171" number="171" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled"> <require> - <enum value="0" name="VK_NV_EXTENSION_156_SPEC_VERSION"/> - <enum value=""VK_NV_extension_156"" name="VK_NV_EXTENSION_156_EXTENSION_NAME"/> + <enum value="0" name="VK_QCOM_extension_171_SPEC_VERSION"/> + <enum value=""VK_QCOM_extension_171"" name="VK_QCOM_extension_171_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_157" number="157" author="KHR" contact="Andrew Garrard @fluppeteer" supported="disabled"> + <extension name="VK_QCOM_extension_172" number="172" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_157_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_157"" name="VK_KHR_EXTENSION_157_EXTENSION_NAME"/> + <enum value="0" name="VK_QCOM_extension_172_SPEC_VERSION"/> + <enum value=""VK_QCOM_extension_172"" name="VK_QCOM_extension_172_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_KHR_extension_158" number="158" author="KHR" contact="Tobias Hector @tobias" supported="disabled"> + <extension name="VK_QCOM_extension_173" number="173" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled"> <require> - <enum value="0" name="VK_KHR_EXTENSION_158_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_158"" name="VK_KHR_EXTENSION_158_EXTENSION_NAME"/> + <enum value="0" name="VK_QCOM_extension_173_SPEC_VERSION"/> + <enum value=""VK_QCOM_extension_173"" name="VK_QCOM_extension_173_EXTENSION_NAME"/> </require> </extension> - <extension name="VK_EXT_extension_159" number="159" author="EXT" contact="Chad Versace @chadversary" supported="disabled"> + <extension name="VK_QCOM_extension_174" number="174" author="QCOM" contact="Bill Licea-Kane @wwlk" supported="disabled"> + <require> + <enum value="0" name="VK_QCOM_extension_174_SPEC_VERSION"/> + <enum value=""VK_QCOM_extension_174"" name="VK_QCOM_extension_174_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_global_priority" number="175" type="device" author="EXT" contact="Andres Rodriguez @lostgoat" supported="vulkan"> + <require> + <enum value="2" name="VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION"/> + <enum value=""VK_EXT_global_priority"" name="VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT"/> + <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_NOT_PERMITTED_EXT"/> + <type name="VkDeviceQueueGlobalPriorityCreateInfoEXT"/> + <type name="VkQueueGlobalPriorityEXT"/> + </require> + </extension> + <extension name="VK_EXT_extension_176" number="176" author="EXT" contact="Neil Henning @sheredom" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_176_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_176"" name="VK_KHR_EXTENSION_176_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_extension_177" number="177" author="EXT" contact="Neil Henning @sheredom" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_177_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_177"" name="VK_KHR_EXTENSION_177_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_extension_178" number="178" author="EXT" contact="Alexander Galazin @alegal-arm" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_178_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_178"" name="VK_KHR_EXTENSION_178_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_external_memory_host" number="179" type="device" author="EXT" requires="VK_KHR_external_memory" contact="Daniel Rakos @drakos-amd" supported="vulkan"> + <require> + <enum value="1" name="VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION"/> + <enum value=""VK_EXT_external_memory_host"" name="VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT"/> + <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT"/> + <enum bitpos="7" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT"/> + <enum bitpos="8" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT"/> + <type name="VkExternalMemoryHandleTypeFlagsKHR"/> + <type name="VkExternalMemoryHandleTypeFlagBitsKHR"/> + <type name="VkImportMemoryHostPointerInfoEXT"/> + <type name="VkMemoryHostPointerPropertiesEXT"/> + <type name="VkPhysicalDeviceExternalMemoryHostPropertiesEXT"/> + <command name="vkGetMemoryHostPointerPropertiesEXT"/> + </require> + </extension> + <extension name="VK_AMD_buffer_marker" number="180" type="device" author="AMD" contact="Daniel Rakos @drakos-amd" supported="vulkan"> + <require> + <enum value="1" name="VK_AMD_BUFFER_MARKER_SPEC_VERSION"/> + <enum value=""VK_AMD_buffer_marker"" name="VK_AMD_BUFFER_MARKER_EXTENSION_NAME"/> + <command name="vkCmdWriteBufferMarkerAMD"/> + </require> + </extension> + <extension name="VK_AMD_extension_181" number="181" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_181_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_181"" name="VK_KHR_EXTENSION_181_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_182" number="182" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_182_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_182"" name="VK_KHR_EXTENSION_182_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_183" number="183" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_183_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_183"" name="VK_KHR_EXTENSION_183_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_184" number="184" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_184_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_184"" name="VK_KHR_EXTENSION_184_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_185" number="185" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_185_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_185"" name="VK_KHR_EXTENSION_185_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_shader_core_properties" number="186" type="device" author="AMD" requires="VK_KHR_get_physical_device_properties2" contact="Martin Dinkov @mdinkov" supported="vulkan"> + <require> + <enum value="1" name="VK_AMD_SHADER_CORE_PROPERTIES_SPEC_VERSION"/> + <enum value=""VK_AMD_shader_core_properties"" name="VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD"/> + <type name="VkPhysicalDeviceShaderCorePropertiesAMD"/> + </require> + </extension> + <extension name="VK_AMD_extension_187" number="187" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_187_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_187"" name="VK_KHR_EXTENSION_187_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_188" number="188" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_188_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_188"" name="VK_KHR_EXTENSION_188_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_189" number="189" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_189_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_189"" name="VK_KHR_EXTENSION_189_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_AMD_extension_190" number="190" author="AMD" contact="Daniel Rakos @drakos-amd" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_190_SPEC_VERSION"/> + <enum value=""VK_AMD_extension_190"" name="VK_KHR_EXTENSION_190_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_vertex_attribute_divisor" number="191" type="device" requires="VK_KHR_get_physical_device_properties2" author="NV" contact="Vikram Kushwaha @vkushwaha" supported="vulkan"> + <require> + <enum value="1" name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION"/> + <enum value=""VK_EXT_vertex_attribute_divisor"" name="VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME"/> + <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT"/> + <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT"/> + <type name="VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT"/> + <type name="VkVertexInputBindingDivisorDescriptionEXT"/> + <type name="VkPipelineVertexInputDivisorStateCreateInfoEXT"/> + </require> + </extension> + <extension name="VK_GOOGLE_extension_192" number="192" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> + <require> + <enum value="0" name="VK_GOOGLE_EXTENSION_192_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_192"" name="VK_GOOGLE_EXTENSION_192_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_GOOGLE_extension_193" number="193" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> + <require> + <enum value="0" name="VK_GOOGLE_EXTENSION_193_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_193"" name="VK_GOOGLE_EXTENSION_193_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_GOOGLE_extension_194" number="194" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> + <require> + <enum value="0" name="VK_GOOGLE_EXTENSION_194_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_194"" name="VK_GOOGLE_EXTENSION_194_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_GOOGLE_extension_195" number="195" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> + <require> + <enum value="0" name="VK_GOOGLE_EXTENSION_195_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_195"" name="VK_GOOGLE_EXTENSION_195_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_GOOGLE_extension_196" number="196" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> + <require> + <enum value="0" name="VK_GOOGLE_EXTENSION_196_SPEC_VERSION"/> + <enum value=""VK_GOOGLE_extension_196"" name="VK_GOOGLE_EXTENSION_196_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_EXT_extension_197" number="197" author="Baldur Karlsson" contact="Baldur Karlsson @baldurk" supported="disabled"> + <require> + <enum value="0" name="VK_EXT_EXTENSION_197_SPEC_VERSION"/> + <enum value=""VK_EXT_extension_197"" name="VK_EXT_EXTENSION_197_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_ARM_extension_198" number="198" author="Alexander Galazin" contact="Alexander Galazin @alegal-arm" supported="disabled"> + <require> + <enum value="0" name="VK_ARM_EXTENSION_198_SPEC_VERSION"/> + <enum value=""VK_EXT_extension_198"" name="VK_ARM_EXTENSION_198_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_shader_subgroup_partitioned" number="199" type="device" requiresCore="1.1" author="NV" contact="Jeff Bolz @jeffbolznv" supported="vulkan"> + <require> + <enum value="1" name="VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION"/> + <enum value=""VK_NV_shader_subgroup_partitioned"" name="VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME"/> + <enum bitpos="8" extends="VkSubgroupFeatureFlagBits" name="VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV"/> + </require> + </extension> + <extension name="VK_KHR_extension_200" number="200" author="KHR" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_200_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_200"" name="VK_KHR_EXTENSION_200_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_KHR_extension_201" number="201" type="device" author="KHR" contact="Daniel Rakos @drakos-arm" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_201_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_201"" name="VK_KHR_EXTENSION_201_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_202" number="202" author="NV" contact="Pat Brown @nvpbrown" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_202_SPEC_VERSION"/> + <enum value=""VK_NV_extension_202"" name="VK_NV_EXTENSION_202_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_203" number="203" author="NV" contact="Pat Brown @nvpbrown" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_203_SPEC_VERSION"/> + <enum value=""VK_NV_extension_203"" name="VK_NV_EXTENSION_203_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_204" number="204" author="NV" contact="Pat Brown @nvpbrown" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_204_SPEC_VERSION"/> + <enum value=""VK_NV_extension_204"" name="VK_NV_EXTENSION_204_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_205" number="205" author="NV" contact="Pat Brown @nvpbrown" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_205_SPEC_VERSION"/> + <enum value=""VK_NV_extension_205"" name="VK_NV_EXTENSION_205_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_206" number="206" author="NV" contact="Pat Brown @nvpbrown" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_206_SPEC_VERSION"/> + <enum value=""VK_NV_extension_206"" name="VK_NV_EXTENSION_206_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_NV_extension_207" number="207" author="NV" contact="Nuno Subtil @nsubtil" supported="disabled"> + <require> + <enum value="0" name="VK_NV_EXTENSION_207_SPEC_VERSION"/> + <enum value=""VK_NV_extension_207"" name="VK_NV_EXTENSION_207_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_KHR_extension_208" number="208" type="device" author="KHR" contact="Daniel Rakos @drakos-arm" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_208_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_208"" name="VK_KHR_EXTENSION_208_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_KHR_extension_209" number="209" type="device" author="KHR" contact="Ian Elliott @ianelliott" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_209_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_209"" name="VK_KHR_EXTENSION_209_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_INTEL_extension_210" number="210" type="device" author="INTEL" contact="Jason Ekstrand @jekstrand" supported="disabled"> + <require> + <enum value="0" name="VK_KHR_EXTENSION_210_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_210"" name="VK_KHR_EXTENSION_210_EXTENSION_NAME"/> + </require> + </extension> + <extension name="VK_INTEL_extension_211" number="211" type="device" author="INTEL" contact="Jason Ekstrand @jekstrand" supported="disabled"> <require> - <enum value="0" name="VK_EXT_EXTENSION_159_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_159"" name="VK_EXT_EXTENSION_159_EXTENSION_NAME"/> + <enum value="0" name="VK_KHR_EXTENSION_211_SPEC_VERSION"/> + <enum value=""VK_KHR_extension_211"" name="VK_KHR_EXTENSION_211_EXTENSION_NAME"/> </require> </extension> </extensions> diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 31f78dcb3a..cdb229d7df 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -74,6 +74,60 @@ static inline void free_VkCommandBufferBeginInfo(VkCommandBufferBeginInfo_host * free_VkCommandBufferInheritanceInfo_array((VkCommandBufferInheritanceInfo_host *)in->pInheritanceInfo, 1); } +static inline VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win_to_host(const VkBindBufferMemoryInfo *in, uint32_t count) +{ + VkBindBufferMemoryInfo_host *out; + unsigned int i; + + if (!in) return NULL; + + out = heap_alloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].buffer = in[i].buffer; + out[i].memory = in[i].memory; + out[i].memoryOffset = in[i].memoryOffset; + } + + return out; +} + +static inline void free_VkBindBufferMemoryInfo_array(VkBindBufferMemoryInfo_host *in, uint32_t count) +{ + if (!in) return; + + heap_free(in); +} + +static inline VkBindImageMemoryInfo_host *convert_VkBindImageMemoryInfo_array_win_to_host(const VkBindImageMemoryInfo *in, uint32_t count) +{ + VkBindImageMemoryInfo_host *out; + unsigned int i; + + if (!in) return NULL; + + out = heap_alloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].image = in[i].image; + out[i].memory = in[i].memory; + out[i].memoryOffset = in[i].memoryOffset; + } + + return out; +} + +static inline void free_VkBindImageMemoryInfo_array(VkBindImageMemoryInfo_host *in, uint32_t count) +{ + if (!in) return; + + heap_free(in); +} + static inline void convert_VkRenderPassBeginInfo_win_to_host(const VkRenderPassBeginInfo *in, VkRenderPassBeginInfo_host *out) { if (!in) return; @@ -361,7 +415,7 @@ static inline void free_VkComputePipelineCreateInfo_array(VkComputePipelineCreat heap_free(in); } -static inline void convert_VkDescriptorUpdateTemplateCreateInfoKHR_win_to_host(const VkDescriptorUpdateTemplateCreateInfoKHR *in, VkDescriptorUpdateTemplateCreateInfoKHR_host *out) +static inline void convert_VkDescriptorUpdateTemplateCreateInfo_win_to_host(const VkDescriptorUpdateTemplateCreateInfo *in, VkDescriptorUpdateTemplateCreateInfo_host *out) { if (!in) return; @@ -542,6 +596,50 @@ static inline void convert_VkMemoryRequirements_host_to_win(const VkMemoryRequir out->memoryTypeBits = in->memoryTypeBits; } +static inline void convert_VkBufferMemoryRequirementsInfo2_win_to_host(const VkBufferMemoryRequirementsInfo2 *in, VkBufferMemoryRequirementsInfo2_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->buffer = in->buffer; +} + +static inline void convert_VkMemoryRequirements2_win_to_host(const VkMemoryRequirements2 *in, VkMemoryRequirements2_host *out) +{ + if (!in) return; + + out->pNext = in->pNext; + out->sType = in->sType; +} + +static inline void convert_VkMemoryRequirements2_host_to_win(const VkMemoryRequirements2_host *in, VkMemoryRequirements2 *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements); +} + +static inline void convert_VkImageMemoryRequirementsInfo2_win_to_host(const VkImageMemoryRequirementsInfo2 *in, VkImageMemoryRequirementsInfo2_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->image = in->image; +} + +static inline void convert_VkImageSparseMemoryRequirementsInfo2_win_to_host(const VkImageSparseMemoryRequirementsInfo2 *in, VkImageSparseMemoryRequirementsInfo2_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->image = in->image; +} + static inline void convert_VkSubresourceLayout_host_to_win(const VkSubresourceLayout_host *in, VkSubresourceLayout *out) { if (!in) return; @@ -564,7 +662,7 @@ static inline void convert_VkImageFormatProperties_host_to_win(const VkImageForm out->maxResourceSize = in->maxResourceSize; } -static inline void convert_VkImageFormatProperties2KHR_win_to_host(const VkImageFormatProperties2KHR *in, VkImageFormatProperties2KHR_host *out) +static inline void convert_VkImageFormatProperties2_win_to_host(const VkImageFormatProperties2 *in, VkImageFormatProperties2_host *out) { if (!in) return; @@ -572,7 +670,7 @@ static inline void convert_VkImageFormatProperties2KHR_win_to_host(const VkImage out->sType = in->sType; } -static inline void convert_VkImageFormatProperties2KHR_host_to_win(const VkImageFormatProperties2KHR_host *in, VkImageFormatProperties2KHR *out) +static inline void convert_VkImageFormatProperties2_host_to_win(const VkImageFormatProperties2_host *in, VkImageFormatProperties2 *out) { if (!in) return; @@ -604,7 +702,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win(const Vk convert_VkMemoryHeap_static_array_host_to_win(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS); } -static inline void convert_VkPhysicalDeviceMemoryProperties2KHR_win_to_host(const VkPhysicalDeviceMemoryProperties2KHR *in, VkPhysicalDeviceMemoryProperties2KHR_host *out) +static inline void convert_VkPhysicalDeviceMemoryProperties2_win_to_host(const VkPhysicalDeviceMemoryProperties2 *in, VkPhysicalDeviceMemoryProperties2_host *out) { if (!in) return; @@ -612,7 +710,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties2KHR_win_to_host(cons out->sType = in->sType; } -static inline void convert_VkPhysicalDeviceMemoryProperties2KHR_host_to_win(const VkPhysicalDeviceMemoryProperties2KHR_host *in, VkPhysicalDeviceMemoryProperties2KHR *out) +static inline void convert_VkPhysicalDeviceMemoryProperties2_host_to_win(const VkPhysicalDeviceMemoryProperties2_host *in, VkPhysicalDeviceMemoryProperties2 *out) { if (!in) return; @@ -748,7 +846,7 @@ static inline void convert_VkPhysicalDeviceProperties_host_to_win(const VkPhysic out->sparseProperties = in->sparseProperties; } -static inline void convert_VkPhysicalDeviceProperties2KHR_win_to_host(const VkPhysicalDeviceProperties2KHR *in, VkPhysicalDeviceProperties2KHR_host *out) +static inline void convert_VkPhysicalDeviceProperties2_win_to_host(const VkPhysicalDeviceProperties2 *in, VkPhysicalDeviceProperties2_host *out) { if (!in) return; @@ -756,7 +854,7 @@ static inline void convert_VkPhysicalDeviceProperties2KHR_win_to_host(const VkPh out->sType = in->sType; } -static inline void convert_VkPhysicalDeviceProperties2KHR_host_to_win(const VkPhysicalDeviceProperties2KHR_host *in, VkPhysicalDeviceProperties2KHR *out) +static inline void convert_VkPhysicalDeviceProperties2_host_to_win(const VkPhysicalDeviceProperties2_host *in, VkPhysicalDeviceProperties2 *out) { if (!in) return; @@ -1052,12 +1150,48 @@ VkResult WINAPI wine_vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDevi return device->funcs.p_vkBindBufferMemory(device->device, buffer, memory, memoryOffset); } +static VkResult WINAPI wine_vkBindBufferMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos) +{ +#if defined(USE_STRUCT_CONVERSION) + VkResult result; + VkBindBufferMemoryInfo_host *pBindInfos_host; + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + + pBindInfos_host = convert_VkBindBufferMemoryInfo_array_win_to_host(pBindInfos, bindInfoCount); + result = device->funcs.p_vkBindBufferMemory2KHR(device->device, bindInfoCount, pBindInfos_host); + + free_VkBindBufferMemoryInfo_array(pBindInfos_host, bindInfoCount); + return result; +#else + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + return device->funcs.p_vkBindBufferMemory2KHR(device->device, bindInfoCount, pBindInfos); +#endif +} + VkResult WINAPI wine_vkBindImageMemory(VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset) { TRACE("%p, 0x%s, 0x%s, 0x%s\n", device, wine_dbgstr_longlong(image), wine_dbgstr_longlong(memory), wine_dbgstr_longlong(memoryOffset)); return device->funcs.p_vkBindImageMemory(device->device, image, memory, memoryOffset); } +static VkResult WINAPI wine_vkBindImageMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos) +{ +#if defined(USE_STRUCT_CONVERSION) + VkResult result; + VkBindImageMemoryInfo_host *pBindInfos_host; + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + + pBindInfos_host = convert_VkBindImageMemoryInfo_array_win_to_host(pBindInfos, bindInfoCount); + result = device->funcs.p_vkBindImageMemory2KHR(device->device, bindInfoCount, pBindInfos_host); + + free_VkBindImageMemoryInfo_array(pBindInfos_host, bindInfoCount); + return result; +#else + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + return device->funcs.p_vkBindImageMemory2KHR(device->device, bindInfoCount, pBindInfos); +#endif +} + void WINAPI wine_vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) { TRACE("%p, 0x%s, %u, %#x\n", commandBuffer, wine_dbgstr_longlong(queryPool), query, flags); @@ -1223,6 +1357,12 @@ static void WINAPI wine_vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer command commandBuffer->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride); } +static void WINAPI wine_vkCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) +{ + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride); + commandBuffer->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride); +} + void WINAPI wine_vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { TRACE("%p, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), drawCount, stride); @@ -1235,6 +1375,12 @@ static void WINAPI wine_vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, commandBuffer->device->funcs.p_vkCmdDrawIndirectCountAMD(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride); } +static void WINAPI wine_vkCmdDrawIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) +{ + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride); + commandBuffer->device->funcs.p_vkCmdDrawIndirectCountKHR(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride); +} + void WINAPI wine_vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) { TRACE("%p, 0x%s, %u\n", commandBuffer, wine_dbgstr_longlong(queryPool), query); @@ -1300,7 +1446,7 @@ static void WINAPI wine_vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, #endif } -static void WINAPI wine_vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData) +static void WINAPI wine_vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData) { TRACE("%p, 0x%s, 0x%s, %u, %p\n", commandBuffer, wine_dbgstr_longlong(descriptorUpdateTemplate), wine_dbgstr_longlong(layout), set, pData); commandBuffer->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(commandBuffer->command_buffer, descriptorUpdateTemplate, layout, set, pData); @@ -1360,6 +1506,12 @@ void WINAPI wine_vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidt commandBuffer->device->funcs.p_vkCmdSetLineWidth(commandBuffer->command_buffer, lineWidth); } +static void WINAPI wine_vkCmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT *pSampleLocationsInfo) +{ + TRACE("%p, %p\n", commandBuffer, pSampleLocationsInfo); + commandBuffer->device->funcs.p_vkCmdSetSampleLocationsEXT(commandBuffer->command_buffer, pSampleLocationsInfo); +} + void WINAPI wine_vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors) { TRACE("%p, %u, %u, %p\n", commandBuffer, firstScissor, scissorCount, pScissors); @@ -1421,6 +1573,12 @@ void WINAPI wine_vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCo #endif } +static void WINAPI wine_vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) +{ + TRACE("%p, %#x, 0x%s, 0x%s, %u\n", commandBuffer, pipelineStage, wine_dbgstr_longlong(dstBuffer), wine_dbgstr_longlong(dstOffset), marker); + commandBuffer->device->funcs.p_vkCmdWriteBufferMarkerAMD(commandBuffer->command_buffer, pipelineStage, dstBuffer, dstOffset, marker); +} + void WINAPI wine_vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) { TRACE("%p, %#x, 0x%s, %u\n", commandBuffer, pipelineStage, wine_dbgstr_longlong(queryPool), query); @@ -1497,14 +1655,14 @@ VkResult WINAPI wine_vkCreateDescriptorSetLayout(VkDevice device, const VkDescri return device->funcs.p_vkCreateDescriptorSetLayout(device->device, pCreateInfo, NULL, pSetLayout); } -static VkResult WINAPI wine_vkCreateDescriptorUpdateTemplateKHR(VkDevice device, const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate) +static VkResult WINAPI wine_vkCreateDescriptorUpdateTemplateKHR(VkDevice device, const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate) { #if defined(USE_STRUCT_CONVERSION) VkResult result; - VkDescriptorUpdateTemplateCreateInfoKHR_host pCreateInfo_host; + VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate); - convert_VkDescriptorUpdateTemplateCreateInfoKHR_win_to_host(pCreateInfo, &pCreateInfo_host); + convert_VkDescriptorUpdateTemplateCreateInfo_win_to_host(pCreateInfo, &pCreateInfo_host); result = device->funcs.p_vkCreateDescriptorUpdateTemplateKHR(device->device, &pCreateInfo_host, NULL, pDescriptorUpdateTemplate); return result; @@ -1614,6 +1772,12 @@ VkResult WINAPI wine_vkCreateSampler(VkDevice device, const VkSamplerCreateInfo return device->funcs.p_vkCreateSampler(device->device, pCreateInfo, NULL, pSampler); } +static VkResult WINAPI wine_vkCreateSamplerYcbcrConversionKHR(VkDevice device, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSamplerYcbcrConversion *pYcbcrConversion) +{ + TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pYcbcrConversion); + return device->funcs.p_vkCreateSamplerYcbcrConversionKHR(device->device, pCreateInfo, NULL, pYcbcrConversion); +} + VkResult WINAPI wine_vkCreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSemaphore *pSemaphore) { TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pSemaphore); @@ -1643,6 +1807,12 @@ VkResult WINAPI wine_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCrea #endif } +static VkResult WINAPI wine_vkCreateValidationCacheEXT(VkDevice device, const VkValidationCacheCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkValidationCacheEXT *pValidationCache) +{ + TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pValidationCache); + return device->funcs.p_vkCreateValidationCacheEXT(device->device, pCreateInfo, NULL, pValidationCache); +} + VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) { TRACE("%p, %p, %p, %p\n", instance, pCreateInfo, pAllocator, pSurface); @@ -1679,7 +1849,7 @@ void WINAPI wine_vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLa device->funcs.p_vkDestroyDescriptorSetLayout(device->device, descriptorSetLayout, NULL); } -static void WINAPI wine_vkDestroyDescriptorUpdateTemplateKHR(VkDevice device, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, const VkAllocationCallbacks *pAllocator) +static void WINAPI wine_vkDestroyDescriptorUpdateTemplateKHR(VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks *pAllocator) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(descriptorUpdateTemplate), pAllocator); device->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(device->device, descriptorUpdateTemplate, NULL); @@ -1751,6 +1921,12 @@ void WINAPI wine_vkDestroySampler(VkDevice device, VkSampler sampler, const VkAl device->funcs.p_vkDestroySampler(device->device, sampler, NULL); } +static void WINAPI wine_vkDestroySamplerYcbcrConversionKHR(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks *pAllocator) +{ + TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(ycbcrConversion), pAllocator); + device->funcs.p_vkDestroySamplerYcbcrConversionKHR(device->device, ycbcrConversion, NULL); +} + void WINAPI wine_vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks *pAllocator) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(semaphore), pAllocator); @@ -1775,6 +1951,12 @@ void WINAPI wine_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain device->funcs.p_vkDestroySwapchainKHR(device->device, swapchain, NULL); } +static void WINAPI wine_vkDestroyValidationCacheEXT(VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks *pAllocator) +{ + TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(validationCache), pAllocator); + device->funcs.p_vkDestroyValidationCacheEXT(device->device, validationCache, NULL); +} + VkResult WINAPI wine_vkDeviceWaitIdle(VkDevice device) { TRACE("%p\n", device); @@ -1838,6 +2020,30 @@ void WINAPI wine_vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, #endif } +static void WINAPI wine_vkGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) +{ +#if defined(USE_STRUCT_CONVERSION) + VkBufferMemoryRequirementsInfo2_host pInfo_host; + VkMemoryRequirements2_host pMemoryRequirements_host; + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + + convert_VkBufferMemoryRequirementsInfo2_win_to_host(pInfo, &pInfo_host); + convert_VkMemoryRequirements2_win_to_host(pMemoryRequirements, &pMemoryRequirements_host); + device->funcs.p_vkGetBufferMemoryRequirements2KHR(device->device, &pInfo_host, &pMemoryRequirements_host); + + convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, pMemoryRequirements); +#else + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + device->funcs.p_vkGetBufferMemoryRequirements2KHR(device->device, pInfo, pMemoryRequirements); +#endif +} + +static void WINAPI wine_vkGetDescriptorSetLayoutSupportKHR(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, VkDescriptorSetLayoutSupport *pSupport) +{ + TRACE("%p, %p, %p\n", device, pCreateInfo, pSupport); + device->funcs.p_vkGetDescriptorSetLayoutSupportKHR(device->device, pCreateInfo, pSupport); +} + void WINAPI wine_vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(memory), pCommittedMemoryInBytes); @@ -1871,12 +2077,45 @@ void WINAPI wine_vkGetImageMemoryRequirements(VkDevice device, VkImage image, Vk #endif } +static void WINAPI wine_vkGetImageMemoryRequirements2KHR(VkDevice device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) +{ +#if defined(USE_STRUCT_CONVERSION) + VkImageMemoryRequirementsInfo2_host pInfo_host; + VkMemoryRequirements2_host pMemoryRequirements_host; + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + + convert_VkImageMemoryRequirementsInfo2_win_to_host(pInfo, &pInfo_host); + convert_VkMemoryRequirements2_win_to_host(pMemoryRequirements, &pMemoryRequirements_host); + device->funcs.p_vkGetImageMemoryRequirements2KHR(device->device, &pInfo_host, &pMemoryRequirements_host); + + convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, pMemoryRequirements); +#else + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + device->funcs.p_vkGetImageMemoryRequirements2KHR(device->device, pInfo, pMemoryRequirements); +#endif +} + void WINAPI wine_vkGetImageSparseMemoryRequirements(VkDevice device, VkImage image, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements *pSparseMemoryRequirements) { TRACE("%p, 0x%s, %p, %p\n", device, wine_dbgstr_longlong(image), pSparseMemoryRequirementCount, pSparseMemoryRequirements); device->funcs.p_vkGetImageSparseMemoryRequirements(device->device, image, pSparseMemoryRequirementCount, pSparseMemoryRequirements); } +static void WINAPI wine_vkGetImageSparseMemoryRequirements2KHR(VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements) +{ +#if defined(USE_STRUCT_CONVERSION) + VkImageSparseMemoryRequirementsInfo2_host pInfo_host; + TRACE("%p, %p, %p, %p\n", device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); + + convert_VkImageSparseMemoryRequirementsInfo2_win_to_host(pInfo, &pInfo_host); + device->funcs.p_vkGetImageSparseMemoryRequirements2KHR(device->device, &pInfo_host, pSparseMemoryRequirementCount, pSparseMemoryRequirements); + +#else + TRACE("%p, %p, %p, %p\n", device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); + device->funcs.p_vkGetImageSparseMemoryRequirements2KHR(device->device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); +#endif +} + void WINAPI wine_vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout) { #if defined(USE_STRUCT_CONVERSION) @@ -1898,7 +2137,7 @@ void WINAPI wine_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, Vk physicalDevice->instance->funcs.p_vkGetPhysicalDeviceFeatures(physicalDevice->phys_dev, pFeatures); } -static void WINAPI wine_vkGetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2KHR *pFeatures) +static void WINAPI wine_vkGetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 *pFeatures) { TRACE("%p, %p\n", physicalDevice, pFeatures); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(physicalDevice->phys_dev, pFeatures); @@ -1910,7 +2149,7 @@ void WINAPI wine_vkGetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDe physicalDevice->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(physicalDevice->phys_dev, format, pFormatProperties); } -static void WINAPI wine_vkGetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2KHR *pFormatProperties) +static void WINAPI wine_vkGetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2 *pFormatProperties) { TRACE("%p, %#x, %p\n", physicalDevice, format, pFormatProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(physicalDevice->phys_dev, format, pFormatProperties); @@ -1933,17 +2172,17 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties(VkPhysicalDevice p #endif } -static VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR *pImageFormatInfo, VkImageFormatProperties2KHR *pImageFormatProperties) +static VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) { #if defined(USE_STRUCT_CONVERSION) VkResult result; - VkImageFormatProperties2KHR_host pImageFormatProperties_host; + VkImageFormatProperties2_host pImageFormatProperties_host; TRACE("%p, %p, %p\n", physicalDevice, pImageFormatInfo, pImageFormatProperties); - convert_VkImageFormatProperties2KHR_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); + convert_VkImageFormatProperties2_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); result = physicalDevice->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(physicalDevice->phys_dev, pImageFormatInfo, &pImageFormatProperties_host); - convert_VkImageFormatProperties2KHR_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); + convert_VkImageFormatProperties2_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); return result; #else TRACE("%p, %p, %p\n", physicalDevice, pImageFormatInfo, pImageFormatProperties); @@ -1966,22 +2205,28 @@ void WINAPI wine_vkGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDe #endif } -static void WINAPI wine_vkGetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2KHR *pMemoryProperties) +static void WINAPI wine_vkGetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) { #if defined(USE_STRUCT_CONVERSION) - VkPhysicalDeviceMemoryProperties2KHR_host pMemoryProperties_host; + VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host; TRACE("%p, %p\n", physicalDevice, pMemoryProperties); - convert_VkPhysicalDeviceMemoryProperties2KHR_win_to_host(pMemoryProperties, &pMemoryProperties_host); + convert_VkPhysicalDeviceMemoryProperties2_win_to_host(pMemoryProperties, &pMemoryProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(physicalDevice->phys_dev, &pMemoryProperties_host); - convert_VkPhysicalDeviceMemoryProperties2KHR_host_to_win(&pMemoryProperties_host, pMemoryProperties); + convert_VkPhysicalDeviceMemoryProperties2_host_to_win(&pMemoryProperties_host, pMemoryProperties); #else TRACE("%p, %p\n", physicalDevice, pMemoryProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(physicalDevice->phys_dev, pMemoryProperties); #endif } +static void WINAPI wine_vkGetPhysicalDeviceMultisamplePropertiesEXT(VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT *pMultisampleProperties) +{ + TRACE("%p, %#x, %p\n", physicalDevice, samples, pMultisampleProperties); + physicalDevice->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(physicalDevice->phys_dev, samples, pMultisampleProperties); +} + void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties *pProperties) { #if defined(USE_STRUCT_CONVERSION) @@ -1997,16 +2242,16 @@ void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, #endif } -static void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHR *pProperties) +static void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) - VkPhysicalDeviceProperties2KHR_host pProperties_host; + VkPhysicalDeviceProperties2_host pProperties_host; TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2KHR_win_to_host(pProperties, &pProperties_host); + convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, &pProperties_host); - convert_VkPhysicalDeviceProperties2KHR_host_to_win(&pProperties_host, pProperties); + convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, pProperties); @@ -2019,7 +2264,7 @@ void WINAPI wine_vkGetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physi physicalDevice->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice->phys_dev, pQueueFamilyPropertyCount, pQueueFamilyProperties); } -static void WINAPI wine_vkGetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2KHR *pQueueFamilyProperties) +static void WINAPI wine_vkGetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2 *pQueueFamilyProperties) { TRACE("%p, %p, %p\n", physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(physicalDevice->phys_dev, pQueueFamilyPropertyCount, pQueueFamilyProperties); @@ -2031,7 +2276,7 @@ void WINAPI wine_vkGetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(physicalDevice->phys_dev, format, type, samples, usage, tiling, pPropertyCount, pProperties); } -static void WINAPI wine_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR *pFormatInfo, uint32_t *pPropertyCount, VkSparseImageFormatProperties2KHR *pProperties) +static void WINAPI wine_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, uint32_t *pPropertyCount, VkSparseImageFormatProperties2 *pProperties) { TRACE("%p, %p, %p, %p\n", physicalDevice, pFormatInfo, pPropertyCount, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(physicalDevice->phys_dev, pFormatInfo, pPropertyCount, pProperties); @@ -2085,12 +2330,24 @@ void WINAPI wine_vkGetRenderAreaGranularity(VkDevice device, VkRenderPass render device->funcs.p_vkGetRenderAreaGranularity(device->device, renderPass, pGranularity); } +static VkResult WINAPI wine_vkGetShaderInfoAMD(VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, size_t *pInfoSize, void *pInfo) +{ + TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", device, wine_dbgstr_longlong(pipeline), shaderStage, infoType, pInfoSize, pInfo); + return device->funcs.p_vkGetShaderInfoAMD(device->device, pipeline, shaderStage, infoType, pInfoSize, pInfo); +} + VkResult WINAPI wine_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) { TRACE("%p, 0x%s, %p, %p\n", device, wine_dbgstr_longlong(swapchain), pSwapchainImageCount, pSwapchainImages); return device->funcs.p_vkGetSwapchainImagesKHR(device->device, swapchain, pSwapchainImageCount, pSwapchainImages); } +static VkResult WINAPI wine_vkGetValidationCacheDataEXT(VkDevice device, VkValidationCacheEXT validationCache, size_t *pDataSize, void *pData) +{ + TRACE("%p, 0x%s, %p, %p\n", device, wine_dbgstr_longlong(validationCache), pDataSize, pData); + return device->funcs.p_vkGetValidationCacheDataEXT(device->device, validationCache, pDataSize, pData); +} + VkResult WINAPI wine_vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) { #if defined(USE_STRUCT_CONVERSION) @@ -2121,6 +2378,12 @@ VkResult WINAPI wine_vkMergePipelineCaches(VkDevice device, VkPipelineCache dstC return device->funcs.p_vkMergePipelineCaches(device->device, dstCache, srcCacheCount, pSrcCaches); } +static VkResult WINAPI wine_vkMergeValidationCachesEXT(VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT *pSrcCaches) +{ + TRACE("%p, 0x%s, %u, %p\n", device, wine_dbgstr_longlong(dstCache), srcCacheCount, pSrcCaches); + return device->funcs.p_vkMergeValidationCachesEXT(device->device, dstCache, srcCacheCount, pSrcCaches); +} + VkResult WINAPI wine_vkQueueBindSparse(VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo *pBindInfo, VkFence fence) { #if defined(USE_STRUCT_CONVERSION) @@ -2187,7 +2450,7 @@ VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) return device->funcs.p_vkSetEvent(device->device, event); } -static void WINAPI wine_vkTrimCommandPoolKHR(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlagsKHR flags) +static void WINAPI wine_vkTrimCommandPoolKHR(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) { TRACE("%p, 0x%s, %#x\n", device, wine_dbgstr_longlong(commandPool), flags); device->funcs.p_vkTrimCommandPoolKHR(device->device, commandPool, flags); @@ -2199,7 +2462,7 @@ void WINAPI wine_vkUnmapMemory(VkDevice device, VkDeviceMemory memory) device->funcs.p_vkUnmapMemory(device->device, memory); } -static void WINAPI wine_vkUpdateDescriptorSetWithTemplateKHR(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, const void *pData) +static void WINAPI wine_vkUpdateDescriptorSetWithTemplateKHR(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *pData) { TRACE("%p, 0x%s, 0x%s, %p\n", device, wine_dbgstr_longlong(descriptorSet), wine_dbgstr_longlong(descriptorUpdateTemplate), pData); device->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(device->device, descriptorSet, descriptorUpdateTemplate, pData); @@ -2238,7 +2501,9 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkAllocateMemory", &wine_vkAllocateMemory}, {"vkBeginCommandBuffer", &wine_vkBeginCommandBuffer}, {"vkBindBufferMemory", &wine_vkBindBufferMemory}, + {"vkBindBufferMemory2KHR", &wine_vkBindBufferMemory2KHR}, {"vkBindImageMemory", &wine_vkBindImageMemory}, + {"vkBindImageMemory2KHR", &wine_vkBindImageMemory2KHR}, {"vkCmdBeginQuery", &wine_vkCmdBeginQuery}, {"vkCmdBeginRenderPass", &wine_vkCmdBeginRenderPass}, {"vkCmdBindDescriptorSets", &wine_vkCmdBindDescriptorSets}, @@ -2260,8 +2525,10 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdDrawIndexed", &wine_vkCmdDrawIndexed}, {"vkCmdDrawIndexedIndirect", &wine_vkCmdDrawIndexedIndirect}, {"vkCmdDrawIndexedIndirectCountAMD", &wine_vkCmdDrawIndexedIndirectCountAMD}, + {"vkCmdDrawIndexedIndirectCountKHR", &wine_vkCmdDrawIndexedIndirectCountKHR}, {"vkCmdDrawIndirect", &wine_vkCmdDrawIndirect}, {"vkCmdDrawIndirectCountAMD", &wine_vkCmdDrawIndirectCountAMD}, + {"vkCmdDrawIndirectCountKHR", &wine_vkCmdDrawIndirectCountKHR}, {"vkCmdEndQuery", &wine_vkCmdEndQuery}, {"vkCmdEndRenderPass", &wine_vkCmdEndRenderPass}, {"vkCmdExecuteCommands", &wine_vkCmdExecuteCommands}, @@ -2280,6 +2547,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdSetDiscardRectangleEXT", &wine_vkCmdSetDiscardRectangleEXT}, {"vkCmdSetEvent", &wine_vkCmdSetEvent}, {"vkCmdSetLineWidth", &wine_vkCmdSetLineWidth}, + {"vkCmdSetSampleLocationsEXT", &wine_vkCmdSetSampleLocationsEXT}, {"vkCmdSetScissor", &wine_vkCmdSetScissor}, {"vkCmdSetStencilCompareMask", &wine_vkCmdSetStencilCompareMask}, {"vkCmdSetStencilReference", &wine_vkCmdSetStencilReference}, @@ -2288,6 +2556,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdSetViewportWScalingNV", &wine_vkCmdSetViewportWScalingNV}, {"vkCmdUpdateBuffer", &wine_vkCmdUpdateBuffer}, {"vkCmdWaitEvents", &wine_vkCmdWaitEvents}, + {"vkCmdWriteBufferMarkerAMD", &wine_vkCmdWriteBufferMarkerAMD}, {"vkCmdWriteTimestamp", &wine_vkCmdWriteTimestamp}, {"vkCreateBuffer", &wine_vkCreateBuffer}, {"vkCreateBufferView", &wine_vkCreateBufferView}, @@ -2307,9 +2576,11 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCreateQueryPool", &wine_vkCreateQueryPool}, {"vkCreateRenderPass", &wine_vkCreateRenderPass}, {"vkCreateSampler", &wine_vkCreateSampler}, + {"vkCreateSamplerYcbcrConversionKHR", &wine_vkCreateSamplerYcbcrConversionKHR}, {"vkCreateSemaphore", &wine_vkCreateSemaphore}, {"vkCreateShaderModule", &wine_vkCreateShaderModule}, {"vkCreateSwapchainKHR", &wine_vkCreateSwapchainKHR}, + {"vkCreateValidationCacheEXT", &wine_vkCreateValidationCacheEXT}, {"vkDestroyBuffer", &wine_vkDestroyBuffer}, {"vkDestroyBufferView", &wine_vkDestroyBufferView}, {"vkDestroyCommandPool", &wine_vkDestroyCommandPool}, @@ -2328,9 +2599,11 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkDestroyQueryPool", &wine_vkDestroyQueryPool}, {"vkDestroyRenderPass", &wine_vkDestroyRenderPass}, {"vkDestroySampler", &wine_vkDestroySampler}, + {"vkDestroySamplerYcbcrConversionKHR", &wine_vkDestroySamplerYcbcrConversionKHR}, {"vkDestroySemaphore", &wine_vkDestroySemaphore}, {"vkDestroyShaderModule", &wine_vkDestroyShaderModule}, {"vkDestroySwapchainKHR", &wine_vkDestroySwapchainKHR}, + {"vkDestroyValidationCacheEXT", &wine_vkDestroyValidationCacheEXT}, {"vkDeviceWaitIdle", &wine_vkDeviceWaitIdle}, {"vkEndCommandBuffer", &wine_vkEndCommandBuffer}, {"vkFlushMappedMemoryRanges", &wine_vkFlushMappedMemoryRanges}, @@ -2338,21 +2611,28 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkFreeDescriptorSets", &wine_vkFreeDescriptorSets}, {"vkFreeMemory", &wine_vkFreeMemory}, {"vkGetBufferMemoryRequirements", &wine_vkGetBufferMemoryRequirements}, + {"vkGetBufferMemoryRequirements2KHR", &wine_vkGetBufferMemoryRequirements2KHR}, + {"vkGetDescriptorSetLayoutSupportKHR", &wine_vkGetDescriptorSetLayoutSupportKHR}, {"vkGetDeviceMemoryCommitment", &wine_vkGetDeviceMemoryCommitment}, {"vkGetDeviceProcAddr", &wine_vkGetDeviceProcAddr}, {"vkGetDeviceQueue", &wine_vkGetDeviceQueue}, {"vkGetEventStatus", &wine_vkGetEventStatus}, {"vkGetFenceStatus", &wine_vkGetFenceStatus}, {"vkGetImageMemoryRequirements", &wine_vkGetImageMemoryRequirements}, + {"vkGetImageMemoryRequirements2KHR", &wine_vkGetImageMemoryRequirements2KHR}, {"vkGetImageSparseMemoryRequirements", &wine_vkGetImageSparseMemoryRequirements}, + {"vkGetImageSparseMemoryRequirements2KHR", &wine_vkGetImageSparseMemoryRequirements2KHR}, {"vkGetImageSubresourceLayout", &wine_vkGetImageSubresourceLayout}, {"vkGetPipelineCacheData", &wine_vkGetPipelineCacheData}, {"vkGetQueryPoolResults", &wine_vkGetQueryPoolResults}, {"vkGetRenderAreaGranularity", &wine_vkGetRenderAreaGranularity}, + {"vkGetShaderInfoAMD", &wine_vkGetShaderInfoAMD}, {"vkGetSwapchainImagesKHR", &wine_vkGetSwapchainImagesKHR}, + {"vkGetValidationCacheDataEXT", &wine_vkGetValidationCacheDataEXT}, {"vkInvalidateMappedMemoryRanges", &wine_vkInvalidateMappedMemoryRanges}, {"vkMapMemory", &wine_vkMapMemory}, {"vkMergePipelineCaches", &wine_vkMergePipelineCaches}, + {"vkMergeValidationCachesEXT", &wine_vkMergeValidationCachesEXT}, {"vkQueueBindSparse", &wine_vkQueueBindSparse}, {"vkQueuePresentKHR", &wine_vkQueuePresentKHR}, {"vkQueueSubmit", &wine_vkQueueSubmit}, @@ -2387,6 +2667,7 @@ static const struct vulkan_func vk_instance_dispatch_table[] = {"vkGetPhysicalDeviceImageFormatProperties2KHR", &wine_vkGetPhysicalDeviceImageFormatProperties2KHR}, {"vkGetPhysicalDeviceMemoryProperties", &wine_vkGetPhysicalDeviceMemoryProperties}, {"vkGetPhysicalDeviceMemoryProperties2KHR", &wine_vkGetPhysicalDeviceMemoryProperties2KHR}, + {"vkGetPhysicalDeviceMultisamplePropertiesEXT", &wine_vkGetPhysicalDeviceMultisamplePropertiesEXT}, {"vkGetPhysicalDeviceProperties", &wine_vkGetPhysicalDeviceProperties}, {"vkGetPhysicalDeviceProperties2KHR", &wine_vkGetPhysicalDeviceProperties2KHR}, {"vkGetPhysicalDeviceQueueFamilyProperties", &wine_vkGetPhysicalDeviceQueueFamilyProperties}, @@ -2430,33 +2711,69 @@ void *wine_vk_get_instance_proc_addr(const char *name) static const char * const vk_device_extensions[] = { + "VK_AMD_buffer_marker", "VK_AMD_draw_indirect_count", "VK_AMD_gcn_shader", "VK_AMD_gpu_shader_half_float", + "VK_AMD_gpu_shader_int16", + "VK_AMD_mixed_attachment_samples", "VK_AMD_negative_viewport_height", "VK_AMD_rasterization_order", "VK_AMD_shader_ballot", + "VK_AMD_shader_core_properties", "VK_AMD_shader_explicit_vertex_parameter", + "VK_AMD_shader_fragment_mask", + "VK_AMD_shader_image_load_store_lod", + "VK_AMD_shader_info", "VK_AMD_shader_trinary_minmax", "VK_AMD_texture_gather_bias_lod", + "VK_EXT_blend_operation_advanced", + "VK_EXT_conservative_rasterization", + "VK_EXT_depth_range_unrestricted", + "VK_EXT_descriptor_indexing", "VK_EXT_discard_rectangles", + "VK_EXT_global_priority", + "VK_EXT_post_depth_coverage", + "VK_EXT_sample_locations", + "VK_EXT_sampler_filter_minmax", + "VK_EXT_shader_stencil_export", "VK_EXT_shader_subgroup_ballot", "VK_EXT_shader_subgroup_vote", + "VK_EXT_shader_viewport_index_layer", + "VK_EXT_validation_cache", + "VK_EXT_vertex_attribute_divisor", "VK_IMG_filter_cubic", "VK_IMG_format_pvrtc", + "VK_KHR_16bit_storage", + "VK_KHR_bind_memory2", + "VK_KHR_dedicated_allocation", "VK_KHR_descriptor_update_template", + "VK_KHR_draw_indirect_count", + "VK_KHR_get_memory_requirements2", + "VK_KHR_image_format_list", "VK_KHR_incremental_present", "VK_KHR_maintenance1", + "VK_KHR_maintenance2", + "VK_KHR_maintenance3", + "VK_KHR_multiview", "VK_KHR_push_descriptor", + "VK_KHR_relaxed_block_layout", "VK_KHR_sampler_mirror_clamp_to_edge", + "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_shader_draw_parameters", + "VK_KHR_storage_buffer_storage_class", "VK_KHR_swapchain", + "VK_KHR_variable_pointers", "VK_NV_clip_space_w_scaling", "VK_NV_dedicated_allocation", "VK_NV_external_memory", + "VK_NV_fill_rectangle", + "VK_NV_fragment_coverage_to_color", + "VK_NV_framebuffer_mixed_samples", "VK_NV_geometry_shader_passthrough", "VK_NV_glsl_shader", "VK_NV_sample_mask_override_coverage", + "VK_NV_shader_subgroup_partitioned", "VK_NV_viewport_array2", "VK_NV_viewport_swizzle", }; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 67df71d308..f193c43107 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -62,6 +62,24 @@ typedef struct VkCommandBufferBeginInfo_host const VkCommandBufferInheritanceInfo_host *pInheritanceInfo; } VkCommandBufferBeginInfo_host; +typedef struct VkBindBufferMemoryInfo_host +{ + VkStructureType sType; + const void *pNext; + VkBuffer buffer; + VkDeviceMemory memory; + VkDeviceSize memoryOffset; +} VkBindBufferMemoryInfo_host; + +typedef struct VkBindImageMemoryInfo_host +{ + VkStructureType sType; + const void *pNext; + VkImage image; + VkDeviceMemory memory; + VkDeviceSize memoryOffset; +} VkBindImageMemoryInfo_host; + typedef struct VkRenderPassBeginInfo_host { VkStructureType sType; @@ -190,19 +208,19 @@ typedef struct VkComputePipelineCreateInfo_host int32_t basePipelineIndex; } VkComputePipelineCreateInfo_host; -typedef struct VkDescriptorUpdateTemplateCreateInfoKHR_host +typedef struct VkDescriptorUpdateTemplateCreateInfo_host { VkStructureType sType; void *pNext; - VkDescriptorUpdateTemplateCreateFlagsKHR flags; + VkDescriptorUpdateTemplateCreateFlags flags; uint32_t descriptorUpdateEntryCount; - const VkDescriptorUpdateTemplateEntryKHR *pDescriptorUpdateEntries; - VkDescriptorUpdateTemplateTypeKHR templateType; + const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries; + VkDescriptorUpdateTemplateType templateType; VkDescriptorSetLayout descriptorSetLayout; VkPipelineBindPoint pipelineBindPoint; VkPipelineLayout pipelineLayout; uint32_t set; -} VkDescriptorUpdateTemplateCreateInfoKHR_host; +} VkDescriptorUpdateTemplateCreateInfo_host; typedef struct VkFramebufferCreateInfo_host { @@ -290,6 +308,34 @@ typedef struct VkMemoryRequirements_host uint32_t memoryTypeBits; } VkMemoryRequirements_host; +typedef struct VkBufferMemoryRequirementsInfo2_host +{ + VkStructureType sType; + const void *pNext; + VkBuffer buffer; +} VkBufferMemoryRequirementsInfo2_host; + +typedef struct VkMemoryRequirements2_host +{ + VkStructureType sType; + void *pNext; + VkMemoryRequirements_host memoryRequirements; +} VkMemoryRequirements2_host; + +typedef struct VkImageMemoryRequirementsInfo2_host +{ + VkStructureType sType; + const void *pNext; + VkImage image; +} VkImageMemoryRequirementsInfo2_host; + +typedef struct VkImageSparseMemoryRequirementsInfo2_host +{ + VkStructureType sType; + const void *pNext; + VkImage image; +} VkImageSparseMemoryRequirementsInfo2_host; + typedef struct VkSubresourceLayout_host { VkDeviceSize offset; @@ -308,12 +354,12 @@ typedef struct VkImageFormatProperties_host VkDeviceSize maxResourceSize; } VkImageFormatProperties_host; -typedef struct VkImageFormatProperties2KHR_host +typedef struct VkImageFormatProperties2_host { VkStructureType sType; void *pNext; VkImageFormatProperties_host imageFormatProperties; -} VkImageFormatProperties2KHR_host; +} VkImageFormatProperties2_host; typedef struct VkMemoryHeap_host { @@ -329,12 +375,12 @@ typedef struct VkPhysicalDeviceMemoryProperties_host VkMemoryHeap_host memoryHeaps[VK_MAX_MEMORY_HEAPS]; } VkPhysicalDeviceMemoryProperties_host; -typedef struct VkPhysicalDeviceMemoryProperties2KHR_host +typedef struct VkPhysicalDeviceMemoryProperties2_host { VkStructureType sType; void *pNext; VkPhysicalDeviceMemoryProperties_host memoryProperties; -} VkPhysicalDeviceMemoryProperties2KHR_host; +} VkPhysicalDeviceMemoryProperties2_host; typedef struct VkPhysicalDeviceLimits_host { @@ -459,12 +505,12 @@ typedef struct VkPhysicalDeviceProperties_host VkPhysicalDeviceSparseProperties sparseProperties; } VkPhysicalDeviceProperties_host; -typedef struct VkPhysicalDeviceProperties2KHR_host +typedef struct VkPhysicalDeviceProperties2_host { VkStructureType sType; void *pNext; VkPhysicalDeviceProperties_host properties; -} VkPhysicalDeviceProperties2KHR_host; +} VkPhysicalDeviceProperties2_host; typedef struct VkSparseMemoryBind_host { @@ -561,7 +607,17 @@ struct vulkan_device_funcs VkResult (*p_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo *); #endif VkResult (*p_vkBindBufferMemory)(VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize); +#if defined(USE_STRUCT_CONVERSION) + VkResult (*p_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo_host *); +#else + VkResult (*p_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *); +#endif VkResult (*p_vkBindImageMemory)(VkDevice, VkImage, VkDeviceMemory, VkDeviceSize); +#if defined(USE_STRUCT_CONVERSION) + VkResult (*p_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo_host *); +#else + VkResult (*p_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo *); +#endif void (*p_vkCmdBeginQuery)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags); #if defined(USE_STRUCT_CONVERSION) void (*p_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, VkSubpassContents); @@ -599,8 +655,10 @@ struct vulkan_device_funcs void (*p_vkCmdDrawIndexed)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, int32_t, uint32_t); void (*p_vkCmdDrawIndexedIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); + void (*p_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); + void (*p_vkCmdDrawIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdEndQuery)(VkCommandBuffer, VkQueryPool, uint32_t); void (*p_vkCmdEndRenderPass)(VkCommandBuffer); void (*p_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *); @@ -617,7 +675,7 @@ struct vulkan_device_funcs #else void (*p_vkCmdPushDescriptorSetKHR)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkWriteDescriptorSet *); #endif - void (*p_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer, VkDescriptorUpdateTemplateKHR, VkPipelineLayout, uint32_t, const void *); + void (*p_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer, VkDescriptorUpdateTemplate, VkPipelineLayout, uint32_t, const void *); void (*p_vkCmdResetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags); void (*p_vkCmdResetQueryPool)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t); void (*p_vkCmdResolveImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageResolve *); @@ -627,6 +685,7 @@ struct vulkan_device_funcs void (*p_vkCmdSetDiscardRectangleEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *); void (*p_vkCmdSetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags); void (*p_vkCmdSetLineWidth)(VkCommandBuffer, float); + void (*p_vkCmdSetSampleLocationsEXT)(VkCommandBuffer, const VkSampleLocationsInfoEXT *); void (*p_vkCmdSetScissor)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *); void (*p_vkCmdSetStencilCompareMask)(VkCommandBuffer, VkStencilFaceFlags, uint32_t); void (*p_vkCmdSetStencilReference)(VkCommandBuffer, VkStencilFaceFlags, uint32_t); @@ -639,6 +698,7 @@ struct vulkan_device_funcs #else void (*p_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *); #endif + void (*p_vkCmdWriteBufferMarkerAMD)(VkCommandBuffer, VkPipelineStageFlagBits, VkBuffer, VkDeviceSize, uint32_t); void (*p_vkCmdWriteTimestamp)(VkCommandBuffer, VkPipelineStageFlagBits, VkQueryPool, uint32_t); #if defined(USE_STRUCT_CONVERSION) VkResult (*p_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo_host *, const VkAllocationCallbacks *, VkBuffer *); @@ -659,9 +719,9 @@ struct vulkan_device_funcs VkResult (*p_vkCreateDescriptorPool)(VkDevice, const VkDescriptorPoolCreateInfo *, const VkAllocationCallbacks *, VkDescriptorPool *); VkResult (*p_vkCreateDescriptorSetLayout)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, const VkAllocationCallbacks *, VkDescriptorSetLayout *); #if defined(USE_STRUCT_CONVERSION) - VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfoKHR_host *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplateKHR *); + VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo_host *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *); #else - VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfoKHR *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplateKHR *); + VkResult (*p_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *); #endif VkResult (*p_vkCreateEvent)(VkDevice, const VkEventCreateInfo *, const VkAllocationCallbacks *, VkEvent *); VkResult (*p_vkCreateFence)(VkDevice, const VkFenceCreateInfo *, const VkAllocationCallbacks *, VkFence *); @@ -686,6 +746,7 @@ struct vulkan_device_funcs VkResult (*p_vkCreateQueryPool)(VkDevice, const VkQueryPoolCreateInfo *, const VkAllocationCallbacks *, VkQueryPool *); VkResult (*p_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *); VkResult (*p_vkCreateSampler)(VkDevice, const VkSamplerCreateInfo *, const VkAllocationCallbacks *, VkSampler *); + VkResult (*p_vkCreateSamplerYcbcrConversionKHR)(VkDevice, const VkSamplerYcbcrConversionCreateInfo *, const VkAllocationCallbacks *, VkSamplerYcbcrConversion *); VkResult (*p_vkCreateSemaphore)(VkDevice, const VkSemaphoreCreateInfo *, const VkAllocationCallbacks *, VkSemaphore *); VkResult (*p_vkCreateShaderModule)(VkDevice, const VkShaderModuleCreateInfo *, const VkAllocationCallbacks *, VkShaderModule *); #if defined(USE_STRUCT_CONVERSION) @@ -693,12 +754,13 @@ struct vulkan_device_funcs #else VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); #endif + VkResult (*p_vkCreateValidationCacheEXT)(VkDevice, const VkValidationCacheCreateInfoEXT *, const VkAllocationCallbacks *, VkValidationCacheEXT *); void (*p_vkDestroyBuffer)(VkDevice, VkBuffer, const VkAllocationCallbacks *); void (*p_vkDestroyBufferView)(VkDevice, VkBufferView, const VkAllocationCallbacks *); void (*p_vkDestroyCommandPool)(VkDevice, VkCommandPool, const VkAllocationCallbacks *); void (*p_vkDestroyDescriptorPool)(VkDevice, VkDescriptorPool, const VkAllocationCallbacks *); void (*p_vkDestroyDescriptorSetLayout)(VkDevice, VkDescriptorSetLayout, const VkAllocationCallbacks *); - void (*p_vkDestroyDescriptorUpdateTemplateKHR)(VkDevice, VkDescriptorUpdateTemplateKHR, const VkAllocationCallbacks *); + void (*p_vkDestroyDescriptorUpdateTemplateKHR)(VkDevice, VkDescriptorUpdateTemplate, const VkAllocationCallbacks *); void (*p_vkDestroyDevice)(VkDevice, const VkAllocationCallbacks *); void (*p_vkDestroyEvent)(VkDevice, VkEvent, const VkAllocationCallbacks *); void (*p_vkDestroyFence)(VkDevice, VkFence, const VkAllocationCallbacks *); @@ -711,9 +773,11 @@ struct vulkan_device_funcs void (*p_vkDestroyQueryPool)(VkDevice, VkQueryPool, const VkAllocationCallbacks *); void (*p_vkDestroyRenderPass)(VkDevice, VkRenderPass, const VkAllocationCallbacks *); void (*p_vkDestroySampler)(VkDevice, VkSampler, const VkAllocationCallbacks *); + void (*p_vkDestroySamplerYcbcrConversionKHR)(VkDevice, VkSamplerYcbcrConversion, const VkAllocationCallbacks *); void (*p_vkDestroySemaphore)(VkDevice, VkSemaphore, const VkAllocationCallbacks *); void (*p_vkDestroyShaderModule)(VkDevice, VkShaderModule, const VkAllocationCallbacks *); void (*p_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); + void (*p_vkDestroyValidationCacheEXT)(VkDevice, VkValidationCacheEXT, const VkAllocationCallbacks *); VkResult (*p_vkDeviceWaitIdle)(VkDevice); VkResult (*p_vkEndCommandBuffer)(VkCommandBuffer); #if defined(USE_STRUCT_CONVERSION) @@ -729,6 +793,12 @@ struct vulkan_device_funcs #else void (*p_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements *); #endif +#if defined(USE_STRUCT_CONVERSION) + void (*p_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *); +#else + void (*p_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); +#endif + void (*p_vkGetDescriptorSetLayoutSupportKHR)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *); void (*p_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent); @@ -737,8 +807,18 @@ struct vulkan_device_funcs void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements_host *); #else void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements *); +#endif +#if defined(USE_STRUCT_CONVERSION) + void (*p_vkGetImageMemoryRequirements2KHR)(VkDevice, const VkImageMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *); +#else + void (*p_vkGetImageMemoryRequirements2KHR)(VkDevice, const VkImageMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); #endif void (*p_vkGetImageSparseMemoryRequirements)(VkDevice, VkImage, uint32_t *, VkSparseImageMemoryRequirements *); +#if defined(USE_STRUCT_CONVERSION) + void (*p_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2_host *, uint32_t *, VkSparseImageMemoryRequirements2 *); +#else + void (*p_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *); +#endif #if defined(USE_STRUCT_CONVERSION) void (*p_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout_host *); #else @@ -747,7 +827,9 @@ struct vulkan_device_funcs VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); VkResult (*p_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); void (*p_vkGetRenderAreaGranularity)(VkDevice, VkRenderPass, VkExtent2D *); + VkResult (*p_vkGetShaderInfoAMD)(VkDevice, VkPipeline, VkShaderStageFlagBits, VkShaderInfoTypeAMD, size_t *, void *); VkResult (*p_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); + VkResult (*p_vkGetValidationCacheDataEXT)(VkDevice, VkValidationCacheEXT, size_t *, void *); #if defined(USE_STRUCT_CONVERSION) VkResult (*p_vkInvalidateMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange_host *); #else @@ -755,6 +837,7 @@ struct vulkan_device_funcs #endif VkResult (*p_vkMapMemory)(VkDevice, VkDeviceMemory, VkDeviceSize, VkDeviceSize, VkMemoryMapFlags, void **); VkResult (*p_vkMergePipelineCaches)(VkDevice, VkPipelineCache, uint32_t, const VkPipelineCache *); + VkResult (*p_vkMergeValidationCachesEXT)(VkDevice, VkValidationCacheEXT, uint32_t, const VkValidationCacheEXT *); #if defined(USE_STRUCT_CONVERSION) VkResult (*p_vkQueueBindSparse)(VkQueue, uint32_t, const VkBindSparseInfo_host *, VkFence); #else @@ -769,9 +852,9 @@ struct vulkan_device_funcs VkResult (*p_vkResetEvent)(VkDevice, VkEvent); VkResult (*p_vkResetFences)(VkDevice, uint32_t, const VkFence *); VkResult (*p_vkSetEvent)(VkDevice, VkEvent); - void (*p_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlagsKHR); + void (*p_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags); void (*p_vkUnmapMemory)(VkDevice, VkDeviceMemory); - void (*p_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplateKHR, const void *); + void (*p_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplate, const void *); #if defined(USE_STRUCT_CONVERSION) void (*p_vkUpdateDescriptorSets)(VkDevice, uint32_t, const VkWriteDescriptorSet_host *, uint32_t, const VkCopyDescriptorSet_host *); #else @@ -790,18 +873,18 @@ struct vulkan_instance_funcs VkResult (*p_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice, uint32_t *, VkLayerProperties *); VkResult (*p_vkEnumeratePhysicalDevices)(VkInstance, uint32_t *, VkPhysicalDevice *); void (*p_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures *); - void (*p_vkGetPhysicalDeviceFeatures2KHR)(VkPhysicalDevice, VkPhysicalDeviceFeatures2KHR *); + void (*p_vkGetPhysicalDeviceFeatures2KHR)(VkPhysicalDevice, VkPhysicalDeviceFeatures2 *); void (*p_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice, VkFormat, VkFormatProperties *); - void (*p_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice, VkFormat, VkFormatProperties2KHR *); + void (*p_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice, VkFormat, VkFormatProperties2 *); #if defined(USE_STRUCT_CONVERSION) VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties_host *); #else VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties *); #endif #if defined(USE_STRUCT_CONVERSION) - VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR *, VkImageFormatProperties2KHR_host *); + VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2_host *); #else - VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR *, VkImageFormatProperties2KHR *); + VkResult (*p_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2 *); #endif #if defined(USE_STRUCT_CONVERSION) void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties_host *); @@ -809,24 +892,25 @@ struct vulkan_instance_funcs void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *); #endif #if defined(USE_STRUCT_CONVERSION) - void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2KHR_host *); + void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2_host *); #else - void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2KHR *); + void (*p_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2 *); #endif + void (*p_vkGetPhysicalDeviceMultisamplePropertiesEXT)(VkPhysicalDevice, VkSampleCountFlagBits, VkMultisamplePropertiesEXT *); #if defined(USE_STRUCT_CONVERSION) void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties_host *); #else void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties *); #endif #if defined(USE_STRUCT_CONVERSION) - void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2KHR_host *); + void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2_host *); #else - void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2KHR *); + void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); #endif void (*p_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *); - void (*p_vkGetPhysicalDeviceQueueFamilyProperties2KHR)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties2KHR *); + void (*p_vkGetPhysicalDeviceQueueFamilyProperties2KHR)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties2 *); void (*p_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkSampleCountFlagBits, VkImageUsageFlags, VkImageTiling, uint32_t *, VkSparseImageFormatProperties *); - void (*p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR *, uint32_t *, VkSparseImageFormatProperties2KHR *); + void (*p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *, uint32_t *, VkSparseImageFormatProperties2 *); VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); VkResult (*p_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *); VkResult (*p_vkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); @@ -841,7 +925,9 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkAllocateMemory) \ USE_VK_FUNC(vkBeginCommandBuffer) \ USE_VK_FUNC(vkBindBufferMemory) \ + USE_VK_FUNC(vkBindBufferMemory2KHR) \ USE_VK_FUNC(vkBindImageMemory) \ + USE_VK_FUNC(vkBindImageMemory2KHR) \ USE_VK_FUNC(vkCmdBeginQuery) \ USE_VK_FUNC(vkCmdBeginRenderPass) \ USE_VK_FUNC(vkCmdBindDescriptorSets) \ @@ -863,8 +949,10 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdDrawIndexed) \ USE_VK_FUNC(vkCmdDrawIndexedIndirect) \ USE_VK_FUNC(vkCmdDrawIndexedIndirectCountAMD) \ + USE_VK_FUNC(vkCmdDrawIndexedIndirectCountKHR) \ USE_VK_FUNC(vkCmdDrawIndirect) \ USE_VK_FUNC(vkCmdDrawIndirectCountAMD) \ + USE_VK_FUNC(vkCmdDrawIndirectCountKHR) \ USE_VK_FUNC(vkCmdEndQuery) \ USE_VK_FUNC(vkCmdEndRenderPass) \ USE_VK_FUNC(vkCmdExecuteCommands) \ @@ -883,6 +971,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdSetDiscardRectangleEXT) \ USE_VK_FUNC(vkCmdSetEvent) \ USE_VK_FUNC(vkCmdSetLineWidth) \ + USE_VK_FUNC(vkCmdSetSampleLocationsEXT) \ USE_VK_FUNC(vkCmdSetScissor) \ USE_VK_FUNC(vkCmdSetStencilCompareMask) \ USE_VK_FUNC(vkCmdSetStencilReference) \ @@ -891,6 +980,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdSetViewportWScalingNV) \ USE_VK_FUNC(vkCmdUpdateBuffer) \ USE_VK_FUNC(vkCmdWaitEvents) \ + USE_VK_FUNC(vkCmdWriteBufferMarkerAMD) \ USE_VK_FUNC(vkCmdWriteTimestamp) \ USE_VK_FUNC(vkCreateBuffer) \ USE_VK_FUNC(vkCreateBufferView) \ @@ -910,9 +1000,11 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCreateQueryPool) \ USE_VK_FUNC(vkCreateRenderPass) \ USE_VK_FUNC(vkCreateSampler) \ + USE_VK_FUNC(vkCreateSamplerYcbcrConversionKHR) \ USE_VK_FUNC(vkCreateSemaphore) \ USE_VK_FUNC(vkCreateShaderModule) \ USE_VK_FUNC(vkCreateSwapchainKHR) \ + USE_VK_FUNC(vkCreateValidationCacheEXT) \ USE_VK_FUNC(vkDestroyBuffer) \ USE_VK_FUNC(vkDestroyBufferView) \ USE_VK_FUNC(vkDestroyCommandPool) \ @@ -931,9 +1023,11 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkDestroyQueryPool) \ USE_VK_FUNC(vkDestroyRenderPass) \ USE_VK_FUNC(vkDestroySampler) \ + USE_VK_FUNC(vkDestroySamplerYcbcrConversionKHR) \ USE_VK_FUNC(vkDestroySemaphore) \ USE_VK_FUNC(vkDestroyShaderModule) \ USE_VK_FUNC(vkDestroySwapchainKHR) \ + USE_VK_FUNC(vkDestroyValidationCacheEXT) \ USE_VK_FUNC(vkDeviceWaitIdle) \ USE_VK_FUNC(vkEndCommandBuffer) \ USE_VK_FUNC(vkFlushMappedMemoryRanges) \ @@ -941,20 +1035,27 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkFreeDescriptorSets) \ USE_VK_FUNC(vkFreeMemory) \ USE_VK_FUNC(vkGetBufferMemoryRequirements) \ + USE_VK_FUNC(vkGetBufferMemoryRequirements2KHR) \ + USE_VK_FUNC(vkGetDescriptorSetLayoutSupportKHR) \ USE_VK_FUNC(vkGetDeviceMemoryCommitment) \ USE_VK_FUNC(vkGetDeviceQueue) \ USE_VK_FUNC(vkGetEventStatus) \ USE_VK_FUNC(vkGetFenceStatus) \ USE_VK_FUNC(vkGetImageMemoryRequirements) \ + USE_VK_FUNC(vkGetImageMemoryRequirements2KHR) \ USE_VK_FUNC(vkGetImageSparseMemoryRequirements) \ + USE_VK_FUNC(vkGetImageSparseMemoryRequirements2KHR) \ USE_VK_FUNC(vkGetImageSubresourceLayout) \ USE_VK_FUNC(vkGetPipelineCacheData) \ USE_VK_FUNC(vkGetQueryPoolResults) \ USE_VK_FUNC(vkGetRenderAreaGranularity) \ + USE_VK_FUNC(vkGetShaderInfoAMD) \ USE_VK_FUNC(vkGetSwapchainImagesKHR) \ + USE_VK_FUNC(vkGetValidationCacheDataEXT) \ USE_VK_FUNC(vkInvalidateMappedMemoryRanges) \ USE_VK_FUNC(vkMapMemory) \ USE_VK_FUNC(vkMergePipelineCaches) \ + USE_VK_FUNC(vkMergeValidationCachesEXT) \ USE_VK_FUNC(vkQueueBindSparse) \ USE_VK_FUNC(vkQueuePresentKHR) \ USE_VK_FUNC(vkQueueSubmit) \ @@ -986,6 +1087,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties2KHR) \ USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) \ USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR) \ + USE_VK_FUNC(vkGetPhysicalDeviceMultisamplePropertiesEXT) \ USE_VK_FUNC(vkGetPhysicalDeviceProperties) \ USE_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) \ USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties) \ diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 3f96413f5c..551c7fd897 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -8,7 +8,9 @@ @ stdcall wine_vkAllocateMemory(ptr ptr ptr ptr) @ stdcall wine_vkBeginCommandBuffer(ptr ptr) @ stdcall wine_vkBindBufferMemory(ptr int64 int64 int64) +@ stub vkBindBufferMemory2 @ stdcall wine_vkBindImageMemory(ptr int64 int64 int64) +@ stub vkBindImageMemory2 @ stdcall wine_vkCmdBeginQuery(ptr int64 long long) @ stdcall wine_vkCmdBeginRenderPass(ptr ptr long) @ stdcall wine_vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr) @@ -25,6 +27,7 @@ @ stdcall wine_vkCmdCopyImageToBuffer(ptr int64 long int64 long ptr) @ stdcall wine_vkCmdCopyQueryPoolResults(ptr int64 long long int64 int64 int64 long) @ stdcall wine_vkCmdDispatch(ptr long long long) +@ stub vkCmdDispatchBase @ stdcall wine_vkCmdDispatchIndirect(ptr int64 int64) @ stdcall wine_vkCmdDraw(ptr long long long long) @ stdcall wine_vkCmdDrawIndexed(ptr long long long long long) @@ -43,6 +46,7 @@ @ stdcall wine_vkCmdSetBlendConstants(ptr ptr) @ stdcall wine_vkCmdSetDepthBias(ptr float float float) @ stdcall wine_vkCmdSetDepthBounds(ptr float float) +@ stub vkCmdSetDeviceMask @ stdcall wine_vkCmdSetEvent(ptr int64 long) @ stdcall wine_vkCmdSetLineWidth(ptr float) @ stdcall wine_vkCmdSetScissor(ptr long long ptr) @@ -59,6 +63,7 @@ @ stdcall wine_vkCreateComputePipelines(ptr int64 long ptr ptr ptr) @ stdcall wine_vkCreateDescriptorPool(ptr ptr ptr ptr) @ stdcall wine_vkCreateDescriptorSetLayout(ptr ptr ptr ptr) +@ stub vkCreateDescriptorUpdateTemplate @ stdcall wine_vkCreateDevice(ptr ptr ptr ptr) @ stub vkCreateDisplayModeKHR @ stub vkCreateDisplayPlaneSurfaceKHR @@ -74,6 +79,7 @@ @ stdcall wine_vkCreateQueryPool(ptr ptr ptr ptr) @ stdcall wine_vkCreateRenderPass(ptr ptr ptr ptr) @ stdcall wine_vkCreateSampler(ptr ptr ptr ptr) +@ stub vkCreateSamplerYcbcrConversion @ stdcall wine_vkCreateSemaphore(ptr ptr ptr ptr) @ stdcall wine_vkCreateShaderModule(ptr ptr ptr ptr) @ stub vkCreateSharedSwapchainsKHR @@ -84,6 +90,7 @@ @ stdcall wine_vkDestroyCommandPool(ptr int64 ptr) @ stdcall wine_vkDestroyDescriptorPool(ptr int64 ptr) @ stdcall wine_vkDestroyDescriptorSetLayout(ptr int64 ptr) +@ stub vkDestroyDescriptorUpdateTemplate @ stdcall wine_vkDestroyDevice(ptr ptr) @ stdcall wine_vkDestroyEvent(ptr int64 ptr) @ stdcall wine_vkDestroyFence(ptr int64 ptr) @@ -97,6 +104,7 @@ @ stdcall wine_vkDestroyQueryPool(ptr int64 ptr) @ stdcall wine_vkDestroyRenderPass(ptr int64 ptr) @ stdcall wine_vkDestroySampler(ptr int64 ptr) +@ stub vkDestroySamplerYcbcrConversion @ stdcall wine_vkDestroySemaphore(ptr int64 ptr) @ stdcall wine_vkDestroyShaderModule(ptr int64 ptr) @ stdcall wine_vkDestroySurfaceKHR(ptr int64 ptr) @@ -106,33 +114,51 @@ @ stdcall wine_vkEnumerateDeviceExtensionProperties(ptr str ptr ptr) @ stdcall wine_vkEnumerateDeviceLayerProperties(ptr ptr ptr) @ stdcall wine_vkEnumerateInstanceExtensionProperties(str ptr ptr) +@ stub vkEnumerateInstanceVersion +@ stub vkEnumeratePhysicalDeviceGroups @ stdcall wine_vkEnumeratePhysicalDevices(ptr ptr ptr) @ stdcall wine_vkFlushMappedMemoryRanges(ptr long ptr) @ stdcall wine_vkFreeCommandBuffers(ptr int64 long ptr) @ stdcall wine_vkFreeDescriptorSets(ptr int64 long ptr) @ stdcall wine_vkFreeMemory(ptr int64 ptr) @ stdcall wine_vkGetBufferMemoryRequirements(ptr int64 ptr) +@ stub vkGetBufferMemoryRequirements2 +@ stub vkGetDescriptorSetLayoutSupport +@ stub vkGetDeviceGroupPeerMemoryFeatures @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) +@ stub vkGetDeviceQueue2 @ stub vkGetDisplayModePropertiesKHR @ stub vkGetDisplayPlaneCapabilitiesKHR @ stub vkGetDisplayPlaneSupportedDisplaysKHR @ stdcall wine_vkGetEventStatus(ptr int64) @ stdcall wine_vkGetFenceStatus(ptr int64) @ stdcall wine_vkGetImageMemoryRequirements(ptr int64 ptr) +@ stub vkGetImageMemoryRequirements2 @ stdcall wine_vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr) +@ stub vkGetImageSparseMemoryRequirements2 @ stdcall wine_vkGetImageSubresourceLayout(ptr int64 ptr ptr) @ stdcall wine_vkGetInstanceProcAddr(ptr str) @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR @ stub vkGetPhysicalDeviceDisplayPropertiesKHR +@ stub vkGetPhysicalDeviceExternalBufferProperties +@ stub vkGetPhysicalDeviceExternalFenceProperties +@ stub vkGetPhysicalDeviceExternalSemaphoreProperties @ stdcall wine_vkGetPhysicalDeviceFeatures(ptr ptr) +@ stub vkGetPhysicalDeviceFeatures2 @ stdcall wine_vkGetPhysicalDeviceFormatProperties(ptr long ptr) +@ stub vkGetPhysicalDeviceFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceImageFormatProperties(ptr long long long long long ptr) +@ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceMemoryProperties(ptr ptr) +@ stub vkGetPhysicalDeviceMemoryProperties2 @ stdcall wine_vkGetPhysicalDeviceProperties(ptr ptr) +@ stub vkGetPhysicalDeviceProperties2 @ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) +@ stub vkGetPhysicalDeviceQueueFamilyProperties2 @ stdcall wine_vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) +@ stub vkGetPhysicalDeviceSparseImageFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) @ stdcall wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) @ stdcall wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr long) @@ -155,6 +181,8 @@ @ stdcall wine_vkResetEvent(ptr int64) @ stdcall wine_vkResetFences(ptr long ptr) @ stdcall wine_vkSetEvent(ptr int64) +@ stub vkTrimCommandPool @ stdcall wine_vkUnmapMemory(ptr int64) +@ stub vkUpdateDescriptorSetWithTemplate @ stdcall wine_vkUpdateDescriptorSets(ptr long ptr long ptr) @ stdcall wine_vkWaitForFences(ptr long ptr long int64) diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 24b0ef990e..74ff22b52e 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -26,7 +26,8 @@ #define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256 #define VK_UUID_SIZE 16 -#define VK_LUID_SIZE_KHX 8 +#define VK_LUID_SIZE 8 +#define VK_LUID_SIZE_KHR VK_LUID_SIZE #define VK_MAX_EXTENSION_NAME_SIZE 256 #define VK_MAX_DESCRIPTION_SIZE 256 #define VK_MAX_MEMORY_TYPES 32 @@ -39,18 +40,23 @@ #define VK_TRUE 1 #define VK_FALSE 0 #define VK_QUEUE_FAMILY_IGNORED (~0U) -#define VK_QUEUE_FAMILY_EXTERNAL_KHX (~0U-1) +#define VK_QUEUE_FAMILY_EXTERNAL (~0U-1) +#define VK_QUEUE_FAMILY_EXTERNAL_KHR VK_QUEUE_FAMILY_EXTERNAL +#define VK_QUEUE_FAMILY_FOREIGN_EXT (~0U-2) #define VK_SUBPASS_EXTERNAL (~0U) -#define VK_MAX_DEVICE_GROUP_SIZE_KHX 32 +#define VK_MAX_DEVICE_GROUP_SIZE 32 +#define VK_MAX_DEVICE_GROUP_SIZE_KHR VK_MAX_DEVICE_GROUP_SIZE #define VK_KHR_SURFACE_SPEC_VERSION 25 #define VK_KHR_SURFACE_EXTENSION_NAME "VK_KHR_surface" #define VK_COLORSPACE_SRGB_NONLINEAR_KHR VK_COLOR_SPACE_SRGB_NONLINEAR_KHR -#define VK_KHR_SWAPCHAIN_SPEC_VERSION 68 +#define VK_KHR_SWAPCHAIN_SPEC_VERSION 70 #define VK_KHR_SWAPCHAIN_EXTENSION_NAME "VK_KHR_swapchain" #define VK_KHR_WIN32_SURFACE_SPEC_VERSION 6 #define VK_KHR_WIN32_SURFACE_EXTENSION_NAME "VK_KHR_win32_surface" #define VK_NV_GLSL_SHADER_SPEC_VERSION 1 #define VK_NV_GLSL_SHADER_EXTENSION_NAME "VK_NV_glsl_shader" +#define VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION 1 +#define VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME "VK_EXT_depth_range_unrestricted" #define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1 #define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge" #define VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE 4 @@ -76,6 +82,12 @@ #define VK_AMD_SHADER_BALLOT_EXTENSION_NAME "VK_AMD_shader_ballot" #define VK_AMD_TEXTURE_GATHER_BIAS_LOD_SPEC_VERSION 1 #define VK_AMD_TEXTURE_GATHER_BIAS_LOD_EXTENSION_NAME "VK_AMD_texture_gather_bias_lod" +#define VK_AMD_SHADER_INFO_SPEC_VERSION 1 +#define VK_AMD_SHADER_INFO_EXTENSION_NAME "VK_AMD_shader_info" +#define VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_SPEC_VERSION 1 +#define VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_EXTENSION_NAME "VK_AMD_shader_image_load_store_lod" +#define VK_KHR_MULTIVIEW_SPEC_VERSION 1 +#define VK_KHR_MULTIVIEW_EXTENSION_NAME "VK_KHR_multiview" #define VK_IMG_FORMAT_PVRTC_SPEC_VERSION 1 #define VK_IMG_FORMAT_PVRTC_EXTENSION_NAME "VK_IMG_format_pvrtc" #define VK_NV_EXTERNAL_MEMORY_SPEC_VERSION 1 @@ -88,14 +100,17 @@ #define VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME "VK_EXT_shader_subgroup_ballot" #define VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION 1 #define VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME "VK_EXT_shader_subgroup_vote" -#define VK_KHR_MAINTENANCE1_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE1_SPEC_VERSION 2 #define VK_KHR_MAINTENANCE1_EXTENSION_NAME "VK_KHR_maintenance1" -#define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 1 +#define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 2 #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" +#define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1 +#define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage" #define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1 #define VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME "VK_KHR_incremental_present" #define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION 1 #define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME "VK_KHR_descriptor_update_template" +#define VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR 1 #define VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION 1 #define VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME "VK_NV_clip_space_w_scaling" #define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1 @@ -108,15 +123,78 @@ #define VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME "VK_NV_viewport_swizzle" #define VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION 1 #define VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME "VK_EXT_discard_rectangles" +#define VK_EXT_CONSERVATIVE_RASTERIZATION_SPEC_VERSION 1 +#define VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME "VK_EXT_conservative_rasterization" +#define VK_KHR_MAINTENANCE2_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE2_EXTENSION_NAME "VK_KHR_maintenance2" +#define VK_KHR_VARIABLE_POINTERS_SPEC_VERSION 1 +#define VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME "VK_KHR_variable_pointers" +#define VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION 3 +#define VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_KHR_dedicated_allocation" +#define VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION 1 +#define VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME "VK_EXT_sampler_filter_minmax" +#define VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_SPEC_VERSION 1 +#define VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME "VK_KHR_storage_buffer_storage_class" +#define VK_AMD_GPU_SHADER_INT16_SPEC_VERSION 1 +#define VK_AMD_GPU_SHADER_INT16_EXTENSION_NAME "VK_AMD_gpu_shader_int16" +#define VK_AMD_MIXED_ATTACHMENT_SAMPLES_SPEC_VERSION 1 +#define VK_AMD_MIXED_ATTACHMENT_SAMPLES_EXTENSION_NAME "VK_AMD_mixed_attachment_samples" +#define VK_AMD_SHADER_FRAGMENT_MASK_SPEC_VERSION 1 +#define VK_AMD_SHADER_FRAGMENT_MASK_EXTENSION_NAME "VK_AMD_shader_fragment_mask" +#define VK_EXT_SHADER_STENCIL_EXPORT_SPEC_VERSION 1 +#define VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME "VK_EXT_shader_stencil_export" +#define VK_EXT_SAMPLE_LOCATIONS_SPEC_VERSION 1 +#define VK_EXT_SAMPLE_LOCATIONS_EXTENSION_NAME "VK_EXT_sample_locations" +#define VK_KHR_RELAXED_BLOCK_LAYOUT_SPEC_VERSION 1 +#define VK_KHR_RELAXED_BLOCK_LAYOUT_EXTENSION_NAME "VK_KHR_relaxed_block_layout" +#define VK_KHR_GET_MEMORY_REQUIREMENTS_2_SPEC_VERSION 1 +#define VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME "VK_KHR_get_memory_requirements2" +#define VK_KHR_IMAGE_FORMAT_LIST_SPEC_VERSION 1 +#define VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME "VK_KHR_image_format_list" +#define VK_EXT_BLEND_OPERATION_ADVANCED_SPEC_VERSION 2 +#define VK_EXT_BLEND_OPERATION_ADVANCED_EXTENSION_NAME "VK_EXT_blend_operation_advanced" +#define VK_NV_FRAGMENT_COVERAGE_TO_COLOR_SPEC_VERSION 1 +#define VK_NV_FRAGMENT_COVERAGE_TO_COLOR_EXTENSION_NAME "VK_NV_fragment_coverage_to_color" +#define VK_NV_FRAMEBUFFER_MIXED_SAMPLES_SPEC_VERSION 1 +#define VK_NV_FRAMEBUFFER_MIXED_SAMPLES_EXTENSION_NAME "VK_NV_framebuffer_mixed_samples" +#define VK_NV_FILL_RECTANGLE_SPEC_VERSION 1 +#define VK_NV_FILL_RECTANGLE_EXTENSION_NAME "VK_NV_fill_rectangle" +#define VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION 1 +#define VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME "VK_EXT_post_depth_coverage" +#define VK_KHR_SAMPLER_YCBCR_CONVERSION_SPEC_VERSION 1 +#define VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME "VK_KHR_sampler_ycbcr_conversion" +#define VK_KHR_BIND_MEMORY_2_SPEC_VERSION 1 +#define VK_KHR_BIND_MEMORY_2_EXTENSION_NAME "VK_KHR_bind_memory2" +#define VK_EXT_VALIDATION_CACHE_SPEC_VERSION 1 +#define VK_EXT_VALIDATION_CACHE_EXTENSION_NAME "VK_EXT_validation_cache" +#define VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT +#define VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION 2 +#define VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME "VK_EXT_descriptor_indexing" +#define VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_SPEC_VERSION 1 +#define VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME "VK_EXT_shader_viewport_index_layer" +#define VK_KHR_MAINTENANCE3_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE3_EXTENSION_NAME "VK_KHR_maintenance3" +#define VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION 1 +#define VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_KHR_draw_indirect_count" +#define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2 +#define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" +#define VK_AMD_BUFFER_MARKER_SPEC_VERSION 1 +#define VK_AMD_BUFFER_MARKER_EXTENSION_NAME "VK_AMD_buffer_marker" +#define VK_AMD_SHADER_CORE_PROPERTIES_SPEC_VERSION 1 +#define VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME "VK_AMD_shader_core_properties" +#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 1 +#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" +#define VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION 1 +#define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned" #define VK_MAKE_VERSION(major, minor, patch) \ (((major) << 22) | ((minor) << 12) | (patch)) #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) - #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) -#define VK_HEADER_VERSION 51 +#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) +#define VK_HEADER_VERSION 76 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; #define VK_NULL_HANDLE 0 @@ -128,7 +206,8 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCommandPool) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorPool) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSet) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSetLayout) -VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplateKHR) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplate) +typedef VkDescriptorUpdateTemplate VkDescriptorUpdateTemplateKHR; VK_DEFINE_HANDLE(VkDevice) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDeviceMemory) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkEvent) @@ -145,10 +224,13 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkQueryPool) VK_DEFINE_HANDLE(VkQueue) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkRenderPass) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSampler) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSamplerYcbcrConversion) +typedef VkSamplerYcbcrConversion VkSamplerYcbcrConversionKHR; VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSemaphore) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkShaderModule) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSwapchainKHR) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkValidationCacheEXT) typedef uint32_t VkBool32; typedef uint64_t VkDeviceSize; @@ -166,29 +248,46 @@ typedef VkFlags VkCommandBufferResetFlags; typedef VkFlags VkCommandBufferUsageFlags; typedef VkFlags VkCommandPoolCreateFlags; typedef VkFlags VkCommandPoolResetFlags; -typedef VkFlags VkCommandPoolTrimFlagsKHR; +typedef VkFlags VkCommandPoolTrimFlags; +typedef VkCommandPoolTrimFlags VkCommandPoolTrimFlagsKHR; typedef VkFlags VkCompositeAlphaFlagsKHR; typedef VkFlags VkCullModeFlags; typedef VkFlags VkDebugReportFlagsEXT; +typedef VkFlags VkDebugUtilsMessageSeverityFlagsEXT; +typedef VkFlags VkDebugUtilsMessageTypeFlagsEXT; +typedef VkFlags VkDebugUtilsMessengerCallbackDataFlagsEXT; +typedef VkFlags VkDebugUtilsMessengerCreateFlagsEXT; typedef VkFlags VkDependencyFlags; +typedef VkFlags VkDescriptorBindingFlagsEXT; typedef VkFlags VkDescriptorPoolCreateFlags; typedef VkFlags VkDescriptorPoolResetFlags; typedef VkFlags VkDescriptorSetLayoutCreateFlags; -typedef VkFlags VkDescriptorUpdateTemplateCreateFlagsKHR; +typedef VkFlags VkDescriptorUpdateTemplateCreateFlags; +typedef VkDescriptorUpdateTemplateCreateFlags VkDescriptorUpdateTemplateCreateFlagsKHR; typedef VkFlags VkDeviceCreateFlags; -typedef VkFlags VkDeviceGroupPresentModeFlagsKHX; +typedef VkFlags VkDeviceGroupPresentModeFlagsKHR; typedef VkFlags VkDeviceQueueCreateFlags; typedef VkFlags VkDisplayModeCreateFlagsKHR; typedef VkFlags VkDisplayPlaneAlphaFlagsKHR; typedef VkFlags VkDisplaySurfaceCreateFlagsKHR; typedef VkFlags VkEventCreateFlags; -typedef VkFlags VkExternalMemoryFeatureFlagsKHX; +typedef VkFlags VkExternalFenceFeatureFlags; +typedef VkExternalFenceFeatureFlags VkExternalFenceFeatureFlagsKHR; +typedef VkFlags VkExternalFenceHandleTypeFlags; +typedef VkExternalFenceHandleTypeFlags VkExternalFenceHandleTypeFlagsKHR; +typedef VkFlags VkExternalMemoryFeatureFlags; +typedef VkExternalMemoryFeatureFlags VkExternalMemoryFeatureFlagsKHR; typedef VkFlags VkExternalMemoryFeatureFlagsNV; -typedef VkFlags VkExternalMemoryHandleTypeFlagsKHX; +typedef VkFlags VkExternalMemoryHandleTypeFlags; +typedef VkExternalMemoryHandleTypeFlags VkExternalMemoryHandleTypeFlagsKHR; typedef VkFlags VkExternalMemoryHandleTypeFlagsNV; -typedef VkFlags VkExternalSemaphoreFeatureFlagsKHX; -typedef VkFlags VkExternalSemaphoreHandleTypeFlagsKHX; +typedef VkFlags VkExternalSemaphoreFeatureFlags; +typedef VkExternalSemaphoreFeatureFlags VkExternalSemaphoreFeatureFlagsKHR; +typedef VkFlags VkExternalSemaphoreHandleTypeFlags; +typedef VkExternalSemaphoreHandleTypeFlags VkExternalSemaphoreHandleTypeFlagsKHR; typedef VkFlags VkFenceCreateFlags; +typedef VkFlags VkFenceImportFlags; +typedef VkFenceImportFlags VkFenceImportFlagsKHR; typedef VkFlags VkFormatFeatureFlags; typedef VkFlags VkFramebufferCreateFlags; typedef VkFlags VkIOSSurfaceCreateFlagsMVK; @@ -199,15 +298,19 @@ typedef VkFlags VkImageViewCreateFlags; typedef VkFlags VkIndirectCommandsLayoutUsageFlagsNVX; typedef VkFlags VkInstanceCreateFlags; typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; -typedef VkFlags VkMemoryAllocateFlagsKHX; +typedef VkFlags VkMemoryAllocateFlags; +typedef VkMemoryAllocateFlags VkMemoryAllocateFlagsKHR; typedef VkFlags VkMemoryHeapFlags; typedef VkFlags VkMemoryMapFlags; typedef VkFlags VkMemoryPropertyFlags; typedef VkFlags VkMirSurfaceCreateFlagsKHR; typedef VkFlags VkObjectEntryUsageFlagsNVX; -typedef VkFlags VkPeerMemoryFeatureFlagsKHX; +typedef VkFlags VkPeerMemoryFeatureFlags; +typedef VkPeerMemoryFeatureFlags VkPeerMemoryFeatureFlagsKHR; typedef VkFlags VkPipelineCacheCreateFlags; typedef VkFlags VkPipelineColorBlendStateCreateFlags; +typedef VkFlags VkPipelineCoverageModulationStateCreateFlagsNV; +typedef VkFlags VkPipelineCoverageToColorStateCreateFlagsNV; typedef VkFlags VkPipelineCreateFlags; typedef VkFlags VkPipelineDepthStencilStateCreateFlags; typedef VkFlags VkPipelineDiscardRectangleStateCreateFlagsEXT; @@ -215,6 +318,7 @@ typedef VkFlags VkPipelineDynamicStateCreateFlags; typedef VkFlags VkPipelineInputAssemblyStateCreateFlags; typedef VkFlags VkPipelineLayoutCreateFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; +typedef VkFlags VkPipelineRasterizationConservativeStateCreateFlagsEXT; typedef VkFlags VkPipelineRasterizationStateCreateFlags; typedef VkFlags VkPipelineShaderStageCreateFlags; typedef VkFlags VkPipelineStageFlags; @@ -231,15 +335,19 @@ typedef VkFlags VkRenderPassCreateFlags; typedef VkFlags VkSampleCountFlags; typedef VkFlags VkSamplerCreateFlags; typedef VkFlags VkSemaphoreCreateFlags; +typedef VkFlags VkSemaphoreImportFlags; +typedef VkSemaphoreImportFlags VkSemaphoreImportFlagsKHR; typedef VkFlags VkShaderModuleCreateFlags; typedef VkFlags VkShaderStageFlags; typedef VkFlags VkSparseImageFormatFlags; typedef VkFlags VkSparseMemoryBindFlags; typedef VkFlags VkStencilFaceFlags; +typedef VkFlags VkSubgroupFeatureFlags; typedef VkFlags VkSubpassDescriptionFlags; typedef VkFlags VkSurfaceCounterFlagsEXT; typedef VkFlags VkSurfaceTransformFlagsKHR; typedef VkFlags VkSwapchainCreateFlagsKHR; +typedef VkFlags VkValidationCacheCreateFlagsEXT; typedef VkFlags VkViSurfaceCreateFlagsNN; typedef VkFlags VkWaylandSurfaceCreateFlagsKHR; typedef VkFlags VkWin32SurfaceCreateFlagsKHR; @@ -265,6 +373,7 @@ typedef enum VkAccessFlagBits VK_ACCESS_HOST_WRITE_BIT = 0x00004000, VK_ACCESS_MEMORY_READ_BIT = 0x00008000, VK_ACCESS_MEMORY_WRITE_BIT = 0x00010000, + VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000, VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkAccessFlagBits; @@ -320,6 +429,52 @@ typedef enum VkBlendOp VK_BLEND_OP_REVERSE_SUBTRACT = 2, VK_BLEND_OP_MIN = 3, VK_BLEND_OP_MAX = 4, + VK_BLEND_OP_ZERO_EXT = 1000148000, + VK_BLEND_OP_SRC_EXT = 1000148001, + VK_BLEND_OP_DST_EXT = 1000148002, + VK_BLEND_OP_SRC_OVER_EXT = 1000148003, + VK_BLEND_OP_DST_OVER_EXT = 1000148004, + VK_BLEND_OP_SRC_IN_EXT = 1000148005, + VK_BLEND_OP_DST_IN_EXT = 1000148006, + VK_BLEND_OP_SRC_OUT_EXT = 1000148007, + VK_BLEND_OP_DST_OUT_EXT = 1000148008, + VK_BLEND_OP_SRC_ATOP_EXT = 1000148009, + VK_BLEND_OP_DST_ATOP_EXT = 1000148010, + VK_BLEND_OP_XOR_EXT = 1000148011, + VK_BLEND_OP_MULTIPLY_EXT = 1000148012, + VK_BLEND_OP_SCREEN_EXT = 1000148013, + VK_BLEND_OP_OVERLAY_EXT = 1000148014, + VK_BLEND_OP_DARKEN_EXT = 1000148015, + VK_BLEND_OP_LIGHTEN_EXT = 1000148016, + VK_BLEND_OP_COLORDODGE_EXT = 1000148017, + VK_BLEND_OP_COLORBURN_EXT = 1000148018, + VK_BLEND_OP_HARDLIGHT_EXT = 1000148019, + VK_BLEND_OP_SOFTLIGHT_EXT = 1000148020, + VK_BLEND_OP_DIFFERENCE_EXT = 1000148021, + VK_BLEND_OP_EXCLUSION_EXT = 1000148022, + VK_BLEND_OP_INVERT_EXT = 1000148023, + VK_BLEND_OP_INVERT_RGB_EXT = 1000148024, + VK_BLEND_OP_LINEARDODGE_EXT = 1000148025, + VK_BLEND_OP_LINEARBURN_EXT = 1000148026, + VK_BLEND_OP_VIVIDLIGHT_EXT = 1000148027, + VK_BLEND_OP_LINEARLIGHT_EXT = 1000148028, + VK_BLEND_OP_PINLIGHT_EXT = 1000148029, + VK_BLEND_OP_HARDMIX_EXT = 1000148030, + VK_BLEND_OP_HSL_HUE_EXT = 1000148031, + VK_BLEND_OP_HSL_SATURATION_EXT = 1000148032, + VK_BLEND_OP_HSL_COLOR_EXT = 1000148033, + VK_BLEND_OP_HSL_LUMINOSITY_EXT = 1000148034, + VK_BLEND_OP_PLUS_EXT = 1000148035, + VK_BLEND_OP_PLUS_CLAMPED_EXT = 1000148036, + VK_BLEND_OP_PLUS_CLAMPED_ALPHA_EXT = 1000148037, + VK_BLEND_OP_PLUS_DARKER_EXT = 1000148038, + VK_BLEND_OP_MINUS_EXT = 1000148039, + VK_BLEND_OP_MINUS_CLAMPED_EXT = 1000148040, + VK_BLEND_OP_CONTRAST_EXT = 1000148041, + VK_BLEND_OP_INVERT_OVG_EXT = 1000148042, + VK_BLEND_OP_RED_EXT = 1000148043, + VK_BLEND_OP_GREEN_EXT = 1000148044, + VK_BLEND_OP_BLUE_EXT = 1000148045, VK_BLEND_OP_MAX_ENUM = 0x7fffffff, } VkBlendOp; @@ -356,6 +511,13 @@ typedef enum VkBufferUsageFlagBits VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkBufferUsageFlagBits; +typedef enum VkChromaLocation +{ + VK_CHROMA_LOCATION_COSITED_EVEN = 0, + VK_CHROMA_LOCATION_MIDPOINT = 1, + VK_CHROMA_LOCATION_MAX_ENUM = 0x7fffffff, +} VkChromaLocation; + typedef enum VkColorComponentFlagBits { VK_COLOR_COMPONENT_R_BIT = 0x00000001, @@ -445,12 +607,14 @@ typedef enum VkDependencyFlagBits typedef enum VkDescriptorPoolCreateFlagBits { VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT = 0x00000001, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT = 0x00000002, VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkDescriptorPoolCreateFlagBits; typedef enum VkDescriptorSetLayoutCreateFlagBits { VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR = 0x00000001, + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT = 0x00000002, VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkDescriptorSetLayoutCreateFlagBits; @@ -470,12 +634,16 @@ typedef enum VkDescriptorType VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7fffffff, } VkDescriptorType; -typedef enum VkDescriptorUpdateTemplateTypeKHR +typedef enum VkDescriptorUpdateTemplateType +{ + VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET = 0, + VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7fffffff, +} VkDescriptorUpdateTemplateType; + +typedef enum VkDeviceQueueCreateFlagBits { - VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR = 0, - VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1, - VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_KHR_MAX_ENUM = 0x7fffffff, -} VkDescriptorUpdateTemplateTypeKHR; + VK_DEVICE_QUEUE_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkDeviceQueueCreateFlagBits; typedef enum VkDynamicState { @@ -490,6 +658,7 @@ typedef enum VkDynamicState VK_DYNAMIC_STATE_STENCIL_REFERENCE = 8, VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV = 1000087000, VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT = 1000099000, + VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT = 1000143000, VK_DYNAMIC_STATE_MAX_ENUM = 0x7fffffff, } VkDynamicState; @@ -721,8 +890,7 @@ typedef enum VkFormatFeatureFlagBits VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800, VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000, VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = 0x00002000, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR = 0x00004000, - VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR = 0x00008000, + VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT_EXT = 0x00010000, VK_FORMAT_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkFormatFeatureFlagBits; @@ -749,7 +917,7 @@ typedef enum VkImageCreateFlagBits VK_IMAGE_CREATE_SPARSE_ALIASED_BIT = 0x00000004, VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000008, VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000010, - VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = 0x00000020, + VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000, VK_IMAGE_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkImageCreateFlagBits; @@ -888,7 +1056,7 @@ typedef enum VkObjectType VK_OBJECT_TYPE_COMMAND_POOL = 25, VK_OBJECT_TYPE_SURFACE_KHR = 1000000000, VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000, - VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = 1000085000, + VK_OBJECT_TYPE_VALIDATION_CACHE_EXT = 1000160000, VK_OBJECT_TYPE_MAX_ENUM = 0x7fffffff, } VkObjectType; @@ -950,6 +1118,7 @@ typedef enum VkPolygonMode VK_POLYGON_MODE_FILL = 0, VK_POLYGON_MODE_LINE = 1, VK_POLYGON_MODE_POINT = 2, + VK_POLYGON_MODE_FILL_RECTANGLE_NV = 1000153000, VK_POLYGON_MODE_MAX_ENUM = 0x7fffffff, } VkPolygonMode; @@ -1019,7 +1188,8 @@ typedef enum VkQueueFlagBits typedef enum VkResult { - VK_ERROR_OUT_OF_POOL_MEMORY_KHR = -1000069000, + VK_ERROR_NOT_PERMITTED_EXT = -1000174001, + VK_ERROR_FRAGMENTATION_EXT = -1000161000, VK_ERROR_INVALID_SHADER_NV = -1000012000, VK_ERROR_OUT_OF_DATE_KHR = -1000001004, VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001, @@ -1074,6 +1244,31 @@ typedef enum VkSamplerMipmapMode VK_SAMPLER_MIPMAP_MODE_MAX_ENUM = 0x7fffffff, } VkSamplerMipmapMode; +typedef enum VkSamplerYcbcrModelConversion +{ + VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY = 0, + VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY = 1, + VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709 = 2, + VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601 = 3, + VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020 = 4, + VK_SAMPLER_YCBCR_MODEL_CONVERSION_MAX_ENUM = 0x7fffffff, +} VkSamplerYcbcrModelConversion; + +typedef enum VkSamplerYcbcrRange +{ + VK_SAMPLER_YCBCR_RANGE_ITU_FULL = 0, + VK_SAMPLER_YCBCR_RANGE_ITU_NARROW = 1, + VK_SAMPLER_YCBCR_RANGE_MAX_ENUM = 0x7fffffff, +} VkSamplerYcbcrRange; + +typedef enum VkShaderInfoTypeAMD +{ + VK_SHADER_INFO_TYPE_STATISTICS_AMD = 0, + VK_SHADER_INFO_TYPE_BINARY_AMD = 1, + VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD = 2, + VK_SHADER_INFO_TYPE_AMD_MAX_ENUM = 0x7fffffff, +} VkShaderInfoTypeAMD; + typedef enum VkShaderStageFlagBits { VK_SHADER_STAGE_VERTEX_BIT = 0x00000001, @@ -1182,22 +1377,38 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR = 1000059000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR = 1000059001, - VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR = 1000059002, - VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059003, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR = 1000059004, - VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR = 1000059005, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR = 1000059006, - VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = 1000059007, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = 1000059008, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000, VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000, - VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR = 1000085000, VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV = 1000087000, VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000, VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT = 1000101000, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT = 1000101001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT = 1000130000, + VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT = 1000130001, + VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT = 1000143000, + VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001, + VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT = 1000143003, + VK_STRUCTURE_TYPE_MULTISAMPLE_PROPERTIES_EXT = 1000143004, + VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR = 1000147000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT = 1000148000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT = 1000148001, + VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT = 1000148002, + VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV = 1000149000, + VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV = 1000152000, + VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000, + VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT = 1000161000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT = 1000161001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT = 1000161002, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT = 1000161003, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = 1000161004, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, + VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7fffffff, } VkStructureType; @@ -1276,18 +1487,46 @@ typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( typedef void (VKAPI_PTR * PFN_vkVoidFunction)( void); -typedef struct VkAttachmentDescription +typedef struct VkApplicationInfo { - VkAttachmentDescriptionFlags flags; - VkFormat format; - VkSampleCountFlagBits samples; - VkAttachmentLoadOp loadOp; - VkAttachmentStoreOp storeOp; - VkAttachmentLoadOp stencilLoadOp; - VkAttachmentStoreOp stencilStoreOp; - VkImageLayout initialLayout; - VkImageLayout finalLayout; -} VkAttachmentDescription; + VkStructureType sType; + const void *pNext; + const char *pApplicationName; + uint32_t applicationVersion; + const char *pEngineName; + uint32_t engineVersion; + uint32_t apiVersion; +} VkApplicationInfo; + +typedef struct VkAttachmentReference +{ + uint32_t attachment; + VkImageLayout layout; +} VkAttachmentReference; + +typedef struct VkBaseInStructure +{ + VkStructureType sType; + const struct VkBaseInStructure *pNext; +} VkBaseInStructure; + +typedef struct VkBindBufferMemoryInfo +{ + VkStructureType sType; + const void *pNext; + VkBuffer WINE_VK_ALIGN(8) buffer; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; +} VkBindBufferMemoryInfo; + +typedef struct VkBindImageMemoryInfo +{ + VkStructureType sType; + const void *pNext; + VkImage WINE_VK_ALIGN(8) image; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; +} VkBindImageMemoryInfo; typedef struct VkBufferCopy { @@ -1358,12 +1597,12 @@ typedef struct VkCopyDescriptorSet uint32_t descriptorCount; } VkCopyDescriptorSet; -typedef struct VkDescriptorImageInfo +typedef struct VkDescriptorBufferInfo { - VkSampler WINE_VK_ALIGN(8) sampler; - VkImageView WINE_VK_ALIGN(8) imageView; - VkImageLayout imageLayout; -} VkDescriptorImageInfo; + VkBuffer WINE_VK_ALIGN(8) buffer; + VkDeviceSize WINE_VK_ALIGN(8) offset; + VkDeviceSize WINE_VK_ALIGN(8) range; +} VkDescriptorBufferInfo; typedef struct VkDescriptorPoolSize { @@ -1380,22 +1619,24 @@ typedef struct VkDescriptorSetLayoutBinding const VkSampler *pImmutableSamplers; } VkDescriptorSetLayoutBinding; -typedef struct VkDescriptorUpdateTemplateEntryKHR +typedef struct VkDescriptorSetLayoutCreateInfo { - uint32_t dstBinding; - uint32_t dstArrayElement; - uint32_t descriptorCount; - VkDescriptorType descriptorType; - size_t offset; - size_t stride; -} VkDescriptorUpdateTemplateEntryKHR; + VkStructureType sType; + const void *pNext; + VkDescriptorSetLayoutCreateFlags flags; + uint32_t bindingCount; + const VkDescriptorSetLayoutBinding *pBindings; +} VkDescriptorSetLayoutCreateInfo; -typedef struct VkDispatchIndirectCommand +typedef struct VkDeviceQueueCreateInfo { - uint32_t x; - uint32_t y; - uint32_t z; -} VkDispatchIndirectCommand; + VkStructureType sType; + const void *pNext; + VkDeviceQueueCreateFlags flags; + uint32_t queueFamilyIndex; + uint32_t queueCount; + const float *pQueuePriorities; +} VkDeviceQueueCreateInfo; typedef struct VkDrawIndirectCommand { @@ -1405,18 +1646,11 @@ typedef struct VkDrawIndirectCommand uint32_t firstInstance; } VkDrawIndirectCommand; -typedef struct VkExtensionProperties -{ - char extensionName[VK_MAX_EXTENSION_NAME_SIZE]; - uint32_t specVersion; -} VkExtensionProperties; - -typedef struct VkExtent3D +typedef struct VkExtent2D { uint32_t width; uint32_t height; - uint32_t depth; -} VkExtent3D; +} VkExtent2D; typedef struct VkFormatProperties { @@ -1425,37 +1659,19 @@ typedef struct VkFormatProperties VkFormatFeatureFlags bufferFeatures; } VkFormatProperties; -typedef struct VkFramebufferCreateInfo +typedef struct VkImageMemoryRequirementsInfo2 { VkStructureType sType; const void *pNext; - VkFramebufferCreateFlags flags; - VkRenderPass WINE_VK_ALIGN(8) renderPass; - uint32_t attachmentCount; - const VkImageView *pAttachments; - uint32_t width; - uint32_t height; - uint32_t layers; -} VkFramebufferCreateInfo; + VkImage WINE_VK_ALIGN(8) image; +} VkImageMemoryRequirementsInfo2; -typedef struct VkImageCreateInfo +typedef struct VkImageSparseMemoryRequirementsInfo2 { VkStructureType sType; const void *pNext; - VkImageCreateFlags flags; - VkImageType imageType; - VkFormat format; - VkExtent3D extent; - uint32_t mipLevels; - uint32_t arrayLayers; - VkSampleCountFlagBits samples; - VkImageTiling tiling; - VkImageUsageFlags usage; - VkSharingMode sharingMode; - uint32_t queueFamilyIndexCount; - const uint32_t *pQueueFamilyIndices; - VkImageLayout initialLayout; -} VkImageCreateInfo; + VkImage WINE_VK_ALIGN(8) image; +} VkImageSparseMemoryRequirementsInfo2; typedef struct VkImageSubresource { @@ -1502,20 +1718,20 @@ typedef struct VkMappedMemoryRange VkDeviceSize WINE_VK_ALIGN(8) size; } VkMappedMemoryRange; -typedef struct VkMemoryAllocateInfo +typedef struct VkMemoryBarrier { VkStructureType sType; const void *pNext; - VkDeviceSize WINE_VK_ALIGN(8) allocationSize; - uint32_t memoryTypeIndex; -} VkMemoryAllocateInfo; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; +} VkMemoryBarrier; -typedef struct VkMemoryRequirements +typedef struct VkMultisamplePropertiesEXT { - VkDeviceSize WINE_VK_ALIGN(8) size; - VkDeviceSize WINE_VK_ALIGN(8) alignment; - uint32_t memoryTypeBits; -} VkMemoryRequirements; + VkStructureType sType; + void *pNext; + VkExtent2D maxSampleLocationGridSize; +} VkMultisamplePropertiesEXT; typedef struct VkOffset3D { @@ -1524,75 +1740,16 @@ typedef struct VkOffset3D int32_t z; } VkOffset3D; -typedef struct VkPhysicalDeviceFeatures -{ - VkBool32 robustBufferAccess; - VkBool32 fullDrawIndexUint32; - VkBool32 imageCubeArray; - VkBool32 independentBlend; - VkBool32 geometryShader; - VkBool32 tessellationShader; - VkBool32 sampleRateShading; - VkBool32 dualSrcBlend; - VkBool32 logicOp; - VkBool32 multiDrawIndirect; - VkBool32 drawIndirectFirstInstance; - VkBool32 depthClamp; - VkBool32 depthBiasClamp; - VkBool32 fillModeNonSolid; - VkBool32 depthBounds; - VkBool32 wideLines; - VkBool32 largePoints; - VkBool32 alphaToOne; - VkBool32 multiViewport; - VkBool32 samplerAnisotropy; - VkBool32 textureCompressionETC2; - VkBool32 textureCompressionASTC_LDR; - VkBool32 textureCompressionBC; - VkBool32 occlusionQueryPrecise; - VkBool32 pipelineStatisticsQuery; - VkBool32 vertexPipelineStoresAndAtomics; - VkBool32 fragmentStoresAndAtomics; - VkBool32 shaderTessellationAndGeometryPointSize; - VkBool32 shaderImageGatherExtended; - VkBool32 shaderStorageImageExtendedFormats; - VkBool32 shaderStorageImageMultisample; - VkBool32 shaderStorageImageReadWithoutFormat; - VkBool32 shaderStorageImageWriteWithoutFormat; - VkBool32 shaderUniformBufferArrayDynamicIndexing; - VkBool32 shaderSampledImageArrayDynamicIndexing; - VkBool32 shaderStorageBufferArrayDynamicIndexing; - VkBool32 shaderStorageImageArrayDynamicIndexing; - VkBool32 shaderClipDistance; - VkBool32 shaderCullDistance; - VkBool32 shaderFloat64; - VkBool32 shaderInt64; - VkBool32 shaderInt16; - VkBool32 shaderResourceResidency; - VkBool32 shaderResourceMinLod; - VkBool32 sparseBinding; - VkBool32 sparseResidencyBuffer; - VkBool32 sparseResidencyImage2D; - VkBool32 sparseResidencyImage3D; - VkBool32 sparseResidency2Samples; - VkBool32 sparseResidency4Samples; - VkBool32 sparseResidency8Samples; - VkBool32 sparseResidency16Samples; - VkBool32 sparseResidencyAliased; - VkBool32 variableMultisampleRate; - VkBool32 inheritedQueries; -} VkPhysicalDeviceFeatures; - -typedef struct VkPhysicalDeviceImageFormatInfo2KHR +typedef struct VkPhysicalDeviceSparseImageFormatInfo2 { VkStructureType sType; const void *pNext; VkFormat format; VkImageType type; - VkImageTiling tiling; + VkSampleCountFlagBits samples; VkImageUsageFlags usage; - VkImageCreateFlags flags; -} VkPhysicalDeviceImageFormatInfo2KHR; + VkImageTiling tiling; +} VkPhysicalDeviceSparseImageFormatInfo2; typedef struct VkPhysicalDeviceSparseProperties { @@ -1612,6 +1769,18 @@ typedef struct VkPipelineCacheCreateInfo const void *pInitialData; } VkPipelineCacheCreateInfo; +typedef struct VkPipelineColorBlendAttachmentState +{ + VkBool32 blendEnable; + VkBlendFactor srcColorBlendFactor; + VkBlendFactor dstColorBlendFactor; + VkBlendOp colorBlendOp; + VkBlendFactor srcAlphaBlendFactor; + VkBlendFactor dstAlphaBlendFactor; + VkBlendOp alphaBlendOp; + VkColorComponentFlags colorWriteMask; +} VkPipelineColorBlendAttachmentState; + typedef struct VkPipelineInputAssemblyStateCreateInfo { VkStructureType sType; @@ -1634,6 +1803,23 @@ typedef struct VkPipelineMultisampleStateCreateInfo VkBool32 alphaToOneEnable; } VkPipelineMultisampleStateCreateInfo; +typedef struct VkPipelineRasterizationStateCreateInfo +{ + VkStructureType sType; + const void *pNext; + VkPipelineRasterizationStateCreateFlags flags; + VkBool32 depthClampEnable; + VkBool32 rasterizerDiscardEnable; + VkPolygonMode polygonMode; + VkCullModeFlags cullMode; + VkFrontFace frontFace; + VkBool32 depthBiasEnable; + float depthBiasConstantFactor; + float depthBiasClamp; + float depthBiasSlopeFactor; + float lineWidth; +} VkPipelineRasterizationStateCreateInfo; + typedef struct VkPipelineTessellationStateCreateInfo { VkStructureType sType; @@ -1654,48 +1840,55 @@ typedef struct VkPresentInfoKHR VkResult *pResults; } VkPresentInfoKHR; -typedef struct VkQueryPoolCreateInfo +typedef struct VkPushConstantRange { - VkStructureType sType; - const void *pNext; - VkQueryPoolCreateFlags flags; - VkQueryType queryType; - uint32_t queryCount; - VkQueryPipelineStatisticFlags pipelineStatistics; -} VkQueryPoolCreateInfo; + VkShaderStageFlags stageFlags; + uint32_t offset; + uint32_t size; +} VkPushConstantRange; -typedef struct VkSemaphoreCreateInfo +typedef struct VkSamplerCreateInfo { VkStructureType sType; const void *pNext; - VkSemaphoreCreateFlags flags; -} VkSemaphoreCreateInfo; - -typedef struct VkSparseImageFormatProperties -{ - VkImageAspectFlags aspectMask; - VkExtent3D imageGranularity; - VkSparseImageFormatFlags flags; -} VkSparseImageFormatProperties; + VkSamplerCreateFlags flags; + VkFilter magFilter; + VkFilter minFilter; + VkSamplerMipmapMode mipmapMode; + VkSamplerAddressMode addressModeU; + VkSamplerAddressMode addressModeV; + VkSamplerAddressMode addressModeW; + float mipLodBias; + VkBool32 anisotropyEnable; + float maxAnisotropy; + VkBool32 compareEnable; + VkCompareOp compareOp; + float minLod; + float maxLod; + VkBorderColor borderColor; + VkBool32 unnormalizedCoordinates; +} VkSamplerCreateInfo; -typedef struct VkSparseImageMemoryBind +typedef struct VkSamplerYcbcrConversionCreateInfo { - VkImageSubresource subresource; - VkOffset3D offset; - VkExtent3D extent; - VkDeviceMemory WINE_VK_ALIGN(8) memory; - VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; - VkSparseMemoryBindFlags flags; -} VkSparseImageMemoryBind; + VkStructureType sType; + const void *pNext; + VkFormat format; + VkSamplerYcbcrModelConversion ycbcrModel; + VkSamplerYcbcrRange ycbcrRange; + VkComponentMapping components; + VkChromaLocation xChromaOffset; + VkChromaLocation yChromaOffset; + VkFilter chromaFilter; + VkBool32 forceExplicitReconstruction; +} VkSamplerYcbcrConversionCreateInfo; -typedef struct VkSparseImageMemoryRequirements +typedef struct VkSemaphoreCreateInfo { - VkSparseImageFormatProperties formatProperties; - uint32_t imageMipTailFirstLod; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailSize; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailOffset; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailStride; -} VkSparseImageMemoryRequirements; + VkStructureType sType; + const void *pNext; + VkSemaphoreCreateFlags flags; +} VkSemaphoreCreateInfo; typedef struct VkSparseMemoryBind { @@ -1726,6 +1919,20 @@ typedef struct VkSubmitInfo const VkSemaphore *pSignalSemaphores; } VkSubmitInfo; +typedef struct VkSubpassDescription +{ + VkSubpassDescriptionFlags flags; + VkPipelineBindPoint pipelineBindPoint; + uint32_t inputAttachmentCount; + const VkAttachmentReference *pInputAttachments; + uint32_t colorAttachmentCount; + const VkAttachmentReference *pColorAttachments; + const VkAttachmentReference *pResolveAttachments; + const VkAttachmentReference *pDepthStencilAttachment; + uint32_t preserveAttachmentCount; + const uint32_t *pPreserveAttachments; +} VkSubpassDescription; + typedef struct VkSubresourceLayout { VkDeviceSize WINE_VK_ALIGN(8) offset; @@ -1735,13 +1942,12 @@ typedef struct VkSubresourceLayout VkDeviceSize WINE_VK_ALIGN(8) depthPitch; } VkSubresourceLayout; -typedef struct VkVertexInputAttributeDescription +typedef struct VkVertexInputBindingDescription { - uint32_t location; uint32_t binding; - VkFormat format; - uint32_t offset; -} VkVertexInputAttributeDescription; + uint32_t stride; + VkVertexInputRate inputRate; +} VkVertexInputBindingDescription; typedef struct VkAllocationCallbacks { @@ -1753,12 +1959,6 @@ typedef struct VkAllocationCallbacks PFN_vkInternalFreeNotification pfnInternalFree; } VkAllocationCallbacks; -typedef struct VkAttachmentReference -{ - uint32_t attachment; - VkImageLayout layout; -} VkAttachmentReference; - typedef struct VkBufferCreateInfo { VkStructureType sType; @@ -1771,16 +1971,12 @@ typedef struct VkBufferCreateInfo const uint32_t *pQueueFamilyIndices; } VkBufferCreateInfo; -typedef struct VkBufferViewCreateInfo +typedef struct VkBufferMemoryRequirementsInfo2 { VkStructureType sType; const void *pNext; - VkBufferViewCreateFlags flags; VkBuffer WINE_VK_ALIGN(8) buffer; - VkFormat format; - VkDeviceSize WINE_VK_ALIGN(8) offset; - VkDeviceSize WINE_VK_ALIGN(8) range; -} VkBufferViewCreateInfo; +} VkBufferMemoryRequirementsInfo2; typedef struct VkClearDepthStencilValue { @@ -1802,35 +1998,25 @@ typedef struct VkCommandBufferBeginInfo const VkCommandBufferInheritanceInfo *pInheritanceInfo; } VkCommandBufferBeginInfo; -typedef struct VkDescriptorBufferInfo -{ - VkBuffer WINE_VK_ALIGN(8) buffer; - VkDeviceSize WINE_VK_ALIGN(8) offset; - VkDeviceSize WINE_VK_ALIGN(8) range; -} VkDescriptorBufferInfo; - -typedef struct VkDescriptorSetAllocateInfo +typedef struct VkDescriptorPoolCreateInfo { VkStructureType sType; const void *pNext; - VkDescriptorPool WINE_VK_ALIGN(8) descriptorPool; - uint32_t descriptorSetCount; - const VkDescriptorSetLayout *pSetLayouts; -} VkDescriptorSetAllocateInfo; + VkDescriptorPoolCreateFlags flags; + uint32_t maxSets; + uint32_t poolSizeCount; + const VkDescriptorPoolSize *pPoolSizes; +} VkDescriptorPoolCreateInfo; -typedef struct VkDescriptorUpdateTemplateCreateInfoKHR +typedef struct VkDescriptorUpdateTemplateEntry { - VkStructureType sType; - void *pNext; - VkDescriptorUpdateTemplateCreateFlagsKHR flags; - uint32_t descriptorUpdateEntryCount; - const VkDescriptorUpdateTemplateEntryKHR *pDescriptorUpdateEntries; - VkDescriptorUpdateTemplateTypeKHR templateType; - VkDescriptorSetLayout WINE_VK_ALIGN(8) descriptorSetLayout; - VkPipelineBindPoint pipelineBindPoint; - VkPipelineLayout WINE_VK_ALIGN(8) pipelineLayout; - uint32_t set; -} VkDescriptorUpdateTemplateCreateInfoKHR; + uint32_t dstBinding; + uint32_t dstArrayElement; + uint32_t descriptorCount; + VkDescriptorType descriptorType; + size_t offset; + size_t stride; +} VkDescriptorUpdateTemplateEntry; typedef struct VkEventCreateInfo { @@ -1839,27 +2025,25 @@ typedef struct VkEventCreateInfo VkEventCreateFlags flags; } VkEventCreateInfo; -typedef struct VkExtent2D +typedef struct VkExtensionProperties { - uint32_t width; - uint32_t height; -} VkExtent2D; + char extensionName[VK_MAX_EXTENSION_NAME_SIZE]; + uint32_t specVersion; +} VkExtensionProperties; -typedef struct VkFormatProperties2KHR +typedef struct VkFenceCreateInfo { VkStructureType sType; - void *pNext; - VkFormatProperties formatProperties; -} VkFormatProperties2KHR; + const void *pNext; + VkFenceCreateFlags flags; +} VkFenceCreateInfo; -typedef struct VkImageFormatProperties +typedef struct VkFormatProperties2 { - VkExtent3D maxExtent; - uint32_t maxMipLevels; - uint32_t maxArrayLayers; - VkSampleCountFlags sampleCounts; - VkDeviceSize WINE_VK_ALIGN(8) maxResourceSize; -} VkImageFormatProperties; + VkStructureType sType; + void *pNext; + VkFormatProperties formatProperties; +} VkFormatProperties2; typedef struct VkImageMemoryBarrier { @@ -1875,21 +2059,20 @@ typedef struct VkImageMemoryBarrier VkImageSubresourceRange subresourceRange; } VkImageMemoryBarrier; -typedef struct VkImageSubresourceLayers -{ - VkImageAspectFlags aspectMask; - uint32_t mipLevel; - uint32_t baseArrayLayer; - uint32_t layerCount; -} VkImageSubresourceLayers; - -typedef struct VkMemoryBarrier +typedef struct VkMemoryAllocateInfo { VkStructureType sType; const void *pNext; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; -} VkMemoryBarrier; + VkDeviceSize WINE_VK_ALIGN(8) allocationSize; + uint32_t memoryTypeIndex; +} VkMemoryAllocateInfo; + +typedef struct VkMemoryRequirements +{ + VkDeviceSize WINE_VK_ALIGN(8) size; + VkDeviceSize WINE_VK_ALIGN(8) alignment; + uint32_t memoryTypeBits; +} VkMemoryRequirements; typedef struct VkMemoryType { @@ -1897,28 +2080,93 @@ typedef struct VkMemoryType uint32_t heapIndex; } VkMemoryType; -typedef struct VkPhysicalDeviceSparseImageFormatInfo2KHR +typedef struct VkOffset2D +{ + int32_t x; + int32_t y; +} VkOffset2D; + +typedef struct VkPhysicalDeviceFeatures +{ + VkBool32 robustBufferAccess; + VkBool32 fullDrawIndexUint32; + VkBool32 imageCubeArray; + VkBool32 independentBlend; + VkBool32 geometryShader; + VkBool32 tessellationShader; + VkBool32 sampleRateShading; + VkBool32 dualSrcBlend; + VkBool32 logicOp; + VkBool32 multiDrawIndirect; + VkBool32 drawIndirectFirstInstance; + VkBool32 depthClamp; + VkBool32 depthBiasClamp; + VkBool32 fillModeNonSolid; + VkBool32 depthBounds; + VkBool32 wideLines; + VkBool32 largePoints; + VkBool32 alphaToOne; + VkBool32 multiViewport; + VkBool32 samplerAnisotropy; + VkBool32 textureCompressionETC2; + VkBool32 textureCompressionASTC_LDR; + VkBool32 textureCompressionBC; + VkBool32 occlusionQueryPrecise; + VkBool32 pipelineStatisticsQuery; + VkBool32 vertexPipelineStoresAndAtomics; + VkBool32 fragmentStoresAndAtomics; + VkBool32 shaderTessellationAndGeometryPointSize; + VkBool32 shaderImageGatherExtended; + VkBool32 shaderStorageImageExtendedFormats; + VkBool32 shaderStorageImageMultisample; + VkBool32 shaderStorageImageReadWithoutFormat; + VkBool32 shaderStorageImageWriteWithoutFormat; + VkBool32 shaderUniformBufferArrayDynamicIndexing; + VkBool32 shaderSampledImageArrayDynamicIndexing; + VkBool32 shaderStorageBufferArrayDynamicIndexing; + VkBool32 shaderStorageImageArrayDynamicIndexing; + VkBool32 shaderClipDistance; + VkBool32 shaderCullDistance; + VkBool32 shaderFloat64; + VkBool32 shaderInt64; + VkBool32 shaderInt16; + VkBool32 shaderResourceResidency; + VkBool32 shaderResourceMinLod; + VkBool32 sparseBinding; + VkBool32 sparseResidencyBuffer; + VkBool32 sparseResidencyImage2D; + VkBool32 sparseResidencyImage3D; + VkBool32 sparseResidency2Samples; + VkBool32 sparseResidency4Samples; + VkBool32 sparseResidency8Samples; + VkBool32 sparseResidency16Samples; + VkBool32 sparseResidencyAliased; + VkBool32 variableMultisampleRate; + VkBool32 inheritedQueries; +} VkPhysicalDeviceFeatures; + +typedef struct VkPhysicalDeviceImageFormatInfo2 { VkStructureType sType; const void *pNext; VkFormat format; VkImageType type; - VkSampleCountFlagBits samples; - VkImageUsageFlags usage; VkImageTiling tiling; -} VkPhysicalDeviceSparseImageFormatInfo2KHR; + VkImageUsageFlags usage; + VkImageCreateFlags flags; +} VkPhysicalDeviceImageFormatInfo2; -typedef struct VkPipelineColorBlendAttachmentState +typedef struct VkPipelineColorBlendStateCreateInfo { - VkBool32 blendEnable; - VkBlendFactor srcColorBlendFactor; - VkBlendFactor dstColorBlendFactor; - VkBlendOp colorBlendOp; - VkBlendFactor srcAlphaBlendFactor; - VkBlendFactor dstAlphaBlendFactor; - VkBlendOp alphaBlendOp; - VkColorComponentFlags colorWriteMask; -} VkPipelineColorBlendAttachmentState; + VkStructureType sType; + const void *pNext; + VkPipelineColorBlendStateCreateFlags flags; + VkBool32 logicOpEnable; + VkLogicOp logicOp; + uint32_t attachmentCount; + const VkPipelineColorBlendAttachmentState *pAttachments; + float blendConstants[4]; +} VkPipelineColorBlendStateCreateInfo; typedef struct VkPipelineDynamicStateCreateInfo { @@ -1929,52 +2177,38 @@ typedef struct VkPipelineDynamicStateCreateInfo const VkDynamicState *pDynamicStates; } VkPipelineDynamicStateCreateInfo; -typedef struct VkPipelineRasterizationStateCreateInfo +typedef struct VkQueryPoolCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineRasterizationStateCreateFlags flags; - VkBool32 depthClampEnable; - VkBool32 rasterizerDiscardEnable; - VkPolygonMode polygonMode; - VkCullModeFlags cullMode; - VkFrontFace frontFace; - VkBool32 depthBiasEnable; - float depthBiasConstantFactor; - float depthBiasClamp; - float depthBiasSlopeFactor; - float lineWidth; -} VkPipelineRasterizationStateCreateInfo; + VkQueryPoolCreateFlags flags; + VkQueryType queryType; + uint32_t queryCount; + VkQueryPipelineStatisticFlags pipelineStatistics; +} VkQueryPoolCreateInfo; -typedef struct VkQueueFamilyProperties +typedef struct VkRect2D { - VkQueueFlags queueFlags; - uint32_t queueCount; - uint32_t timestampValidBits; - VkExtent3D minImageTransferGranularity; -} VkQueueFamilyProperties; + VkOffset2D offset; + VkExtent2D extent; +} VkRect2D; -typedef struct VkSamplerCreateInfo +typedef struct VkRenderPassBeginInfo { VkStructureType sType; const void *pNext; - VkSamplerCreateFlags flags; - VkFilter magFilter; - VkFilter minFilter; - VkSamplerMipmapMode mipmapMode; - VkSamplerAddressMode addressModeU; - VkSamplerAddressMode addressModeV; - VkSamplerAddressMode addressModeW; - float mipLodBias; - VkBool32 anisotropyEnable; - float maxAnisotropy; - VkBool32 compareEnable; - VkCompareOp compareOp; - float minLod; - float maxLod; - VkBorderColor borderColor; - VkBool32 unnormalizedCoordinates; -} VkSamplerCreateInfo; + VkRenderPass WINE_VK_ALIGN(8) renderPass; + VkFramebuffer WINE_VK_ALIGN(8) framebuffer; + VkRect2D renderArea; + uint32_t clearValueCount; + const VkClearValue *pClearValues; +} VkRenderPassBeginInfo; + +typedef struct VkSampleLocationEXT +{ + float x; + float y; +} VkSampleLocationEXT; typedef struct VkSparseBufferMemoryBindInfo { @@ -1983,37 +2217,67 @@ typedef struct VkSparseBufferMemoryBindInfo const VkSparseMemoryBind *pBinds; } VkSparseBufferMemoryBindInfo; -typedef struct VkSparseImageMemoryBindInfo +typedef struct VkSparseImageOpaqueMemoryBindInfo { VkImage WINE_VK_ALIGN(8) image; uint32_t bindCount; - const VkSparseImageMemoryBind *pBinds; -} VkSparseImageMemoryBindInfo; + const VkSparseMemoryBind *pBinds; +} VkSparseImageOpaqueMemoryBindInfo; -typedef struct VkSpecializationInfo +typedef struct VkStencilOpState { - uint32_t mapEntryCount; - const VkSpecializationMapEntry *pMapEntries; - size_t dataSize; - const void *pData; -} VkSpecializationInfo; + VkStencilOp failOp; + VkStencilOp passOp; + VkStencilOp depthFailOp; + VkCompareOp compareOp; + uint32_t compareMask; + uint32_t writeMask; + uint32_t reference; +} VkStencilOpState; -typedef struct VkSubpassDependency +typedef struct VkSurfaceCapabilitiesKHR { - uint32_t srcSubpass; - uint32_t dstSubpass; - VkPipelineStageFlags srcStageMask; - VkPipelineStageFlags dstStageMask; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; - VkDependencyFlags dependencyFlags; -} VkSubpassDependency; + uint32_t minImageCount; + uint32_t maxImageCount; + VkExtent2D currentExtent; + VkExtent2D minImageExtent; + VkExtent2D maxImageExtent; + uint32_t maxImageArrayLayers; + VkSurfaceTransformFlagsKHR supportedTransforms; + VkSurfaceTransformFlagBitsKHR currentTransform; + VkCompositeAlphaFlagsKHR supportedCompositeAlpha; + VkImageUsageFlags supportedUsageFlags; +} VkSurfaceCapabilitiesKHR; -typedef struct VkSurfaceFormatKHR +typedef struct VkSwapchainCreateInfoKHR { + VkStructureType sType; + const void *pNext; + VkSwapchainCreateFlagsKHR flags; + VkSurfaceKHR WINE_VK_ALIGN(8) surface; + uint32_t minImageCount; + VkFormat imageFormat; + VkColorSpaceKHR imageColorSpace; + VkExtent2D imageExtent; + uint32_t imageArrayLayers; + VkImageUsageFlags imageUsage; + VkSharingMode imageSharingMode; + uint32_t queueFamilyIndexCount; + const uint32_t *pQueueFamilyIndices; + VkSurfaceTransformFlagBitsKHR preTransform; + VkCompositeAlphaFlagBitsKHR compositeAlpha; + VkPresentModeKHR presentMode; + VkBool32 clipped; + VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain; +} VkSwapchainCreateInfoKHR; + +typedef struct VkVertexInputAttributeDescription +{ + uint32_t location; + uint32_t binding; VkFormat format; - VkColorSpaceKHR colorSpace; -} VkSurfaceFormatKHR; + uint32_t offset; +} VkVertexInputAttributeDescription; typedef struct VkViewport { @@ -2025,113 +2289,157 @@ typedef struct VkViewport float maxDepth; } VkViewport; -typedef struct VkWriteDescriptorSet +typedef struct VkBaseOutStructure { VkStructureType sType; - const void *pNext; - VkDescriptorSet WINE_VK_ALIGN(8) dstSet; - uint32_t dstBinding; - uint32_t dstArrayElement; - uint32_t descriptorCount; - VkDescriptorType descriptorType; - const VkDescriptorImageInfo *pImageInfo; - const VkDescriptorBufferInfo *pBufferInfo; - const VkBufferView *pTexelBufferView; -} VkWriteDescriptorSet; + struct VkBaseOutStructure *pNext; +} VkBaseOutStructure; -typedef struct VkApplicationInfo +typedef struct VkBufferViewCreateInfo { VkStructureType sType; const void *pNext; - const char *pApplicationName; - uint32_t applicationVersion; - const char *pEngineName; - uint32_t engineVersion; - uint32_t apiVersion; -} VkApplicationInfo; + VkBufferViewCreateFlags flags; + VkBuffer WINE_VK_ALIGN(8) buffer; + VkFormat format; + VkDeviceSize WINE_VK_ALIGN(8) offset; + VkDeviceSize WINE_VK_ALIGN(8) range; +} VkBufferViewCreateInfo; -typedef struct VkBufferImageCopy +typedef struct VkClearRect { - VkDeviceSize WINE_VK_ALIGN(8) bufferOffset; - uint32_t bufferRowLength; - uint32_t bufferImageHeight; - VkImageSubresourceLayers imageSubresource; - VkOffset3D imageOffset; - VkExtent3D imageExtent; -} VkBufferImageCopy; + VkRect2D rect; + uint32_t baseArrayLayer; + uint32_t layerCount; +} VkClearRect; -typedef struct VkDescriptorPoolCreateInfo +typedef struct VkCommandPoolCreateInfo { VkStructureType sType; const void *pNext; - VkDescriptorPoolCreateFlags flags; - uint32_t maxSets; - uint32_t poolSizeCount; - const VkDescriptorPoolSize *pPoolSizes; -} VkDescriptorPoolCreateInfo; + VkCommandPoolCreateFlags flags; + uint32_t queueFamilyIndex; +} VkCommandPoolCreateInfo; -typedef struct VkDeviceQueueCreateInfo +typedef struct VkDescriptorSetAllocateInfo { VkStructureType sType; const void *pNext; - VkDeviceQueueCreateFlags flags; - uint32_t queueFamilyIndex; - uint32_t queueCount; - const float *pQueuePriorities; -} VkDeviceQueueCreateInfo; + VkDescriptorPool WINE_VK_ALIGN(8) descriptorPool; + uint32_t descriptorSetCount; + const VkDescriptorSetLayout *pSetLayouts; +} VkDescriptorSetAllocateInfo; -typedef struct VkFenceCreateInfo +typedef struct VkDescriptorUpdateTemplateCreateInfo { VkStructureType sType; - const void *pNext; - VkFenceCreateFlags flags; -} VkFenceCreateInfo; + void *pNext; + VkDescriptorUpdateTemplateCreateFlags flags; + uint32_t descriptorUpdateEntryCount; + const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries; + VkDescriptorUpdateTemplateType templateType; + VkDescriptorSetLayout WINE_VK_ALIGN(8) descriptorSetLayout; + VkPipelineBindPoint pipelineBindPoint; + VkPipelineLayout WINE_VK_ALIGN(8) pipelineLayout; + uint32_t set; +} VkDescriptorUpdateTemplateCreateInfo; -typedef struct VkImageBlit +typedef struct VkDispatchIndirectCommand { - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffsets[2]; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffsets[2]; -} VkImageBlit; + uint32_t x; + uint32_t y; + uint32_t z; +} VkDispatchIndirectCommand; + +typedef struct VkDrawIndexedIndirectCommand +{ + uint32_t indexCount; + uint32_t instanceCount; + uint32_t firstIndex; + int32_t vertexOffset; + uint32_t firstInstance; +} VkDrawIndexedIndirectCommand; + +typedef struct VkExtent3D +{ + uint32_t width; + uint32_t height; + uint32_t depth; +} VkExtent3D; -typedef struct VkImageFormatProperties2KHR +typedef struct VkFramebufferCreateInfo { VkStructureType sType; - void *pNext; - VkImageFormatProperties WINE_VK_ALIGN(8) imageFormatProperties; -} VkImageFormatProperties2KHR; + const void *pNext; + VkFramebufferCreateFlags flags; + VkRenderPass WINE_VK_ALIGN(8) renderPass; + uint32_t attachmentCount; + const VkImageView *pAttachments; + uint32_t width; + uint32_t height; + uint32_t layers; +} VkFramebufferCreateInfo; -typedef struct VkOffset2D +typedef struct VkImageCreateInfo { - int32_t x; - int32_t y; -} VkOffset2D; + VkStructureType sType; + const void *pNext; + VkImageCreateFlags flags; + VkImageType imageType; + VkFormat format; + VkExtent3D extent; + uint32_t mipLevels; + uint32_t arrayLayers; + VkSampleCountFlagBits samples; + VkImageTiling tiling; + VkImageUsageFlags usage; + VkSharingMode sharingMode; + uint32_t queueFamilyIndexCount; + const uint32_t *pQueueFamilyIndices; + VkImageLayout initialLayout; +} VkImageCreateInfo; + +typedef struct VkImageSubresourceLayers +{ + VkImageAspectFlags aspectMask; + uint32_t mipLevel; + uint32_t baseArrayLayer; + uint32_t layerCount; +} VkImageSubresourceLayers; -typedef struct VkPhysicalDeviceFeatures2KHR +typedef struct VkMemoryRequirements2 { VkStructureType sType; void *pNext; - VkPhysicalDeviceFeatures features; -} VkPhysicalDeviceFeatures2KHR; + VkMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; +} VkMemoryRequirements2; -typedef struct VkPipelineShaderStageCreateInfo +typedef struct VkPipelineDepthStencilStateCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineShaderStageCreateFlags flags; - VkShaderStageFlagBits stage; - VkShaderModule WINE_VK_ALIGN(8) module; - const char *pName; - const VkSpecializationInfo *pSpecializationInfo; -} VkPipelineShaderStageCreateInfo; + VkPipelineDepthStencilStateCreateFlags flags; + VkBool32 depthTestEnable; + VkBool32 depthWriteEnable; + VkCompareOp depthCompareOp; + VkBool32 depthBoundsTestEnable; + VkBool32 stencilTestEnable; + VkStencilOpState front; + VkStencilOpState back; + float minDepthBounds; + float maxDepthBounds; +} VkPipelineDepthStencilStateCreateInfo; -typedef struct VkQueueFamilyProperties2KHR +typedef struct VkPipelineViewportStateCreateInfo { VkStructureType sType; - void *pNext; - VkQueueFamilyProperties queueFamilyProperties; -} VkQueueFamilyProperties2KHR; + const void *pNext; + VkPipelineViewportStateCreateFlags flags; + uint32_t viewportCount; + const VkViewport *pViewports; + uint32_t scissorCount; + const VkRect2D *pScissors; +} VkPipelineViewportStateCreateInfo; typedef struct VkShaderModuleCreateInfo { @@ -2142,48 +2450,48 @@ typedef struct VkShaderModuleCreateInfo const uint32_t *pCode; } VkShaderModuleCreateInfo; -typedef struct VkSparseImageOpaqueMemoryBindInfo +typedef struct VkSparseImageFormatProperties { - VkImage WINE_VK_ALIGN(8) image; - uint32_t bindCount; - const VkSparseMemoryBind *pBinds; -} VkSparseImageOpaqueMemoryBindInfo; + VkImageAspectFlags aspectMask; + VkExtent3D imageGranularity; + VkSparseImageFormatFlags flags; +} VkSparseImageFormatProperties; -typedef struct VkSubpassDescription +typedef struct VkSparseImageMemoryBind { - VkSubpassDescriptionFlags flags; - VkPipelineBindPoint pipelineBindPoint; - uint32_t inputAttachmentCount; - const VkAttachmentReference *pInputAttachments; - uint32_t colorAttachmentCount; - const VkAttachmentReference *pColorAttachments; - const VkAttachmentReference *pResolveAttachments; - const VkAttachmentReference *pDepthStencilAttachment; - uint32_t preserveAttachmentCount; - const uint32_t *pPreserveAttachments; -} VkSubpassDescription; + VkImageSubresource subresource; + VkOffset3D offset; + VkExtent3D extent; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; + VkSparseMemoryBindFlags flags; +} VkSparseImageMemoryBind; -typedef struct VkSwapchainCreateInfoKHR +typedef struct VkSparseImageMemoryRequirements +{ + VkSparseImageFormatProperties formatProperties; + uint32_t imageMipTailFirstLod; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailSize; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailOffset; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailStride; +} VkSparseImageMemoryRequirements; + +typedef struct VkSpecializationInfo +{ + uint32_t mapEntryCount; + const VkSpecializationMapEntry *pMapEntries; + size_t dataSize; + const void *pData; +} VkSpecializationInfo; + +typedef struct VkValidationCacheCreateInfoEXT { VkStructureType sType; const void *pNext; - VkSwapchainCreateFlagsKHR flags; - VkSurfaceKHR WINE_VK_ALIGN(8) surface; - uint32_t minImageCount; - VkFormat imageFormat; - VkColorSpaceKHR imageColorSpace; - VkExtent2D imageExtent; - uint32_t imageArrayLayers; - VkImageUsageFlags imageUsage; - VkSharingMode imageSharingMode; - uint32_t queueFamilyIndexCount; - const uint32_t *pQueueFamilyIndices; - VkSurfaceTransformFlagBitsKHR preTransform; - VkCompositeAlphaFlagBitsKHR compositeAlpha; - VkPresentModeKHR presentMode; - VkBool32 clipped; - VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain; -} VkSwapchainCreateInfoKHR; + VkValidationCacheCreateFlagsEXT flags; + size_t initialDataSize; + const void *pInitialData; +} VkValidationCacheCreateInfoEXT; typedef struct VkViewportWScalingNV { @@ -2191,34 +2499,121 @@ typedef struct VkViewportWScalingNV float ycoeff; } VkViewportWScalingNV; -typedef struct VkClearAttachment +typedef struct VkAttachmentDescription { - VkImageAspectFlags aspectMask; - uint32_t colorAttachment; - VkClearValue clearValue; -} VkClearAttachment; + VkAttachmentDescriptionFlags flags; + VkFormat format; + VkSampleCountFlagBits samples; + VkAttachmentLoadOp loadOp; + VkAttachmentStoreOp storeOp; + VkAttachmentLoadOp stencilLoadOp; + VkAttachmentStoreOp stencilStoreOp; + VkImageLayout initialLayout; + VkImageLayout finalLayout; +} VkAttachmentDescription; -typedef struct VkCommandPoolCreateInfo +typedef struct VkBufferImageCopy +{ + VkDeviceSize WINE_VK_ALIGN(8) bufferOffset; + uint32_t bufferRowLength; + uint32_t bufferImageHeight; + VkImageSubresourceLayers imageSubresource; + VkOffset3D imageOffset; + VkExtent3D imageExtent; +} VkBufferImageCopy; + +typedef struct VkDescriptorSetLayoutSupport +{ + VkStructureType sType; + void *pNext; + VkBool32 supported; +} VkDescriptorSetLayoutSupport; + +typedef struct VkImageBlit +{ + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffsets[2]; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffsets[2]; +} VkImageBlit; + +typedef struct VkImageFormatProperties +{ + VkExtent3D maxExtent; + uint32_t maxMipLevels; + uint32_t maxArrayLayers; + VkSampleCountFlags sampleCounts; + VkDeviceSize WINE_VK_ALIGN(8) maxResourceSize; +} VkImageFormatProperties; + +typedef struct VkImageResolve +{ + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageResolve; + +typedef struct VkPhysicalDeviceFeatures2 +{ + VkStructureType sType; + void *pNext; + VkPhysicalDeviceFeatures features; +} VkPhysicalDeviceFeatures2; + +typedef struct VkPipelineShaderStageCreateInfo { VkStructureType sType; const void *pNext; - VkCommandPoolCreateFlags flags; - uint32_t queueFamilyIndex; -} VkCommandPoolCreateInfo; + VkPipelineShaderStageCreateFlags flags; + VkShaderStageFlagBits stage; + VkShaderModule WINE_VK_ALIGN(8) module; + const char *pName; + const VkSpecializationInfo *pSpecializationInfo; +} VkPipelineShaderStageCreateInfo; -typedef struct VkDeviceCreateInfo +typedef struct VkSampleLocationsInfoEXT { VkStructureType sType; const void *pNext; - VkDeviceCreateFlags flags; - uint32_t queueCreateInfoCount; - const VkDeviceQueueCreateInfo *pQueueCreateInfos; - uint32_t enabledLayerCount; - const char * const*ppEnabledLayerNames; - uint32_t enabledExtensionCount; - const char * const*ppEnabledExtensionNames; - const VkPhysicalDeviceFeatures *pEnabledFeatures; -} VkDeviceCreateInfo; + VkSampleCountFlagBits sampleLocationsPerPixel; + VkExtent2D sampleLocationGridSize; + uint32_t sampleLocationsCount; + const VkSampleLocationEXT *pSampleLocations; +} VkSampleLocationsInfoEXT; + +typedef struct VkSparseImageMemoryBindInfo +{ + VkImage WINE_VK_ALIGN(8) image; + uint32_t bindCount; + const VkSparseImageMemoryBind *pBinds; +} VkSparseImageMemoryBindInfo; + +typedef struct VkSubpassDependency +{ + uint32_t srcSubpass; + uint32_t dstSubpass; + VkPipelineStageFlags srcStageMask; + VkPipelineStageFlags dstStageMask; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; + VkDependencyFlags dependencyFlags; +} VkSubpassDependency; + +typedef struct VkClearAttachment +{ + VkImageAspectFlags aspectMask; + uint32_t colorAttachment; + VkClearValue clearValue; +} VkClearAttachment; + +typedef struct VkDescriptorImageInfo +{ + VkSampler WINE_VK_ALIGN(8) sampler; + VkImageView WINE_VK_ALIGN(8) imageView; + VkImageLayout imageLayout; +} VkDescriptorImageInfo; typedef struct VkImageCopy { @@ -2243,25 +2638,17 @@ typedef struct VkPhysicalDeviceMemoryProperties VkMemoryHeap WINE_VK_ALIGN(8) memoryHeaps[VK_MAX_MEMORY_HEAPS]; } VkPhysicalDeviceMemoryProperties; -typedef struct VkPipelineColorBlendStateCreateInfo -{ - VkStructureType sType; - const void *pNext; - VkPipelineColorBlendStateCreateFlags flags; - VkBool32 logicOpEnable; - VkLogicOp logicOp; - uint32_t attachmentCount; - const VkPipelineColorBlendAttachmentState *pAttachments; - float blendConstants[4]; -} VkPipelineColorBlendStateCreateInfo; - -typedef struct VkPushConstantRange -{ - VkShaderStageFlags stageFlags; - uint32_t offset; - uint32_t size; -} VkPushConstantRange; - +typedef struct VkPipelineVertexInputStateCreateInfo +{ + VkStructureType sType; + const void *pNext; + VkPipelineVertexInputStateCreateFlags flags; + uint32_t vertexBindingDescriptionCount; + const VkVertexInputBindingDescription *pVertexBindingDescriptions; + uint32_t vertexAttributeDescriptionCount; + const VkVertexInputAttributeDescription *pVertexAttributeDescriptions; +} VkPipelineVertexInputStateCreateInfo; + typedef struct VkRenderPassCreateInfo { VkStructureType sType; @@ -2275,23 +2662,32 @@ typedef struct VkRenderPassCreateInfo const VkSubpassDependency *pDependencies; } VkRenderPassCreateInfo; -typedef struct VkStencilOpState +typedef struct VkSparseImageFormatProperties2 { - VkStencilOp failOp; - VkStencilOp passOp; - VkStencilOp depthFailOp; - VkCompareOp compareOp; - uint32_t compareMask; - uint32_t writeMask; - uint32_t reference; -} VkStencilOpState; + VkStructureType sType; + void *pNext; + VkSparseImageFormatProperties properties; +} VkSparseImageFormatProperties2; -typedef struct VkVertexInputBindingDescription +typedef struct VkSurfaceFormatKHR { - uint32_t binding; - uint32_t stride; - VkVertexInputRate inputRate; -} VkVertexInputBindingDescription; + VkFormat format; + VkColorSpaceKHR colorSpace; +} VkSurfaceFormatKHR; + +typedef struct VkWriteDescriptorSet +{ + VkStructureType sType; + const void *pNext; + VkDescriptorSet WINE_VK_ALIGN(8) dstSet; + uint32_t dstBinding; + uint32_t dstArrayElement; + uint32_t descriptorCount; + VkDescriptorType descriptorType; + const VkDescriptorImageInfo *pImageInfo; + const VkDescriptorBufferInfo *pBufferInfo; + const VkBufferView *pTexelBufferView; +} VkWriteDescriptorSet; typedef struct VkBindSparseInfo { @@ -2309,72 +2705,44 @@ typedef struct VkBindSparseInfo const VkSemaphore *pSignalSemaphores; } VkBindSparseInfo; -typedef struct VkComputePipelineCreateInfo +typedef struct VkDeviceCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineCreateFlags flags; - VkPipelineShaderStageCreateInfo WINE_VK_ALIGN(8) stage; - VkPipelineLayout WINE_VK_ALIGN(8) layout; - VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; - int32_t basePipelineIndex; -} VkComputePipelineCreateInfo; - -typedef struct VkImageResolve -{ - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageResolve; + VkDeviceCreateFlags flags; + uint32_t queueCreateInfoCount; + const VkDeviceQueueCreateInfo *pQueueCreateInfos; + uint32_t enabledLayerCount; + const char * const*ppEnabledLayerNames; + uint32_t enabledExtensionCount; + const char * const*ppEnabledExtensionNames; + const VkPhysicalDeviceFeatures *pEnabledFeatures; +} VkDeviceCreateInfo; -typedef struct VkPhysicalDeviceMemoryProperties2KHR +typedef struct VkImageFormatProperties2 { VkStructureType sType; void *pNext; - VkPhysicalDeviceMemoryProperties WINE_VK_ALIGN(8) memoryProperties; -} VkPhysicalDeviceMemoryProperties2KHR; + VkImageFormatProperties WINE_VK_ALIGN(8) imageFormatProperties; +} VkImageFormatProperties2; -typedef struct VkPipelineDepthStencilStateCreateInfo +typedef struct VkPhysicalDeviceMemoryProperties2 { VkStructureType sType; - const void *pNext; - VkPipelineDepthStencilStateCreateFlags flags; - VkBool32 depthTestEnable; - VkBool32 depthWriteEnable; - VkCompareOp depthCompareOp; - VkBool32 depthBoundsTestEnable; - VkBool32 stencilTestEnable; - VkStencilOpState front; - VkStencilOpState back; - float minDepthBounds; - float maxDepthBounds; -} VkPipelineDepthStencilStateCreateInfo; + void *pNext; + VkPhysicalDeviceMemoryProperties WINE_VK_ALIGN(8) memoryProperties; +} VkPhysicalDeviceMemoryProperties2; -typedef struct VkPipelineVertexInputStateCreateInfo +typedef struct VkPipelineLayoutCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineVertexInputStateCreateFlags flags; - uint32_t vertexBindingDescriptionCount; - const VkVertexInputBindingDescription *pVertexBindingDescriptions; - uint32_t vertexAttributeDescriptionCount; - const VkVertexInputAttributeDescription *pVertexAttributeDescriptions; -} VkPipelineVertexInputStateCreateInfo; - -typedef struct VkRect2D -{ - VkOffset2D offset; - VkExtent2D extent; -} VkRect2D; - -typedef struct VkSparseImageFormatProperties2KHR -{ - VkStructureType sType; - void *pNext; - VkSparseImageFormatProperties properties; -} VkSparseImageFormatProperties2KHR; + VkPipelineLayoutCreateFlags flags; + uint32_t setLayoutCount; + const VkDescriptorSetLayout *pSetLayouts; + uint32_t pushConstantRangeCount; + const VkPushConstantRange *pPushConstantRanges; +} VkPipelineLayoutCreateInfo; typedef struct VkWin32SurfaceCreateInfoKHR { @@ -2385,64 +2753,39 @@ typedef struct VkWin32SurfaceCreateInfoKHR HWND hwnd; } VkWin32SurfaceCreateInfoKHR; -typedef struct VkClearRect -{ - VkRect2D rect; - uint32_t baseArrayLayer; - uint32_t layerCount; -} VkClearRect; - -typedef struct VkDrawIndexedIndirectCommand -{ - uint32_t indexCount; - uint32_t instanceCount; - uint32_t firstIndex; - int32_t vertexOffset; - uint32_t firstInstance; -} VkDrawIndexedIndirectCommand; - -typedef struct VkInstanceCreateInfo -{ - VkStructureType sType; - const void *pNext; - VkInstanceCreateFlags flags; - const VkApplicationInfo *pApplicationInfo; - uint32_t enabledLayerCount; - const char * const*ppEnabledLayerNames; - uint32_t enabledExtensionCount; - const char * const*ppEnabledExtensionNames; -} VkInstanceCreateInfo; - -typedef struct VkPipelineLayoutCreateInfo +typedef struct VkComputePipelineCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineLayoutCreateFlags flags; - uint32_t setLayoutCount; - const VkDescriptorSetLayout *pSetLayouts; - uint32_t pushConstantRangeCount; - const VkPushConstantRange *pPushConstantRanges; -} VkPipelineLayoutCreateInfo; + VkPipelineCreateFlags flags; + VkPipelineShaderStageCreateInfo WINE_VK_ALIGN(8) stage; + VkPipelineLayout WINE_VK_ALIGN(8) layout; + VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; + int32_t basePipelineIndex; +} VkComputePipelineCreateInfo; -typedef struct VkRenderPassBeginInfo +typedef struct VkGraphicsPipelineCreateInfo { VkStructureType sType; const void *pNext; + VkPipelineCreateFlags flags; + uint32_t stageCount; + const VkPipelineShaderStageCreateInfo *pStages; + const VkPipelineVertexInputStateCreateInfo *pVertexInputState; + const VkPipelineInputAssemblyStateCreateInfo *pInputAssemblyState; + const VkPipelineTessellationStateCreateInfo *pTessellationState; + const VkPipelineViewportStateCreateInfo *pViewportState; + const VkPipelineRasterizationStateCreateInfo *pRasterizationState; + const VkPipelineMultisampleStateCreateInfo *pMultisampleState; + const VkPipelineDepthStencilStateCreateInfo *pDepthStencilState; + const VkPipelineColorBlendStateCreateInfo *pColorBlendState; + const VkPipelineDynamicStateCreateInfo *pDynamicState; + VkPipelineLayout WINE_VK_ALIGN(8) layout; VkRenderPass WINE_VK_ALIGN(8) renderPass; - VkFramebuffer WINE_VK_ALIGN(8) framebuffer; - VkRect2D renderArea; - uint32_t clearValueCount; - const VkClearValue *pClearValues; -} VkRenderPassBeginInfo; - -typedef struct VkDescriptorSetLayoutCreateInfo -{ - VkStructureType sType; - const void *pNext; - VkDescriptorSetLayoutCreateFlags flags; - uint32_t bindingCount; - const VkDescriptorSetLayoutBinding *pBindings; -} VkDescriptorSetLayoutCreateInfo; + uint32_t subpass; + VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; + int32_t basePipelineIndex; +} VkGraphicsPipelineCreateInfo; typedef struct VkPhysicalDeviceLimits { @@ -2554,53 +2897,20 @@ typedef struct VkPhysicalDeviceLimits VkDeviceSize WINE_VK_ALIGN(8) nonCoherentAtomSize; } VkPhysicalDeviceLimits; -typedef struct VkPipelineViewportStateCreateInfo +typedef struct VkQueueFamilyProperties { - VkStructureType sType; - const void *pNext; - VkPipelineViewportStateCreateFlags flags; - uint32_t viewportCount; - const VkViewport *pViewports; - uint32_t scissorCount; - const VkRect2D *pScissors; -} VkPipelineViewportStateCreateInfo; + VkQueueFlags queueFlags; + uint32_t queueCount; + uint32_t timestampValidBits; + VkExtent3D minImageTransferGranularity; +} VkQueueFamilyProperties; -typedef struct VkGraphicsPipelineCreateInfo +typedef struct VkSparseImageMemoryRequirements2 { VkStructureType sType; - const void *pNext; - VkPipelineCreateFlags flags; - uint32_t stageCount; - const VkPipelineShaderStageCreateInfo *pStages; - const VkPipelineVertexInputStateCreateInfo *pVertexInputState; - const VkPipelineInputAssemblyStateCreateInfo *pInputAssemblyState; - const VkPipelineTessellationStateCreateInfo *pTessellationState; - const VkPipelineViewportStateCreateInfo *pViewportState; - const VkPipelineRasterizationStateCreateInfo *pRasterizationState; - const VkPipelineMultisampleStateCreateInfo *pMultisampleState; - const VkPipelineDepthStencilStateCreateInfo *pDepthStencilState; - const VkPipelineColorBlendStateCreateInfo *pColorBlendState; - const VkPipelineDynamicStateCreateInfo *pDynamicState; - VkPipelineLayout WINE_VK_ALIGN(8) layout; - VkRenderPass WINE_VK_ALIGN(8) renderPass; - uint32_t subpass; - VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; - int32_t basePipelineIndex; -} VkGraphicsPipelineCreateInfo; - -typedef struct VkSurfaceCapabilitiesKHR -{ - uint32_t minImageCount; - uint32_t maxImageCount; - VkExtent2D currentExtent; - VkExtent2D minImageExtent; - VkExtent2D maxImageExtent; - uint32_t maxImageArrayLayers; - VkSurfaceTransformFlagsKHR supportedTransforms; - VkSurfaceTransformFlagBitsKHR currentTransform; - VkCompositeAlphaFlagsKHR supportedCompositeAlpha; - VkImageUsageFlags supportedUsageFlags; -} VkSurfaceCapabilitiesKHR; + void *pNext; + VkSparseImageMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; +} VkSparseImageMemoryRequirements2; typedef struct VkPhysicalDeviceProperties { @@ -2615,12 +2925,31 @@ typedef struct VkPhysicalDeviceProperties VkPhysicalDeviceSparseProperties sparseProperties; } VkPhysicalDeviceProperties; -typedef struct VkPhysicalDeviceProperties2KHR +typedef struct VkQueueFamilyProperties2 +{ + VkStructureType sType; + void *pNext; + VkQueueFamilyProperties queueFamilyProperties; +} VkQueueFamilyProperties2; + +typedef struct VkInstanceCreateInfo +{ + VkStructureType sType; + const void *pNext; + VkInstanceCreateFlags flags; + const VkApplicationInfo *pApplicationInfo; + uint32_t enabledLayerCount; + const char * const*ppEnabledLayerNames; + uint32_t enabledExtensionCount; + const char * const*ppEnabledExtensionNames; +} VkInstanceCreateInfo; + +typedef struct VkPhysicalDeviceProperties2 { VkStructureType sType; void *pNext; VkPhysicalDeviceProperties WINE_VK_ALIGN(8) properties; -} VkPhysicalDeviceProperties2KHR; +} VkPhysicalDeviceProperties2; typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); typedef VkResult (VKAPI_PTR *PFN_vkAllocateCommandBuffers)(VkDevice, const VkCommandBufferAllocateInfo *, VkCommandBuffer *); @@ -2628,7 +2957,9 @@ typedef VkResult (VKAPI_PTR *PFN_vkAllocateDescriptorSets)(VkDevice, const VkDes typedef VkResult (VKAPI_PTR *PFN_vkAllocateMemory)(VkDevice, const VkMemoryAllocateInfo *, const VkAllocationCallbacks *, VkDeviceMemory *); typedef VkResult (VKAPI_PTR *PFN_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo *); typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory)(VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize); +typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *); typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory)(VkDevice, VkImage, VkDeviceMemory, VkDeviceSize); +typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo *); typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags); typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo *, VkSubpassContents); typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkDescriptorSet *, uint32_t, const uint32_t *); @@ -2650,8 +2981,10 @@ typedef void (VKAPI_PTR *PFN_vkCmdDraw)(VkCommandBuffer, uint32_t, uint32_t, uin typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexed)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, int32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); +typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); +typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer, VkQueryPool, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass)(VkCommandBuffer); typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *); @@ -2660,7 +2993,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer, VkSubpassContent typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier)(VkCommandBuffer, VkPipelineStageFlags, VkPipelineStageFlags, VkDependencyFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *); typedef void (VKAPI_PTR *PFN_vkCmdPushConstants)(VkCommandBuffer, VkPipelineLayout, VkShaderStageFlags, uint32_t, uint32_t, const void *); typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetKHR)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkWriteDescriptorSet *); -typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer, VkDescriptorUpdateTemplateKHR, VkPipelineLayout, uint32_t, const void *); +typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer, VkDescriptorUpdateTemplate, VkPipelineLayout, uint32_t, const void *); typedef void (VKAPI_PTR *PFN_vkCmdResetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags); typedef void (VKAPI_PTR *PFN_vkCmdResetQueryPool)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdResolveImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageResolve *); @@ -2670,6 +3003,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBounds)(VkCommandBuffer, float, float) typedef void (VKAPI_PTR *PFN_vkCmdSetDiscardRectangleEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *); typedef void (VKAPI_PTR *PFN_vkCmdSetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags); typedef void (VKAPI_PTR *PFN_vkCmdSetLineWidth)(VkCommandBuffer, float); +typedef void (VKAPI_PTR *PFN_vkCmdSetSampleLocationsEXT)(VkCommandBuffer, const VkSampleLocationsInfoEXT *); typedef void (VKAPI_PTR *PFN_vkCmdSetScissor)(VkCommandBuffer, uint32_t, uint32_t, const VkRect2D *); typedef void (VKAPI_PTR *PFN_vkCmdSetStencilCompareMask)(VkCommandBuffer, VkStencilFaceFlags, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdSetStencilReference)(VkCommandBuffer, VkStencilFaceFlags, uint32_t); @@ -2678,6 +3012,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetViewport)(VkCommandBuffer, uint32_t, uint32 typedef void (VKAPI_PTR *PFN_vkCmdSetViewportWScalingNV)(VkCommandBuffer, uint32_t, uint32_t, const VkViewportWScalingNV *); typedef void (VKAPI_PTR *PFN_vkCmdUpdateBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, const void *); typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *); +typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarkerAMD)(VkCommandBuffer, VkPipelineStageFlagBits, VkBuffer, VkDeviceSize, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer, VkPipelineStageFlagBits, VkQueryPool, uint32_t); typedef VkResult (VKAPI_PTR *PFN_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo *, const VkAllocationCallbacks *, VkBuffer *); typedef VkResult (VKAPI_PTR *PFN_vkCreateBufferView)(VkDevice, const VkBufferViewCreateInfo *, const VkAllocationCallbacks *, VkBufferView *); @@ -2685,7 +3020,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateCommandPool)(VkDevice, const VkCommandP typedef VkResult (VKAPI_PTR *PFN_vkCreateComputePipelines)(VkDevice, VkPipelineCache, uint32_t, const VkComputePipelineCreateInfo *, const VkAllocationCallbacks *, VkPipeline *); typedef VkResult (VKAPI_PTR *PFN_vkCreateDescriptorPool)(VkDevice, const VkDescriptorPoolCreateInfo *, const VkAllocationCallbacks *, VkDescriptorPool *); typedef VkResult (VKAPI_PTR *PFN_vkCreateDescriptorSetLayout)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, const VkAllocationCallbacks *, VkDescriptorSetLayout *); -typedef VkResult (VKAPI_PTR *PFN_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfoKHR *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplateKHR *); +typedef VkResult (VKAPI_PTR *PFN_vkCreateDescriptorUpdateTemplateKHR)(VkDevice, const VkDescriptorUpdateTemplateCreateInfo *, const VkAllocationCallbacks *, VkDescriptorUpdateTemplate *); typedef VkResult (VKAPI_PTR *PFN_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *); typedef VkResult (VKAPI_PTR *PFN_vkCreateEvent)(VkDevice, const VkEventCreateInfo *, const VkAllocationCallbacks *, VkEvent *); typedef VkResult (VKAPI_PTR *PFN_vkCreateFence)(VkDevice, const VkFenceCreateInfo *, const VkAllocationCallbacks *, VkFence *); @@ -2699,16 +3034,18 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineLayout)(VkDevice, const VkPipel typedef VkResult (VKAPI_PTR *PFN_vkCreateQueryPool)(VkDevice, const VkQueryPoolCreateInfo *, const VkAllocationCallbacks *, VkQueryPool *); typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *); typedef VkResult (VKAPI_PTR *PFN_vkCreateSampler)(VkDevice, const VkSamplerCreateInfo *, const VkAllocationCallbacks *, VkSampler *); +typedef VkResult (VKAPI_PTR *PFN_vkCreateSamplerYcbcrConversionKHR)(VkDevice, const VkSamplerYcbcrConversionCreateInfo *, const VkAllocationCallbacks *, VkSamplerYcbcrConversion *); typedef VkResult (VKAPI_PTR *PFN_vkCreateSemaphore)(VkDevice, const VkSemaphoreCreateInfo *, const VkAllocationCallbacks *, VkSemaphore *); typedef VkResult (VKAPI_PTR *PFN_vkCreateShaderModule)(VkDevice, const VkShaderModuleCreateInfo *, const VkAllocationCallbacks *, VkShaderModule *); typedef VkResult (VKAPI_PTR *PFN_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); +typedef VkResult (VKAPI_PTR *PFN_vkCreateValidationCacheEXT)(VkDevice, const VkValidationCacheCreateInfoEXT *, const VkAllocationCallbacks *, VkValidationCacheEXT *); typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); typedef void (VKAPI_PTR *PFN_vkDestroyBuffer)(VkDevice, VkBuffer, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyBufferView)(VkDevice, VkBufferView, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyCommandPool)(VkDevice, VkCommandPool, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorPool)(VkDevice, VkDescriptorPool, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorSetLayout)(VkDevice, VkDescriptorSetLayout, const VkAllocationCallbacks *); -typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorUpdateTemplateKHR)(VkDevice, VkDescriptorUpdateTemplateKHR, const VkAllocationCallbacks *); +typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorUpdateTemplateKHR)(VkDevice, VkDescriptorUpdateTemplate, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyDevice)(VkDevice, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyEvent)(VkDevice, VkEvent, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyFence)(VkDevice, VkFence, const VkAllocationCallbacks *); @@ -2722,10 +3059,12 @@ typedef void (VKAPI_PTR *PFN_vkDestroyPipelineLayout)(VkDevice, VkPipelineLayout typedef void (VKAPI_PTR *PFN_vkDestroyQueryPool)(VkDevice, VkQueryPool, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyRenderPass)(VkDevice, VkRenderPass, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroySampler)(VkDevice, VkSampler, const VkAllocationCallbacks *); +typedef void (VKAPI_PTR *PFN_vkDestroySamplerYcbcrConversionKHR)(VkDevice, VkSamplerYcbcrConversion, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroySemaphore)(VkDevice, VkSemaphore, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyShaderModule)(VkDevice, VkShaderModule, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); +typedef void (VKAPI_PTR *PFN_vkDestroyValidationCacheEXT)(VkDevice, VkValidationCacheEXT, const VkAllocationCallbacks *); typedef VkResult (VKAPI_PTR *PFN_vkDeviceWaitIdle)(VkDevice); typedef VkResult (VKAPI_PTR *PFN_vkEndCommandBuffer)(VkCommandBuffer); typedef VkResult (VKAPI_PTR *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char *, uint32_t *, VkExtensionProperties *); @@ -2738,29 +3077,34 @@ typedef void (VKAPI_PTR *PFN_vkFreeCommandBuffers)(VkDevice, VkCommandPool, uint typedef VkResult (VKAPI_PTR *PFN_vkFreeDescriptorSets)(VkDevice, VkDescriptorPool, uint32_t, const VkDescriptorSet *); typedef void (VKAPI_PTR *PFN_vkFreeMemory)(VkDevice, VkDeviceMemory, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements *); +typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); +typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetLayoutSupportKHR)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *); typedef void (VKAPI_PTR *PFN_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetDeviceProcAddr)(VkDevice, const char *); typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); typedef VkResult (VKAPI_PTR *PFN_vkGetEventStatus)(VkDevice, VkEvent); typedef VkResult (VKAPI_PTR *PFN_vkGetFenceStatus)(VkDevice, VkFence); typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements *); +typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements2KHR)(VkDevice, const VkImageMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements)(VkDevice, VkImage, uint32_t *, VkSparseImageMemoryRequirements *); +typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *); typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetInstanceProcAddr)(VkInstance, const char *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFeatures2KHR)(VkPhysicalDevice, VkPhysicalDeviceFeatures2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFeatures2KHR)(VkPhysicalDevice, VkPhysicalDeviceFeatures2 *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice, VkFormat, VkFormatProperties *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice, VkFormat, VkFormatProperties2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceFormatProperties2KHR)(VkPhysicalDevice, VkFormat, VkFormatProperties2 *); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties *); -typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR *, VkImageFormatProperties2KHR *); +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceImageFormatInfo2 *, VkImageFormatProperties2 *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties2 *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT)(VkPhysicalDevice, VkSampleCountFlagBits, VkMultisamplePropertiesEXT *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties2 *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkSampleCountFlagBits, VkImageUsageFlags, VkImageTiling, uint32_t *, VkSparseImageFormatProperties *); -typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR *, uint32_t *, VkSparseImageFormatProperties2KHR *); +typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *, uint32_t *, VkSparseImageFormatProperties2 *); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *); typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); @@ -2769,10 +3113,13 @@ typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR) typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); typedef VkResult (VKAPI_PTR *PFN_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); typedef void (VKAPI_PTR *PFN_vkGetRenderAreaGranularity)(VkDevice, VkRenderPass, VkExtent2D *); +typedef VkResult (VKAPI_PTR *PFN_vkGetShaderInfoAMD)(VkDevice, VkPipeline, VkShaderStageFlagBits, VkShaderInfoTypeAMD, size_t *, void *); typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); +typedef VkResult (VKAPI_PTR *PFN_vkGetValidationCacheDataEXT)(VkDevice, VkValidationCacheEXT, size_t *, void *); typedef VkResult (VKAPI_PTR *PFN_vkInvalidateMappedMemoryRanges)(VkDevice, uint32_t, const VkMappedMemoryRange *); typedef VkResult (VKAPI_PTR *PFN_vkMapMemory)(VkDevice, VkDeviceMemory, VkDeviceSize, VkDeviceSize, VkMemoryMapFlags, void **); typedef VkResult (VKAPI_PTR *PFN_vkMergePipelineCaches)(VkDevice, VkPipelineCache, uint32_t, const VkPipelineCache *); +typedef VkResult (VKAPI_PTR *PFN_vkMergeValidationCachesEXT)(VkDevice, VkValidationCacheEXT, uint32_t, const VkValidationCacheEXT *); typedef VkResult (VKAPI_PTR *PFN_vkQueueBindSparse)(VkQueue, uint32_t, const VkBindSparseInfo *, VkFence); typedef VkResult (VKAPI_PTR *PFN_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit)(VkQueue, uint32_t, const VkSubmitInfo *, VkFence); @@ -2783,9 +3130,9 @@ typedef VkResult (VKAPI_PTR *PFN_vkResetDescriptorPool)(VkDevice, VkDescriptorPo typedef VkResult (VKAPI_PTR *PFN_vkResetEvent)(VkDevice, VkEvent); typedef VkResult (VKAPI_PTR *PFN_vkResetFences)(VkDevice, uint32_t, const VkFence *); typedef VkResult (VKAPI_PTR *PFN_vkSetEvent)(VkDevice, VkEvent); -typedef void (VKAPI_PTR *PFN_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlagsKHR); +typedef void (VKAPI_PTR *PFN_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags); typedef void (VKAPI_PTR *PFN_vkUnmapMemory)(VkDevice, VkDeviceMemory); -typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplateKHR, const void *); +typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice, VkDescriptorSet, VkDescriptorUpdateTemplate, const void *); typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSets)(VkDevice, uint32_t, const VkWriteDescriptorSet *, uint32_t, const VkCopyDescriptorSet *); typedef VkResult (VKAPI_PTR *PFN_vkWaitForFences)(VkDevice, uint32_t, const VkFence *, VkBool32, uint64_t); @@ -2796,7 +3143,9 @@ VkResult VKAPI_CALL vkAllocateDescriptorSets(VkDevice device, const VkDescriptor VkResult VKAPI_CALL vkAllocateMemory(VkDevice device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *pAllocator, VkDeviceMemory *pMemory); VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo); VkResult VKAPI_CALL vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset); +VkResult VKAPI_CALL vkBindBufferMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos); VkResult VKAPI_CALL vkBindImageMemory(VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset); +VkResult VKAPI_CALL vkBindImageMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos); void VKAPI_CALL vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags); void VKAPI_CALL vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents); void VKAPI_CALL vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t *pDynamicOffsets); @@ -2818,8 +3167,10 @@ void VKAPI_CALL vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, u void VKAPI_CALL vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance); void VKAPI_CALL vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); +void VKAPI_CALL vkCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); +void VKAPI_CALL vkCmdDrawIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query); void VKAPI_CALL vkCmdEndRenderPass(VkCommandBuffer commandBuffer); void VKAPI_CALL vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); @@ -2828,7 +3179,7 @@ void VKAPI_CALL vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContent void VKAPI_CALL vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers); void VKAPI_CALL vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues); void VKAPI_CALL vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites); -void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData); +void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData); void VKAPI_CALL vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); void VKAPI_CALL vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount); void VKAPI_CALL vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve *pRegions); @@ -2838,6 +3189,7 @@ void VKAPI_CALL vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDept void VKAPI_CALL vkCmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D *pDiscardRectangles); void VKAPI_CALL vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask); void VKAPI_CALL vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth); +void VKAPI_CALL vkCmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT *pSampleLocationsInfo); void VKAPI_CALL vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors); void VKAPI_CALL vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask); void VKAPI_CALL vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference); @@ -2846,6 +3198,7 @@ void VKAPI_CALL vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstVi void VKAPI_CALL vkCmdSetViewportWScalingNV(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV *pViewportWScalings); void VKAPI_CALL vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData); void VKAPI_CALL vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers); +void VKAPI_CALL vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); void VKAPI_CALL vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query); VkResult VKAPI_CALL vkCreateBuffer(VkDevice device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer); VkResult VKAPI_CALL vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBufferView *pView); @@ -2853,7 +3206,7 @@ VkResult VKAPI_CALL vkCreateCommandPool(VkDevice device, const VkCommandPoolCrea VkResult VKAPI_CALL vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines); VkResult VKAPI_CALL vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool); VkResult VKAPI_CALL vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorSetLayout *pSetLayout); -VkResult VKAPI_CALL vkCreateDescriptorUpdateTemplateKHR(VkDevice device, const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate); +VkResult VKAPI_CALL vkCreateDescriptorUpdateTemplateKHR(VkDevice device, const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate); VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice); VkResult VKAPI_CALL vkCreateEvent(VkDevice device, const VkEventCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkEvent *pEvent); VkResult VKAPI_CALL vkCreateFence(VkDevice device, const VkFenceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFence *pFence); @@ -2867,16 +3220,18 @@ VkResult VKAPI_CALL vkCreatePipelineLayout(VkDevice device, const VkPipelineLayo VkResult VKAPI_CALL vkCreateQueryPool(VkDevice device, const VkQueryPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool); VkResult VKAPI_CALL vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass); VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSampler *pSampler); +VkResult VKAPI_CALL vkCreateSamplerYcbcrConversionKHR(VkDevice device, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSamplerYcbcrConversion *pYcbcrConversion); VkResult VKAPI_CALL vkCreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSemaphore *pSemaphore); VkResult VKAPI_CALL vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkShaderModule *pShaderModule); VkResult VKAPI_CALL vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSwapchainKHR *pSwapchain); +VkResult VKAPI_CALL vkCreateValidationCacheEXT(VkDevice device, const VkValidationCacheCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkValidationCacheEXT *pValidationCache); VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); void VKAPI_CALL vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocationCallbacks *pAllocator); -void VKAPI_CALL vkDestroyDescriptorUpdateTemplateKHR(VkDevice device, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, const VkAllocationCallbacks *pAllocator); +void VKAPI_CALL vkDestroyDescriptorUpdateTemplateKHR(VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks *pAllocator); @@ -2890,10 +3245,12 @@ void VKAPI_CALL vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipeli void VKAPI_CALL vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocationCallbacks *pAllocator); +void VKAPI_CALL vkDestroySamplerYcbcrConversionKHR(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks *pAllocator); +void VKAPI_CALL vkDestroyValidationCacheEXT(VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks *pAllocator); VkResult VKAPI_CALL vkDeviceWaitIdle(VkDevice device); VkResult VKAPI_CALL vkEndCommandBuffer(VkCommandBuffer commandBuffer); VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties); @@ -2906,29 +3263,34 @@ void VKAPI_CALL vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, VkResult VKAPI_CALL vkFreeDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets); void VKAPI_CALL vkFreeMemory(VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, VkMemoryRequirements *pMemoryRequirements); +void VKAPI_CALL vkGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements); +void VKAPI_CALL vkGetDescriptorSetLayoutSupportKHR(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, VkDescriptorSetLayoutSupport *pSupport); void VKAPI_CALL vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes); PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice device, const char *pName); void VKAPI_CALL vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue); VkResult VKAPI_CALL vkGetEventStatus(VkDevice device, VkEvent event); VkResult VKAPI_CALL vkGetFenceStatus(VkDevice device, VkFence fence); void VKAPI_CALL vkGetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements *pMemoryRequirements); +void VKAPI_CALL vkGetImageMemoryRequirements2KHR(VkDevice device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements); void VKAPI_CALL vkGetImageSparseMemoryRequirements(VkDevice device, VkImage image, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements *pSparseMemoryRequirements); +void VKAPI_CALL vkGetImageSparseMemoryRequirements2KHR(VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); void VKAPI_CALL vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout); PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char *pName); void VKAPI_CALL vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures); -void VKAPI_CALL vkGetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2KHR *pFeatures); +void VKAPI_CALL vkGetPhysicalDeviceFeatures2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 *pFeatures); void VKAPI_CALL vkGetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties *pFormatProperties); -void VKAPI_CALL vkGetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2KHR *pFormatProperties); +void VKAPI_CALL vkGetPhysicalDeviceFormatProperties2KHR(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2 *pFormatProperties); VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties *pImageFormatProperties); -VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHR *pImageFormatInfo, VkImageFormatProperties2KHR *pImageFormatProperties); +VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties *pMemoryProperties); -void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2KHR *pMemoryProperties); +void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2 *pMemoryProperties); +void VKAPI_CALL vkGetPhysicalDeviceMultisamplePropertiesEXT(VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT *pMultisampleProperties); void VKAPI_CALL vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties *pProperties); -void VKAPI_CALL vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHR *pProperties); +void VKAPI_CALL vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties *pQueueFamilyProperties); -void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2KHR *pQueueFamilyProperties); +void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2 *pQueueFamilyProperties); void VKAPI_CALL vkGetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t *pPropertyCount, VkSparseImageFormatProperties *pProperties); -void VKAPI_CALL vkGetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR *pFormatInfo, uint32_t *pPropertyCount, VkSparseImageFormatProperties2KHR *pProperties); +void VKAPI_CALL vkGetPhysicalDeviceSparseImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, uint32_t *pPropertyCount, VkSparseImageFormatProperties2 *pProperties); VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pSurfaceFormatCount, VkSurfaceFormatKHR *pSurfaceFormats); VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes); @@ -2937,10 +3299,13 @@ VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDev VkResult VKAPI_CALL vkGetPipelineCacheData(VkDevice device, VkPipelineCache pipelineCache, size_t *pDataSize, void *pData); VkResult VKAPI_CALL vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags); void VKAPI_CALL vkGetRenderAreaGranularity(VkDevice device, VkRenderPass renderPass, VkExtent2D *pGranularity); +VkResult VKAPI_CALL vkGetShaderInfoAMD(VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, size_t *pInfoSize, void *pInfo); VkResult VKAPI_CALL vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages); +VkResult VKAPI_CALL vkGetValidationCacheDataEXT(VkDevice device, VkValidationCacheEXT validationCache, size_t *pDataSize, void *pData); VkResult VKAPI_CALL vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges); VkResult VKAPI_CALL vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData); VkResult VKAPI_CALL vkMergePipelineCaches(VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache *pSrcCaches); +VkResult VKAPI_CALL vkMergeValidationCachesEXT(VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT *pSrcCaches); VkResult VKAPI_CALL vkQueueBindSparse(VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo *pBindInfo, VkFence fence); VkResult VKAPI_CALL vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *pPresentInfo); VkResult VKAPI_CALL vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); @@ -2951,9 +3316,9 @@ VkResult VKAPI_CALL vkResetDescriptorPool(VkDevice device, VkDescriptorPool desc VkResult VKAPI_CALL vkResetEvent(VkDevice device, VkEvent event); VkResult VKAPI_CALL vkResetFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences); VkResult VKAPI_CALL vkSetEvent(VkDevice device, VkEvent event); -void VKAPI_CALL vkTrimCommandPoolKHR(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlagsKHR flags); +void VKAPI_CALL vkTrimCommandPoolKHR(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags); void VKAPI_CALL vkUnmapMemory(VkDevice device, VkDeviceMemory memory); -void VKAPI_CALL vkUpdateDescriptorSetWithTemplateKHR(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, const void *pData); +void VKAPI_CALL vkUpdateDescriptorSetWithTemplateKHR(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *pData); void VKAPI_CALL vkUpdateDescriptorSets(VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet *pDescriptorCopies); VkResult VKAPI_CALL vkWaitForFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences, VkBool32 waitAll, uint64_t timeout); #endif /* VK_NO_PROTOTYPES */ -- 2.14.3

June 3, 2018

[PATCH 3/4] winevulkan: Parse extension require sections one by one.

by Roderick Colenbrander

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 78 +++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5fae8dc63b..594ebdd570 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2359,46 +2359,54 @@ class VkRegistry(object): LOGGER.debug("Loading extension: {0}".format(ext_name)) - # Extensions can add enum values to Core / extension enums, so add these. - enums = ext.findall("require/enum") - for enum_elem in enums: - if "bitpos" in enum_elem.keys(): - # We need to add an extra value to an existing enum type. - # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) - elif "offset" in enum_elem.keys(): - ext_number = int(ext.attrib["number"]) - offset = int(enum_elem.attrib["offset"]) - value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset - - # Deal with negative values. - direction = enum_elem.attrib.get("dir") - if direction is not None: - value = -value - - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], value)) - - elif "value" in enum_elem.keys(): - self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) - continue - else: - # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX - continue + # Extensions can define one or more require sections each requiring + # different features (e.g. Vulkan 1.1). Parse each require section + # separately, so we can skip sections we don't want. + for require in ext.findall("require"): + # Extensions can add enum values to Core / extension enums, so add these. + for enum_elem in require.findall("enum"): + if "bitpos" in enum_elem.keys(): + # We need to add an extra value to an existing enum type. + # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) + elif "offset" in enum_elem.keys(): + # Extensions promoted to Core, have the extension number as part + # of the enum value. Else retrieve from the extension tag. + if enum_elem.attrib.get("extnumber") is not None: + ext_number = int(enum_elem.attrib.get("extnumber")) + else: + ext_number = int(ext.attrib["number"]) + offset = int(enum_elem.attrib["offset"]) + value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset + + # Deal with negative values. + direction = enum_elem.attrib.get("dir") + if direction is not None: + value = -value + + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], value)) + + elif "value" in enum_elem.keys(): + self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) + continue + else: + # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX + continue + + # Pull in any commands we need. We infer types to pull in from the command + # as well. + for command in require.findall("command"): + cmd_name = command.attrib["name"] + self._mark_command_required(cmd_name) # Store a list with extensions. ext_info = {"name" : ext_name, "type" : ext_type} extensions.append(ext_info) - # Pull in any commands we need. We infer types to pull in from the command - # as well. - for command in commands: - cmd_name = command.attrib["name"] - self._mark_command_required(cmd_name) - # Sort in alphabetical order. self.extensions = sorted(extensions, key=lambda ext: ext["name"]) -- 2.14.3

June 3, 2018

[PATCH 2/4] winevulkan: Parse forward declared struct members.

by Roderick Colenbrander

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 81148ef0bd..5fae8dc63b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -780,9 +780,10 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, - extension_structs=None): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, extension_structs=None): self.const = const + self.struct_fwd_decl = struct_fwd_decl self.name = name self.pointer = pointer self.type = _type @@ -805,8 +806,8 @@ class VkMember(object): return False def __repr__(self): - return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, - self.dyn_array_len) + return "{0} {1} {2} {3} {4} {5} {6}".format(self.const, self.struct_fwd_decl, self.type, self.pointer, + self.name, self.array_len, self.dyn_array_len) @staticmethod def from_xml(member): @@ -815,11 +816,22 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = True if member.text and "const" in member.text else False + const = False + struct_fwd_decl = False member_type = None pointer = None array_len = None + if member.text: + if "const" in member.text: + const = True + + # Some members contain forward declarations: + # - VkBaseInstructure has a member "const struct VkBaseInStructure *pNext" + # - VkWaylandSurfaceCreateInfoKHR has a member "struct wl_display *display" + if "struct" in member.text: + struct_fwd_decl = True + if type_elem is not None: member_type = type_elem.text if type_elem.tail is not None: @@ -855,8 +867,8 @@ class VkMember(object): # Remove brackets around length array_len = name_elem.tail.strip("[]") - return VkMember(const=const, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, - dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) def copy(self, input, output, direction): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ @@ -900,6 +912,9 @@ class VkMember(object): if self.is_const(): text += "const " + if self.is_struct_forward_declaration(): + text += "struct " + if conv and self.is_struct(): text += "{0}_host".format(self.type) else: @@ -974,6 +989,9 @@ class VkMember(object): def is_struct(self): return self.type_info["category"] == "struct" + def is_struct_forward_declaration(self): + return self.struct_fwd_decl + def is_union(self): return self.type_info["category"] == "union" -- 2.14.3

June 3, 2018

[PATCH 1/4] winevulkan: Fix parsing of const function pointer members.

by Roderick Colenbrander

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 9 +++++---- include/wine/vulkan.h | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2265ddc80b..81148ef0bd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -670,7 +670,8 @@ class VkFunctionPointer(object): # <type>void</type>* pUserData, # Parsing of the tail (anything past </type>) is tricky since there # can be other data on the next line like: const <type>int</type>.. - const = begin + + const = True if begin and "const" in begin else False _type = t.text lines = t.tail.split(",\n") if lines[0][0] == "*": @@ -779,7 +780,7 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=None, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, + def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, extension_structs=None): self.const = const self.name = name @@ -814,7 +815,7 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = member.text.strip() if member.text else None + const = True if member.text and "const" in member.text else False member_type = None pointer = None array_len = None @@ -948,7 +949,7 @@ class VkMember(object): return conversions def is_const(self): - return self.const is not None + return self.const def is_dynamic_array(self): """ Returns if the member is an array element. diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index d44687fabf..24b0ef990e 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -1251,28 +1251,28 @@ typedef enum VkVertexInputRate typedef void* (VKAPI_PTR * PFN_vkAllocationFunction)( void *pUserData, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkFreeFunction)( void *pUserData, - const void *pMemory); + void *pMemory); typedef void (VKAPI_PTR * PFN_vkInternalAllocationNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkInternalFreeNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( void *pUserData, - const void *pOriginal, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + void *pOriginal, + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkVoidFunction)( void); -- 2.14.3

June 3, 2018

[PATCH 0/4] winevulkan: Update to 1.0.76

by Roderick Colenbrander

Hi, Until now our Vulkan implementation was stuck at 1.0.51 due to licensing of vk.xml. Now that the license issues are resolved, we can migrate to a newer version. The patch series updates to latest vk.xml (1.1.76) and adds parsing for the new vk.xml version. They added 'alias' types to not have to duplicate information about data types and functions for functionality promoted to Vulkan 1.1 Core. This required a lot of changes. Along the way I found some bugs / parsing issues in the original script to simplify code review, I moved these earlier in the series as they are indepent. Vulkan 1.1 moved a lot of extensions into its Core including interop extensions for memory, fences and semaphores. These rely on platform specific functionality and would need some more implementation work to support. (It is also the question how we would deal with these. Probably needs to be implemented in winex11.drv to allow vkd3d to use them). For now to avoid having to deal with full 1.1 support, I'm leaving out 1.1 features and leave the patch version at 76. Essentially bringing us to 1.0.76. In practice support for updated extensions is what benefits most users as there are probably not many applications needing Core 1.1. Thanks, Roderick Roderick Colenbrander (4): winevulkan: Fix parsing of const function pointer members. winevulkan: Parse forward declared struct members. winevulkan: Parse extension require sections one by one. winevulkan: Update Vulkan support to 1.0.76. dlls/vulkan-1/vulkan-1.spec | 28 + dlls/winevulkan/make_vulkan | 319 +- dlls/winevulkan/vk.xml | 6448 ++++++++++++++++++++++++++------------- dlls/winevulkan/vulkan_thunks.c | 377 ++- dlls/winevulkan/vulkan_thunks.h | 156 +- dlls/winevulkan/winevulkan.spec | 28 + include/wine/vulkan.h | 1739 ++++++----- 7 files changed, 6219 insertions(+), 2876 deletions(-) -- 2.14.3

June 3, 2018

Re: [PATCH 2/2] d2d1: Add ID2D1DeviceContext stub.

by Nikolay Sivov

On Sun, 3 Jun 2018 at 14:43, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 29 May 2018 at 22:09, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > Context can render in two ways - populating command list, or rendering > to a > > bitmap object. I was thinking we should create a dxgi target when > rendering > > to a bitmap and forward calls to it. For command lists we don’t need to > > create a real target. > > > Yeah, but I think we'd still like things to work in essentially the > same way. When rendering to a command list, we'd record commands for > later execution. When rendering to a surface we'd do the same, but > also start execution (more or less) immediately, potentially on a > different thread. Does that imply moving d3d target to such model first? It also looks like a way to make Flush() do something. >

June 3, 2018

Re: [PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Zebediah Figura

On 03/06/18 13:58, Marvin wrote: > Hi, > > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > Full results can be found at > https://testbot.winehq.org/JobDetails.pl?Key=38913 > > Your paranoid android. > > > === wvistau64 (64 bit typelib) === > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 > These failures are shortcomings in widl exposed by these patches; they are fixed in patch 4/4.

June 3, 2018

Re: [PATCH 2/4] oleaut32/tests: Fix size and alignment for typedefs on 64-bit.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38914 Your paranoid android. === wvistau64 (64 bit typelib) === typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 === w2008s64 (64 bit typelib) === typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 === w7pro64 (64 bit typelib) === typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 The previous 10 run(s) terminated abnormally === w864 (64 bit typelib) === typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 === w1064 (64 bit typelib) === typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4739: Test failed: typeattr->cbAlignment expected 8 got 4

June 3, 2018

Re: [PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38913 Your paranoid android. === wvistau64 (64 bit typelib) === typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 === w2008s64 (64 bit typelib) === typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 === w7pro64 (64 bit typelib) === typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 The previous 10 run(s) terminated abnormally === w864 (64 bit typelib) === typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 === w1064 (64 bit typelib) === typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4 typelib.c:4733: Test failed: typeattr->cbAlignment expected 8 got 4

June 3, 2018

[PATCH 4/4] widl: Generate correct size and alignment for all types.

by Zebediah Figura

Using type_memsize_and_alignment() directly instead of reimplementing it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 13 ------ tools/widl/typegen.c | 5 +-- tools/widl/typegen.h | 1 + tools/widl/write_msft.c | 95 +++++++++---------------------------------- 4 files changed, 23 insertions(+), 91 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7c35e87..4d5314e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4724,21 +4724,8 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); expect_int(typeattr->typekind, ti->type); expect_hex(typeattr->wTypeFlags, ti->wTypeFlags); - /* FIXME: remove once widl is fixed */ - if (typeattr->typekind == TKIND_ALIAS && typeattr->cbAlignment != ti->cbAlignment) - { -todo_wine /* widl generates broken typelib and typeattr just reflects that */ - ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1), - "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment); -todo_wine /* widl generates broken typelib and typeattr just reflects that */ - ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0), - "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance); - } - else - { expect_int(typeattr->cbAlignment, ti->cbAlignment); expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance); - } expect_int(help_ctx, ti->help_ctx); expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version); expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9f62589..38cbfa0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -84,7 +84,6 @@ static const unsigned short IsSimpleRef = 0x0100; static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); -static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align); static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, unsigned int *typestring_offset); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); @@ -1841,7 +1840,7 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) return maxs; } -static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) +unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) { unsigned int size = 0; @@ -1910,6 +1909,7 @@ static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *al size = union_memsize(type_union_get_cases(t), align); break; case TYPE_POINTER: + case TYPE_INTERFACE: assert( pointer_size ); size = pointer_size; if (size > *align) *align = size; @@ -1933,7 +1933,6 @@ static unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *al if (size > *align) *align = size; } break; - case TYPE_INTERFACE: case TYPE_ALIAS: case TYPE_VOID: case TYPE_COCLASS: diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index b6540e2..95ad601 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -100,3 +100,4 @@ unsigned char get_basic_fc(const type_t *type); unsigned char get_pointer_fc(const type_t *type, const attr_list_t *attrs, int toplevel_param); unsigned char get_struct_fc(const type_t *type); enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *attrs, unsigned int flags); +unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f7e53e4..b1f467d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -52,6 +52,7 @@ #include "hash.h" #include "typetree.h" #include "parser.h" +#include "typegen.h" enum MSFT_segment_index { MSFT_SEG_TYPEINFO = 0, /* type information */ @@ -780,8 +781,6 @@ static int encode_type( int vt, /* [I] vt to encode */ type_t *type, /* [I] type */ int *encoded_type, /* [O] The encoded type description. */ - int *width, /* [O] The width of the type, or NULL. */ - int *alignment, /* [O] The alignment of the type, or NULL. */ int *decoded_size) /* [O] The total size of the unencoded TYPEDESCs, including nested descs. */ { int default_type; @@ -794,8 +793,6 @@ static int encode_type( chat("encode_type vt %d type %p\n", vt, type); default_type = 0x80000000 | (vt << 16) | vt; - if (!width) width = &scratch; - if (!alignment) alignment = &scratch; if (!decoded_size) decoded_size = &scratch; *decoded_size = 0; @@ -804,38 +801,20 @@ static int encode_type( case VT_I1: case VT_UI1: *encoded_type = default_type; - *width = 1; - *alignment = 1; break; case VT_INT: *encoded_type = 0x80000000 | (VT_I4 << 16) | VT_INT; - if ((typelib->typelib_header.varflags & 0x0f) == SYS_WIN16) { - *width = 2; - *alignment = 2; - } else { - *width = 4; - *alignment = 4; - } break; case VT_UINT: *encoded_type = 0x80000000 | (VT_UI4 << 16) | VT_UINT; - if ((typelib->typelib_header.varflags & 0x0f) == SYS_WIN16) { - *width = 2; - *alignment = 2; - } else { - *width = 4; - *alignment = 4; - } break; case VT_UI2: case VT_I2: case VT_BOOL: *encoded_type = default_type; - *width = 2; - *alignment = 2; break; case VT_I4: @@ -844,56 +823,40 @@ static int encode_type( case VT_ERROR: case VT_HRESULT: *encoded_type = default_type; - *width = 4; - *alignment = 4; break; case VT_R8: case VT_I8: case VT_UI8: *encoded_type = default_type; - *width = 8; - *alignment = 8; break; case VT_CY: case VT_DATE: *encoded_type = default_type; - *width = 8; - *alignment = 8; break; case VT_DECIMAL: *encoded_type = default_type; - *width = 16; - *alignment = 8; break; case VT_VOID: *encoded_type = 0x80000000 | (VT_EMPTY << 16) | vt; - *width = 0; - *alignment = 1; break; case VT_UNKNOWN: case VT_DISPATCH: case VT_BSTR: *encoded_type = default_type; - *width = pointer_size; - *alignment = 4; break; case VT_VARIANT: *encoded_type = default_type; - *width = 8 + 2 * pointer_size; - *alignment = 8; break; case VT_LPSTR: case VT_LPWSTR: *encoded_type = 0xfffe0000 | vt; - *width = pointer_size; - *alignment = 4; break; case VT_PTR: @@ -909,14 +872,12 @@ static int encode_type( next_vt = VT_VOID; encode_type(typelib, next_vt, type_pointer_get_ref(type), - &target_type, NULL, NULL, &child_size); + &target_type, &child_size); /* these types already have an implicit pointer, so we don't need to * add another */ if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; - *width = pointer_size; - *alignment = 4; *decoded_size = child_size; break; } @@ -945,8 +906,6 @@ static int encode_type( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } @@ -956,7 +915,8 @@ static int encode_type( type_t *element_type = type_alias_get_aliasee(type_array_get_element(type)); int next_vt = get_type_vt(element_type); - encode_type(typelib, next_vt, type_alias_get_aliasee(type_array_get_element(type)), &target_type, NULL, NULL, &child_size); + encode_type(typelib, next_vt, type_alias_get_aliasee(type_array_get_element(type)), + &target_type, &child_size); for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; @@ -982,8 +942,6 @@ static int encode_type( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } @@ -1053,16 +1011,12 @@ static int encode_type( } *encoded_type = typeoffset; - *width = 0; - *alignment = 1; break; } default: error("encode_type: unrecognized type %d.\n", vt); *encoded_type = default_type; - *width = 0; - *alignment = 1; break; } @@ -1079,8 +1033,6 @@ static int encode_var( type_t *type, /* [I] The type description to encode. */ var_t *var, /* [I] The var to encode. */ int *encoded_type, /* [O] The encoded type description. */ - int *width, /* [O] The width of the type, or NULL. */ - int *alignment, /* [O] The alignment of the type, or NULL. */ int *decoded_size) /* [O] The total size of the unencoded TYPEDESCs, including nested descs. */ { int typeoffset; @@ -1090,8 +1042,6 @@ static int encode_var( int vt; int scratch; - if (!width) width = &scratch; - if (!alignment) alignment = &scratch; if (!decoded_size) decoded_size = &scratch; *decoded_size = 0; @@ -1110,7 +1060,7 @@ static int encode_var( ++num_dims; chat("array with %d dimensions\n", num_dims); - encode_var(typelib, atype, var, &target_type, width, alignment, NULL); + encode_var(typelib, atype, var, &target_type, NULL); arrayoffset = ctl2_alloc_segment(typelib, MSFT_SEG_ARRAYDESC, (2 + 2 * num_dims) * sizeof(int), 0); arraydata = (void *)&typelib->typelib_segment_data[MSFT_SEG_ARRAYDESC][arrayoffset]; @@ -1136,7 +1086,6 @@ static int encode_var( typedata[1] = arrayoffset; *encoded_type = typeoffset; - *width = *width * elements; *decoded_size = 20 /*sizeof(ARRAYDESC)*/ + (num_dims - 1) * 8 /*sizeof(SAFEARRAYBOUND)*/; return 0; } @@ -1145,15 +1094,12 @@ static int encode_var( if (vt == VT_PTR) { type_t *ref = is_ptr(type) ? type_pointer_get_ref(type) : type_array_get_element(type); - int skip_ptr = encode_var(typelib, ref, var, - &target_type, NULL, NULL, &child_size); + int skip_ptr = encode_var(typelib, ref, var, &target_type, &child_size); if(skip_ptr == 2) { chat("encode_var: skipping ptr\n"); *encoded_type = target_type; *decoded_size = child_size; - *width = pointer_size; - *alignment = 4; return 0; } @@ -1184,15 +1130,13 @@ static int encode_var( *encoded_type = typeoffset; - *width = pointer_size; - *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; return 0; } dump_type(type); - encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); + encode_type(typelib, vt, type, encoded_type, decoded_size); /* these types already have an implicit pointer, so we don't need to * add another */ if(vt == VT_DISPATCH || vt == VT_UNKNOWN) return 2; @@ -1504,7 +1448,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) /* fill out the basic type information */ typedata[0] = typedata_size | (index << 16); - encode_var(typeinfo->typelib, type_function_get_rettype(func->type), func, &typedata[1], NULL, NULL, &decoded_size); + encode_var(typeinfo->typelib, type_function_get_rettype(func->type), func, + &typedata[1], &decoded_size); typedata[2] = funcflags; typedata[3] = ((52 /*sizeof(FUNCDESC)*/ + decoded_size) << 16) | typeinfo->typeinfo->cbSizeVft; typedata[4] = (next_idx << 16) | (callconv << 8) | (invokekind << 3) | funckind; @@ -1541,7 +1486,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) if(defaultdata) *defaultdata = -1; - encode_var(typeinfo->typelib, arg->type, arg, paramdata, NULL, NULL, &decoded_size); + encode_var(typeinfo->typelib, arg->type, arg, paramdata, &decoded_size); if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { switch(attr->type) { case ATTR_DEFAULTVALUE: @@ -1667,8 +1612,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) int offset, id; unsigned int typedata_size; INT *typedata; - int var_datawidth; - int var_alignment; + unsigned int var_datawidth, var_alignment = 0; int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; @@ -1770,8 +1714,8 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typeinfo->var_offsets[var_num] = offset; /* figure out type widths and whatnot */ - encode_var(typeinfo->typelib, var->type, var, &typedata[1], &var_datawidth, - &var_alignment, &var_type_size); + var_datawidth = type_memsize_and_alignment(var->type, &var_alignment); + encode_var(typeinfo->typelib, var->type, var, &typedata[1], &var_type_size); /* pad out starting position to data width */ typeinfo->datawidth += var_alignment - 1; @@ -1795,7 +1739,6 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ typeinfo->datawidth = pointer_size; - var_alignment = 4; break; default: error("add_var_desc: unhandled type kind %d\n", typeinfo->typekind); @@ -2073,7 +2016,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte dispinterface->attrs); msft_typeinfo->typeinfo->size = pointer_size; - msft_typeinfo->typeinfo->typekind |= 0x2100; + msft_typeinfo->typeinfo->typekind |= pointer_size << 11 | pointer_size << 6; msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ add_dispatch(typelib); @@ -2162,7 +2105,8 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); msft_typeinfo->typeinfo->size = pointer_size; - msft_typeinfo->typeinfo->typekind |= 0x2200; + msft_typeinfo->typeinfo->typekind |= 0x0200; + msft_typeinfo->typeinfo->typekind |= pointer_size << 11; for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) if (derived->name && !strcmp(derived->name, "IDispatch")) @@ -2247,7 +2191,8 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; - int alignment, datatype1, datatype2, size, duplicate = 0; + int datatype1, datatype2, duplicate = 0; + unsigned int size, alignment = 0; type_t *type; if (-1 < tdef->typelib_idx) @@ -2263,8 +2208,8 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) else duplicate = 1; - encode_type(typelib, get_type_vt(type), type, - &datatype1, &size, &alignment, &datatype2); + encode_type(typelib, get_type_vt(type), type, &datatype1, &datatype2); + size = type_memsize_and_alignment(type, &alignment); if (msft_typeinfo) { -- 2.7.4

June 3, 2018

[PATCH 3/4] stdole2.idl: Use more accurate sizes for Automation types.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/stdole2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 18c402a..d372384 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -32,15 +32,15 @@ ] library stdole { - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - + /* These typedefs need to have the same size as their real counterparts. */ typedef short VARIANT_BOOL; - typedef long BSTR; + typedef void *BSTR; typedef double CURRENCY; typedef unsigned long HRESULT; - typedef void *VARIANT; + typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; + } VARIANT; typedef unsigned long SCODE; typedef struct GUID { -- 2.7.4

June 3, 2018

[PATCH 2/4] oleaut32/tests: Fix size and alignment for typedefs on 64-bit.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e4fe91e..7c35e87 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3951,8 +3951,11 @@ static char *print_size(BSTR name, TYPEATTR *attr) sprintf(buf, "sizeof(union %s)", dump_string(name)); break; - case TKIND_ENUM: case TKIND_ALIAS: + sprintf(buf, "sizeof(%s)", dump_string(name)); + break; + + case TKIND_ENUM: sprintf(buf, "4"); break; @@ -3983,8 +3986,11 @@ static char *print_align(BSTR name, TYPEATTR *attr) sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name)); break; - case TKIND_ENUM: case TKIND_ALIAS: + sprintf(buf, "TYPE_ALIGNMENT(%s)", dump_string(name)); + break; + + case TKIND_ENUM: sprintf(buf, "4"); break; @@ -4283,13 +4289,13 @@ static const type_info info[] = { { "n", "{016fe2ec-b2c8-45f8-b23b-39e53a753902}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "nn", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4301,13 +4307,13 @@ static const type_info info[] = { { "m", "{016fe2ec-b2c8-45f8-b23b-39e53a753905}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m), /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { "mm", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4487,13 +4493,13 @@ static const type_info info[] = { { "t_INT", "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "a", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4523,7 +4529,7 @@ static const type_info info[] = { { "c", "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", - /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4541,7 +4547,7 @@ static const type_info info[] = { { "d", "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4559,7 +4565,7 @@ static const type_info info[] = { { "e", "{016fe2ec-b2c8-45f8-b23b-39e53a753970}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4577,7 +4583,7 @@ static const type_info info[] = { { "f", "{016fe2ec-b2c8-45f8-b23b-39e53a753972}", - /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { -- 2.7.4

June 3, 2018

[PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 66 ++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f4ad8f9..e4fe91e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3964,6 +3964,38 @@ static char *print_size(BSTR name, TYPEATTR *attr) return buf; } +static char *print_align(BSTR name, TYPEATTR *attr) +{ + static char buf[256]; + + switch (attr->typekind) + { + case TKIND_DISPATCH: + case TKIND_INTERFACE: + sprintf(buf, "TYPE_ALIGNMENT(%s*)", dump_string(name)); + break; + + case TKIND_RECORD: + sprintf(buf, "TYPE_ALIGNMENT(struct %s)", dump_string(name)); + break; + + case TKIND_UNION: + sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name)); + break; + + case TKIND_ENUM: + case TKIND_ALIAS: + sprintf(buf, "4"); + break; + + default: + assert(0); + return NULL; + } + + return buf; +} + static const char *dump_param_flags(DWORD flags) { static char buf[256]; @@ -4072,10 +4104,10 @@ static void test_dump_typelib(const char *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); - printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n" + printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), - attr->cbAlignment, print_size(name, attr), + print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs); @@ -4175,13 +4207,13 @@ static const type_info info[] = { { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4203,7 +4235,7 @@ static const type_info info[] = { { "parent_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4225,7 +4257,7 @@ static const type_info info[] = { { "child_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, { { @@ -4245,7 +4277,7 @@ static const type_info info[] = { { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4263,7 +4295,7 @@ static const type_info info[] = { { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4281,7 +4313,7 @@ static const type_info info[] = { { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", - /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4, /*size*/ sizeof(IDualIface*), + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, { { @@ -4423,7 +4455,7 @@ static const type_info info[] = { { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ISimpleIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, { { @@ -4443,13 +4475,13 @@ static const type_info info[] = { { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4533,13 +4565,13 @@ static const type_info info[] = { { "_e", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct _e), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct ee), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4551,19 +4583,19 @@ static const type_info info[] = { { "_f", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union _f), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union ff), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, { { -- 2.7.4

June 3, 2018

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

June 3, 2018

Re: [PATCH 2/2] d2d1: Add ID2D1DeviceContext stub.

by Henri Verbeet

On 29 May 2018 at 22:09, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Context can render in two ways - populating command list, or rendering to a > bitmap object. I was thinking we should create a dxgi target when rendering > to a bitmap and forward calls to it. For command lists we don’t need to > create a real target. > Yeah, but I think we'd still like things to work in essentially the same way. When rendering to a command list, we'd record commands for later execution. When rendering to a surface we'd do the same, but also start execution (more or less) immediately, potentially on a different thread.

June 3, 2018

Help with running Wine

by mrt303xx＠aol.com

I installed Wine, built and compiled Wine 3.9, and ran Winetricks to add the MS dependencies but nothing runs, not even a basic "Hello World" Windows app with NO MFC. Can somebody point me in the right direction?

June 2, 2018

Re: [PATCH 3/3] msi/tests: Test deferral of WriteRegistryValues.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38907 Your paranoid android. === w7u (32 bit action) === The task timed out

June 2, 2018

[PATCH 3/3] msi/tests: Test deferral of WriteRegistryValues.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 28 ++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 5162018..2e464c4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -695,12 +695,25 @@ static const char wrv_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "RemoveRegistryValues\t\t4900\n" + "rrv_immediate\tREMOVE\t4901\n" + "rrv_deferred\tREMOVE\t4902\n" "WriteRegistryValues\t\t5000\n" + "wrv_immediate\tNOT REMOVE\t5001\n" + "wrv_deferred\tNOT REMOVE\t5002\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6200\n" "PublishProduct\t\t6300\n" "InstallFinalize\t\t6600\n"; +static const char wrv_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "wrv_immediate\t1\tcustom.dll\twrv_absent\n" + "wrv_deferred\t1025\tcustom.dll\twrv_present\n" + "rrv_immediate\t1\tcustom.dll\twrv_present\n" + "rrv_deferred\t1025\tcustom.dll\twrv_absent\n"; + static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -2025,6 +2038,7 @@ static const msi_table wrv_tables[] = ADD_TABLE(wrv_feature), ADD_TABLE(wrv_feature_comp), ADD_TABLE(wrv_install_exec_seq), + ADD_TABLE(wrv_custom_action), ADD_TABLE(property), ADD_TABLE(media), ADD_TABLE(wrv_registry), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3e742e3..7f6aa65 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1922,3 +1922,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +UINT WINAPI wrv_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + check_reg_str(hinst, key, "sz", "string"); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI wrv_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + check_reg_str(hinst, key, "sz", NULL); + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index bfd8392..b94f6cc 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -53,3 +53,5 @@ @ stdcall sss_stopped(long) @ stdcall tl_present(long) @ stdcall tl_absent(long) +@ stdcall wrv_present(long) +@ stdcall wrv_absent(long) -- 2.7.4

June 2, 2018

[PATCH 2/3] msi/tests: Simplify and clarify WriteRegistryValues and RemoveRegistryValues tests.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 614 ++++++++++++++---------------------------------- 1 file changed, 182 insertions(+), 432 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index b6aa8e6..5162018 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -183,7 +183,7 @@ static const char property_dat[] = "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" "MSIFASTINSTALL\t1\n" - "regdata15\t#x01\n"; + "regdata17\t#1\n"; static const char env_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -634,8 +634,8 @@ static const char wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\t\taugustus\n" - "caesar\t\tMSITESTDIR\t1\t\t\n"; + "augustus\t{bafe0297-cbcc-4e08-8a78-7e9b83456eef}\tMSITESTDIR\t0\t\t\n" + "caesar\t{bafe0298-cbcc-4e08-8a78-7e9b83456eef}\tMSITESTDIR\t1\t\t\n"; static const char wrv_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" @@ -655,23 +655,51 @@ static const char wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" - "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus\n" - "regdata1\t2\tSOFTWARE\\Wine\\msitest\t*\t\taugustus\n" - "regdata2\t2\tSOFTWARE\\Wine\\msitest\t*\t#%\taugustus\n" - "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n" - "regdata4\t2\tSOFTWARE\\Wine\\msitest\\VisualStudio\\10.0\\AD7Metrics\\Exception\\{049EC4CC-30D2-4032-9256-EE18EB41B62B}\\Common Language Runtime Exceptions\\System.Workflow.ComponentModel.Serialization\\System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException\tlong\tkey\taugustus\n" - "regdata5\t2\tSOFTWARE\\Wine\\msitest\tValue1\t[~]one[~]\taugustus\n" - "regdata6\t2\tSOFTWARE\\Wine\\msitest\tValue2\t[~]two\taugustus\n" - "regdata7\t2\tSOFTWARE\\Wine\\msitest\tValue3\tone[~]\taugustus\n" - "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" - "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" - "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" - "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" - "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" - "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" - "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n" - "regdata16\t2\tSOFTWARE\\Wine\\msitest\tValue12\t#1\tcaesar\n"; + "regdata0\t1\tmsitest\tsz\tstring\taugustus\n" + "regdata1\t1\tmsitest\tmultisz\tone[~]two[~]three\taugustus\n" + "regdata2\t1\tmsitest\texpandsz\t#%string\taugustus\n" + "regdata3\t1\tmsitest\tdword\t#123\taugustus\n" + "regdata4\t1\tmsitest\tbinary\t#x01234567\taugustus\n" + "regdata5\t1\tmsitest\t\tdefault\taugustus\n" + "regdata6\t1\tmsitest\\subkey\t*\t\taugustus\n" + "regdata7\t1\tmsitest\\subkey\t*\t#%\taugustus\n" + "regdata8\t1\tmsitest\\subkey\t*\t#x\taugustus\n" + "regdata9\t1\tmsitest\\VisualStudio\\10.0\\AD7Metrics\\Exception\\{049EC4CC-30D2-4032-9256-EE18EB41B62B}\\Common Language Runtime Exceptions\\System.Workflow.ComponentModel.Serialization\\System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException\tlong\tkey\taugustus\n" + "regdata10\t1\tmsitest\tValue1\t[~]one[~]\taugustus\n" + "regdata11\t1\tmsitest\tValue2\t[~]two\taugustus\n" + "regdata12\t1\tmsitest\tValue3\tone[~]\taugustus\n" + "regdata13\t1\tmsitest\tValue4\tone[~]two\taugustus\n" + "regdata14\t1\tmsitest\tValue5\t[~]one[~]two[~]three\taugustus\n" + "regdata15\t1\tmsitest\tValue6\t[~]\taugustus\n" + "regdata16\t1\tmsitest\tValue7\t[~]two\taugustus\n" + "regdata17\t1\tmsitest\tformat\t[regdata17]\taugustus\n" + "regdata18\t1\tmsitest\tsource\t#1\tcaesar\n" + "regdata19\t1\tmsitest\\create\t+\t\taugustus\n" + "regdata20\t1\tmsitest\\delete\t-\t\taugustus\n"; + +static const char wrv_remove_registry_dat[] = + "RemoveRegistry\tRoot\tKey\tName\tComponent_\n" + "s72\ti2\tl255\tL255\ts72\n" + "RemoveRegistry\tRemoveRegistry\n" + "regdata0\t1\tmsitest\tinstremove\taugustus\n" + "regdata1\t1\tmsitest\\instremove\t-\taugustus\n"; + +static const char wrv_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveRegistryValues\t\t4900\n" + "WriteRegistryValues\t\t5000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6200\n" + "PublishProduct\t\t6300\n" + "InstallFinalize\t\t6600\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1289,65 +1317,6 @@ static const char rd_custom_action_dat[] = "rd_immediate\t1\tcustom.dll\trd_present\n" "rd_deferred\t1025\tcustom.dll\trd_absent\n"; -static const char rrv_file_dat[] = - "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "registry.txt\tregistry\tregistry.txt\t1000\t\t\t8192\t1\n"; - -static const char rrv_feature_dat[] = - "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" - "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" - "Feature\tFeature\n" - "registry\t\t\tregistry feature\t1\t2\tMSITESTDIR\t0\n"; - -static const char rrv_feature_comp_dat[] = - "Feature_\tComponent_\n" - "s38\ts72\n" - "FeatureComponents\tFeature_\tComponent_\n" - "registry\tregistry\n"; - -static const char rrv_component_dat[] = - "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "registry\t{DA97585B-962D-45EB-AD32-DA15E60CA9EE}\tMSITESTDIR\t0\t\tregistry.txt\n"; - -static const char rrv_registry_dat[] = - "Registry\tRoot\tKey\tName\tValue\tComponent_\n" - "s72\ti2\tl255\tL255\tL0\ts72\n" - "Registry\tRegistry\n" - "reg1\t2\tSOFTWARE\\Wine\\keyA\t\tA\tregistry\n" - "reg2\t2\tSOFTWARE\\Wine\\keyA\tvalueA\tA\tregistry\n" - "reg3\t2\tSOFTWARE\\Wine\\key1\t-\t\tregistry\n"; - -static const char rrv_remove_registry_dat[] = - "RemoveRegistry\tRoot\tKey\tName\tComponent_\n" - "s72\ti2\tl255\tL255\ts72\n" - "RemoveRegistry\tRemoveRegistry\n" - "reg1\t2\tSOFTWARE\\Wine\\keyB\t\tregistry\n" - "reg2\t2\tSOFTWARE\\Wine\\keyB\tValueB\tregistry\n" - "reg3\t2\tSOFTWARE\\Wine\\key2\t-\tregistry\n"; - -static const char rrv_install_exec_seq_dat[] = - "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "LaunchConditions\t\t100\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "CostFinalize\t\t1000\n" - "InstallValidate\t\t1400\n" - "InstallInitialize\t\t1500\n" - "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RemoveRegistryValues\t\t3000\n" - "RegisterProduct\t\t5000\n" - "PublishFeatures\t\t5100\n" - "PublishProduct\t\t5200\n" - "InstallFinalize\t\t6000\n"; - static const char frp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2055,11 +2024,11 @@ static const msi_table wrv_tables[] = ADD_TABLE(directory), ADD_TABLE(wrv_feature), ADD_TABLE(wrv_feature_comp), - ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), - ADD_TABLE(rof_media), + ADD_TABLE(wrv_install_exec_seq), ADD_TABLE(property), + ADD_TABLE(media), ADD_TABLE(wrv_registry), + ADD_TABLE(wrv_remove_registry), }; static const msi_table cf_tables[] = @@ -2232,20 +2201,6 @@ static const msi_table rd_tables[] = ADD_TABLE(property) }; -static const msi_table rrv_tables[] = -{ - ADD_TABLE(directory), - ADD_TABLE(rrv_component), - ADD_TABLE(rrv_feature), - ADD_TABLE(rrv_feature_comp), - ADD_TABLE(rrv_file), - ADD_TABLE(rrv_registry), - ADD_TABLE(rrv_remove_registry), - ADD_TABLE(rrv_install_exec_seq), - ADD_TABLE(media), - ADD_TABLE(property) -}; - static const msi_table frp_tables[] = { ADD_TABLE(directory), @@ -2368,75 +2323,6 @@ static const msi_table rep_tables[] = ADD_TABLE(media) }; -/* based on RegDeleteTreeW from dlls/advapi32/registry.c */ -static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) -{ - LONG ret; - DWORD dwMaxSubkeyLen, dwMaxValueLen; - DWORD dwMaxLen, dwSize; - char szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = hKey; - - if(lpszSubKey) - { - ret = RegOpenKeyExA(hKey, lpszSubKey, 0, access, &hSubKey); - if (ret) return ret; - } - - ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); - if (ret) goto cleanup; - - dwMaxSubkeyLen++; - dwMaxValueLen++; - dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); - if (dwMaxLen > sizeof(szNameBuf)) - { - /* Name too big: alloc a buffer for it */ - if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen))) - { - ret = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - } - - /* Recursively delete all the subkeys */ - while (TRUE) - { - dwSize = dwMaxLen; - if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, - NULL, NULL, NULL)) break; - - ret = action_RegDeleteTreeA(hSubKey, lpszName, access); - if (ret) goto cleanup; - } - - if (lpszSubKey) - { - if (pRegDeleteKeyExA) - ret = pRegDeleteKeyExA(hKey, lpszSubKey, access, 0); - else - ret = RegDeleteKeyA(hKey, lpszSubKey); - } - else - while (TRUE) - { - dwSize = dwMaxLen; - if (RegEnumValueA(hKey, 0, lpszName, &dwSize, - NULL, NULL, NULL, NULL)) break; - - ret = RegDeleteValueA(hKey, lpszName); - if (ret) goto cleanup; - } - -cleanup: - if (lpszName != szNameBuf) - HeapFree(GetProcessHeap(), 0, lpszName); - if(lpszSubKey) - RegCloseKey(hSubKey); - return ret; -} - /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2608,6 +2494,25 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase } } +static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, DWORD line) +{ + char val[MAX_PATH]; + DWORD size, type; + LONG res; + + size = MAX_PATH; + val[0] = '\0'; + res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size); + + if (res != ERROR_SUCCESS || type != REG_MULTI_SZ) + { + ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); + return; + } + + ok_(__FILE__, line)(!memcmp(val, expect, size), "wrong data\n"); +} + static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD line) { DWORD val, size, type; @@ -2643,6 +2548,9 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin RegDeleteValueA(prodkey, name); \ } while(0) +#define CHECK_REG_MULTI(key, name, expect) \ + check_reg_multi(key, name, expect, __LINE__); + #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); @@ -4737,12 +4645,11 @@ error: static void test_write_registry_values(void) { - UINT r; - LONG res; - HKEY hkey; + HKEY hkey, subkey; DWORD type, size; - CHAR path[MAX_PATH]; - BYTE buf[8]; + char buf[20]; + LONG res; + UINT r; if (is_process_limited()) { @@ -4751,18 +4658,12 @@ static void test_write_registry_values(void) } CreateDirectoryA("msitest", NULL); - create_file("msitest\\augustus", 500); create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - if (is_64bit) - res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Wine\\msitest", 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &hkey, NULL); - else - res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &hkey, NULL); + res = RegCreateKeyA(HKEY_CURRENT_USER, "msitest", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueExA(hkey, "Value1", 0, REG_MULTI_SZ, (const BYTE *)"two\0", 5); @@ -4779,7 +4680,13 @@ static void test_write_registry_values(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueExA(hkey, "Value7", 0, REG_SZ, (const BYTE *)"one", 4); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - RegCloseKey(hkey); + + res = RegSetValueExA(hkey, "instremove", 0, REG_SZ, (const BYTE *)"val", 3); + ok(!res, "got %u\n", res); + + res = RegCreateKeyA(hkey, "instremove", &subkey); + ok(!res, "got %u\n", res); + RegCloseKey(subkey); r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4788,157 +4695,120 @@ static void test_write_registry_values(void) goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - if (is_64bit) - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); - else - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); + CHECK_REG_STR(hkey, "sz", "string"); + CHECK_REG_MULTI(hkey, "multisz", "one\0two\0three\0"); + CHECK_REG_DWORD(hkey, "dword", 123); + + size = sizeof(buf); + res = RegQueryValueExA(hkey, "expandsz", NULL, &type, (BYTE *)buf, &size); + ok(!res, "got %u\n", res); + ok(type == REG_EXPAND_SZ, "got %d\n", type); + ok(!strcmp(buf, "string"), "got %s\n", buf); + + size = sizeof(buf); + res = RegQueryValueExA(hkey, "binary", NULL, &type, (BYTE *)buf, &size); + ok(!res, "got %u\n", res); + ok(type == REG_BINARY, "got %d\n", type); + ok(size == 4, "got size %u\n", size); + ok(!memcmp(buf, "\x01\x23\x45\x67", 4), "wrong data\n"); + + CHECK_REG_STR(hkey, "", "default"); + + res = RegOpenKeyA(hkey, "VisualStudio", &subkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegCloseKey(subkey); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0two\0three\0\0", size), "Wrong multi-sz data\n"); - ok(size == 15, "Expected 15, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + CHECK_REG_MULTI(hkey, "Value1", "one\0"); + CHECK_REG_MULTI(hkey, "Value2", "one\0two\0"); + CHECK_REG_MULTI(hkey, "Value3", "one\0two\0"); + CHECK_REG_MULTI(hkey, "Value4", "one\0two\0"); + CHECK_REG_MULTI(hkey, "Value5", "one\0two\0three\0"); + CHECK_REG_MULTI(hkey, "Value6", ""); + CHECK_REG_MULTI(hkey, "Value7", "two\0"); + CHECK_REG_DWORD(hkey, "format", 1); + CHECK_REG_DWORD(hkey, "source", 1); + + res = RegOpenKeyA(hkey, "subkey", &subkey); + ok(!res, "got %u\n", res); + res = RegQueryValueExA(subkey, "", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + RegCloseKey(subkey); + + res = RegOpenKeyA(hkey, "create", &subkey); + ok(!res, "got %u\n", res); + RegCloseKey(subkey); + + res = RegOpenKeyA(hkey, "delete", &subkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegCreateKeyA(hkey, "delete", &subkey); + ok(!res, "got %u\n", res); + RegCloseKey(subkey); + + res = RegQueryValueExA(hkey, "instremove", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegOpenKeyA(hkey, "instremove", &subkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(!r, "got %u\n", r); + + res = RegQueryValueExA(hkey, "sz", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "multisz", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "dword", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "expandsz", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "binary", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - res = action_RegDeleteTreeA(hkey, "VisualStudio", KEY_ALL_ACCESS); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegOpenKeyA(hkey, "VisualStudio", &subkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value1", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0", size), "Wrong multi-sz data\n"); - ok(size == 5, "Expected 5, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegQueryValueExA(hkey, "Value1", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "Value4", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "Value5", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "Value6", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "Value7", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value2", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0two\0", size), "Wrong multi-sz data\n"); - ok(size == 9, "Expected 9, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); +todo_wine { + CHECK_REG_MULTI(hkey, "Value2", "one\0"); + CHECK_REG_MULTI(hkey, "Value3", "two\0"); +} - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value3", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0two\0", size), "Wrong multi-sz data\n"); - ok(size == 9, "Expected 9, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegQueryValueExA(hkey, "format", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + res = RegQueryValueExA(hkey, "source", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value4", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0two\0", size), "Wrong multi-sz data\n"); - ok(size == 9, "Expected 9, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegOpenKeyA(hkey, "subkey", &subkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value5", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "one\0two\0three\0", size), "Wrong multi-sz data\n"); - ok(size == 15, "Expected 15, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegOpenKeyA(hkey, "create", &subkey); + ok(!res, "got %u\n", res); + RegCloseKey(subkey); + res = RegDeleteKeyA(hkey, "create"); + ok(!res, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value6", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "", size), "Wrong multi-sz data\n"); - ok(size == 1, "Expected 1, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + res = RegOpenKeyA(hkey, "delete", &subkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); - size = MAX_PATH; - type = 0xdeadbeef; - memset(path, 'a', MAX_PATH); - res = RegQueryValueExA(hkey, "Value7", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!memcmp(path, "two\0", size), "Wrong multi-sz data\n"); - ok(size == 5, "Expected 5, got %d\n", size); - ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); - - size = sizeof(buf); - type = 0xdeadbeef; - memset(buf, 0, size); - res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); - ok(res == ERROR_SUCCESS, "got %u\n", res); - ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); - ok(size == 4, "got %u\n", size); - ok(type == REG_DWORD, "got %u\n", type); - - size = sizeof(buf); - type = 0xdeadbeef; - memset(buf, 0, size); - res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); - ok(res == ERROR_SUCCESS, "got %u\n", res); - ok(buf[0] == 1, "got %u\n", buf[0]); - ok(size == 1, "got %u\n", size); - ok(type == REG_BINARY, "got %u\n", type); - - size = sizeof(buf); - type = 0xdeadbeef; - memset(buf, 0, size); - res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); - ok(res == ERROR_SUCCESS, "got %u\n", res); - ok(buf[0] == 1, "got %u\n", buf[0]); - ok(size == 1, "got %u\n", size); - ok(type == REG_BINARY, "got %u\n", type); - - size = sizeof(buf); - type = 0xdeadbeef; - memset(buf, 0, size); - res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); - ok(res == ERROR_SUCCESS, "got %u\n", res); - ok(buf[0] == 1, "got %u\n", buf[0]); - ok(size == 1, "got %u\n", size); - ok(type == REG_BINARY, "got %u\n", type); - - size = sizeof(buf); - type = 0xdeadbeef; - memset(buf, 0, size); - res = RegQueryValueExA(hkey, "Value12", NULL, &type, buf, &size); - ok(res == ERROR_SUCCESS, "got %u\n", res); - ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); - ok(size == 4, "got %u\n", size); - ok(type == REG_DWORD, "got %u\n", type); - - RegDeleteValueA(hkey, "Value"); - RegDeleteValueA(hkey, "Value1"); - RegDeleteValueA(hkey, "Value2"); - RegDeleteValueA(hkey, "Value3"); - RegDeleteValueA(hkey, "Value4"); - RegDeleteValueA(hkey, "Value5"); - RegDeleteValueA(hkey, "Value6"); - RegDeleteValueA(hkey, "Value7"); - RegDeleteValueA(hkey, "Value8"); - RegDeleteValueA(hkey, "Value9"); - RegDeleteValueA(hkey, "Value10"); - RegDeleteValueA(hkey, "Value11"); - RegDeleteValueA(hkey, "Value12"); RegCloseKey(hkey); - RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); + res = RegDeleteKeyA(HKEY_CURRENT_USER, "msitest"); + ok(!res, "got %u\n", res); error: DeleteFileA(msifile); - DeleteFileA("msitest\\augustus"); RemoveDirectoryA("msitest"); } @@ -5840,125 +5710,6 @@ error: DeleteFileA(msifile); } -static void test_remove_registry_values(void) -{ - UINT r; - LONG res; - HKEY key; - REGSAM access = KEY_ALL_ACCESS; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - create_test_files(); - create_file("msitest\\registry.txt", 1000); - create_database(msifile, rrv_tables, sizeof(rrv_tables) / sizeof(msi_table)); - - if (is_wow64) - access |= KEY_WOW64_64KEY; - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, NULL, 0, access, NULL, &key, NULL); - RegSetValueExA(key, "value1", 0, REG_SZ, (const BYTE *)"1", 2); - RegCloseKey(key); - - RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL); - RegSetValueExA(key, "value2", 0, REG_SZ, (const BYTE *)"2", 2); - RegCloseKey(key); - - RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", 0, NULL, 0, access, NULL, &key, NULL); - RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); - RegSetValueExA(key, "valueA", 0, REG_SZ, (const BYTE *)"A", 2); - RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); - RegCloseKey(key); - - RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, NULL, 0, access, NULL, &key, NULL); - RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); - RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); - RegCloseKey(key); - - r = MsiInstallProductA(msifile, NULL); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, access, &key); - ok(res == ERROR_SUCCESS, "key removed\n"); - RegCloseKey(key); - - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - - res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - RegCloseKey(key); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key); - ok(res == ERROR_SUCCESS, "key removed\n"); - RegCloseKey(key); - - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", 0, access, &key); - ok(res == ERROR_SUCCESS, "key removed\n"); - RegCloseKey(key); - - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); - } - - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access); - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access); - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine", access); - - ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - -error: - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", access); - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access); - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access); - delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", access); - - DeleteFileA("msitest\\registry.txt"); - delete_test_files(); - DeleteFileA(msifile); -} - static void test_find_related_products(void) { UINT r; @@ -6669,7 +6420,6 @@ START_TEST(action) test_create_remove_shortcut(); test_publish_components(); test_remove_duplicate_files(); - test_remove_registry_values(); test_find_related_products(); test_ini_values(); test_register_class_info(); -- 2.7.4

June 2, 2018

[PATCH 1/3] msi: Only delete empty registry keys in delete_key().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/action.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7197bca..ddd676d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2981,12 +2981,27 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } +static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path) +{ + DWORD subkeys, values; + HKEY key; + LONG res; + + key = open_key(comp, root, path, FALSE, get_registry_view(comp) | KEY_READ); + if (!key) return 0; + + res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0); + RegCloseKey(key); + + return !res && !subkeys && !values; +} + static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { + LONG res = ERROR_SUCCESS; REGSAM access = 0; WCHAR *subkey, *p; HKEY hkey; - LONG res; access |= get_registry_view( comp ); @@ -2999,10 +3014,15 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) if (!p[1]) continue; /* trailing backslash */ hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; + if (!is_key_empty(comp, hkey, p + 1)) + { + RegCloseKey(hkey); + break; + } res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); } - else + else if (is_key_empty(comp, root, subkey)) res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) { @@ -3017,17 +3037,14 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path { LONG res; HKEY hkey; - DWORD num_subkeys, num_values; if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, - NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); - if (!res && !num_subkeys && !num_values) + if (is_key_empty(comp, root, path)) { TRACE("removing empty key %s\n", debugstr_w(path)); delete_key( comp, root, path ); -- 2.7.4

June 2, 2018

[PATCH] propsys/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/tests/propsys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a6c7023527..e899ff9dc4 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -133,7 +133,7 @@ static void test_PSStringFromPropertyKey(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].psz) memcpy(testcases[i].psz, fillerW, PKEYSTR_MAX * sizeof(WCHAR)); @@ -413,7 +413,7 @@ static void test_PSPropertyKeyFromString(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].pkey) *testcases[i].pkey = out_init; @@ -480,7 +480,7 @@ static void test_InitPropVariantFromGUIDAsString(void) InitVariantFromGUIDAsString(&IID_NULL, NULL); } - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i=0; i < ARRAY_SIZE(testcases); i++) { memset(&propvar, 0, sizeof(PROPVARIANT)); hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); -- 2.14.4

June 1, 2018

[PATCH] pdh/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/tests/pdh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 573bcc3a10..0a17906afb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || ret == PDH_MORE_DATA, /* win2k3 */ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size); } static void test_PdhValidatePathA( void ) -- 2.14.4

June 1, 2018

[PATCH] packager/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1f81cb5404..1ce54eda7e 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -457,7 +457,7 @@ static void test_packager(void) ok(hr == S_OK, "Load failed: %08x\n", hr); if(extended){ - len = GetTempPathW(sizeof(filename) / sizeof(*filename), filename); + len = GetTempPathW(ARRAY_SIZE(filename), filename); lstrcpyW(filename + len, filename3W); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, -- 2.14.4

June 1, 2018

[PATCH] opengl32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8126fbf96d..b69d91caf9 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -525,7 +525,7 @@ static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; BOOL res; @@ -545,8 +545,8 @@ static void test_colorbits(HDC hdc) return; } - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), iAttribList, + iAttribRet); if(res == FALSE) { skip("wglGetPixelFormatAttribivARB failed\n"); @@ -560,7 +560,7 @@ static void test_colorbits(HDC hdc) static void test_gdi_dbuf(HDC hdc) { const int iAttribList[] = { WGL_SUPPORT_GDI_ARB, WGL_DOUBLE_BUFFER_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; BOOL res; @@ -574,9 +574,8 @@ static void test_gdi_dbuf(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; @@ -588,7 +587,7 @@ static void test_gdi_dbuf(HDC hdc) static void test_acceleration(HDC hdc) { const int iAttribList[] = { WGL_ACCELERATION_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; int res; @@ -603,9 +602,8 @@ static void test_acceleration(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; -- 2.14.4

June 1, 2018

[PATCH] oledlg/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledlg/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 5d452f1b09..cef55eb9ca 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -385,7 +385,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info); ok(ret, "got %d\n", ret); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); @@ -406,7 +406,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, @@ -462,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); buffW[0] = 0; - GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; @@ -475,7 +475,7 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; buffW[0] = 0; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); -- 2.14.4

June 1, 2018

[PATCH] oledb32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/tests/convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 08256242fd..441624048a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -221,8 +221,8 @@ static void test_canconvert(void) return; } - for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) - for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) + for(src_idx = 0; src_idx < ARRAY_SIZE(simple_convert); src_idx++) + for(dst_idx = 0; dst_idx < ARRAY_SIZE(simple_convert); dst_idx++) { BOOL expect, simple_expect; simple_expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; @@ -1479,7 +1479,7 @@ static void test_converttowstr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %ld\n", dst_len); ok(!lstrcmpW(hexunpacked_w, dst), "got %s\n", wine_dbgstr_w(dst)); - ok(dst[sizeof(hexpacked_w)/sizeof(WCHAR) * 4 + 1] == 0xcccc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_w) * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); @@ -2045,7 +2045,7 @@ static void test_converttostr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %ld\n", dst_len); ok(!lstrcmpA(hexunpacked_a, dst), "got %s\n", dst); - ok(dst[sizeof(hexpacked_a)/sizeof(char) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_a) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); -- 2.14.4

June 1, 2018

[PATCH] hlink/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/tests/hlink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 265dea3f45..52b5c57f9e 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -120,7 +120,7 @@ static void test_HlinkIsShortcut(void) {NULL, E_INVALIDARG} }; - for(i=0; i<sizeof(shortcut_test)/sizeof(shortcut_test[0]); i++) { + for (i=0; i < ARRAY_SIZE(shortcut_test); i++) { hres = HlinkIsShortcut(shortcut_test[i].file); ok(hres == shortcut_test[i].hres, "[%d] HlinkIsShortcut returned %08x, expected %08x\n", i, hres, shortcut_test[i].hres); @@ -651,7 +651,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, winehq_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(winehq_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(winehq_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -667,7 +667,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, clsid_nameW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(clsid_nameW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_IsSystemMoniker(mon, &issys); @@ -678,7 +678,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, invalid_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(invalid_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(invalid_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -694,7 +694,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, file_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(file_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(file_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); -- 2.14.4

June 1, 2018

[PATCH] ole32: Don't try to unregister window class if it was never registered.

by Jacek Caban

UnregisterClass may load display driver, which is may be problematic inside DLL_PROCESS_DETACH (esp. in Android drivers, which imports ole32 itself). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/compobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

June 1, 2018

Re: [PATCH v3 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 1, 2018

[PATCH v3 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 +----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..4857d29 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

June 1, 2018

Re: [PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Piotr Caban

Hi, I don't think it will compile. Assembler function are global so this will redefine the function. You can put the implementation in except_i386 file only. Thanks, Piotr On 06/01/18 18:44, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- > dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- > 2 files changed, 38 insertions(+), 22 deletions(-) > > diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c > index 3402d13..ea5dffe 100644 > --- a/dlls/msvcrt/cpp.c > +++ b/dlls/msvcrt/cpp.c > @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) > #if _MSVCR_VER >= 100 > > #ifdef __i386__ > -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) > -{ > - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); > - if (has_vbase) > - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ > - __asm__ __volatile__("pushl $1; pushl %2; call *%0" > - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); > - else > - __asm__ __volatile__("pushl %2; call *%0" > - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); > -} > +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); > + > +__ASM_GLOBAL_FUNC( call_copy_ctor, > + "pushl %ebp\n\t" > + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") > + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") > + "movl %esp, %ebp\n\t" > + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") > + "cmpl $0, 20(%ebp)\n\t" > + "jz 1f\n\t" > + "pushl $1\n\t" > + "1:\n\t" > + "movl 12(%ebp), %ecx\n\t" > + "pushl 16(%ebp)\n\t" > + "call *8(%ebp)\n\t" > + "leave\n" > + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") > + __ASM_CFI(".cfi_same_value %ebp\n\t") > + "ret" ); > #else > static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) > { > diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c > index 5121301..fad5227 100644 > --- a/dlls/msvcrt/except_i386.c > +++ b/dlls/msvcrt/except_i386.c > @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) > } > > /* call a copy constructor */ > -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) > -{ > - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); > - if (has_vbase) > - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ > - __asm__ __volatile__("pushl $1; pushl %2; call *%0" > - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); > - else > - __asm__ __volatile__("pushl %2; call *%0" > - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); > -} > +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); > + > +__ASM_GLOBAL_FUNC( call_copy_ctor, > + "pushl %ebp\n\t" > + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") > + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") > + "movl %esp, %ebp\n\t" > + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") > + "cmpl $0, 20(%ebp)\n\t" > + "jz 1f\n\t" > + "pushl $1\n\t" > + "1:\n\t" > + "movl 12(%ebp), %ecx\n\t" > + "pushl 16(%ebp)\n\t" > + "call *8(%ebp)\n\t" > + "leave\n" > + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") > + __ASM_CFI(".cfi_same_value %ebp\n\t") > + "ret" ); > > /* continue execution to the specified address after exception is caught */ > static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) >

June 1, 2018

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

June 1, 2018

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

June 1, 2018

Re: [PATCH 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException().

by Zebediah Figura

On 06/01/2018 11:18 AM, Piotr Caban wrote: > Hi Zebediah, > > Could you please also change the implementation in except_i386.c > (there's identical call_copy_ctor function there). > > Thanks, > Piotr > Sure, I'll send patches to change those as well.

June 1, 2018

Re: [PATCH 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException().

by Piotr Caban

Hi Zebediah, Could you please also change the implementation in except_i386.c (there's identical call_copy_ctor function there). Thanks, Piotr On 06/01/18 00:13, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- > 1 file changed, 19 insertions(+), 11 deletions(-) > > diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c > index 3402d13..ea5dffe 100644 > --- a/dlls/msvcrt/cpp.c > +++ b/dlls/msvcrt/cpp.c > @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) > #if _MSVCR_VER >= 100 > > #ifdef __i386__ > -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) > -{ > - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); > - if (has_vbase) > - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ > - __asm__ __volatile__("pushl $1; pushl %2; call *%0" > - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); > - else > - __asm__ __volatile__("pushl %2; call *%0" > - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); > -} > +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); > + > +__ASM_GLOBAL_FUNC( call_copy_ctor, > + "pushl %ebp\n\t" > + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") > + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") > + "movl %esp, %ebp\n\t" > + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") > + "cmpl $0, 20(%ebp)\n\t" > + "jz 1f\n\t" > + "pushl $1\n\t" > + "1:\n\t" > + "movl 12(%ebp), %ecx\n\t" > + "pushl 16(%ebp)\n\t" > + "call *8(%ebp)\n\t" > + "leave\n" > + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") > + __ASM_CFI(".cfi_same_value %ebp\n\t") > + "ret" ); > #else > static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) > { >

June 1, 2018

Re: [PATCH 1/2] msvcrt: Avoid using inline assembly in __ExceptionPtrDestroy().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 1, 2018

Re: [PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 4/5] dxgi/tests: Run test_swapchain_backbuffer_index() also on D3D12.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 3/5] include/d3d12: Add PFN_D3D12_CREATE_DEVICE.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 2/5] dxgi/tests: Add test for IDXGISwapChain3::GetCurrentBackBufferIndex().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 1/5] dxgi: Translate VkResults to HRESULTs.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH] dxgi: Fix a trailing '\n' in a FIXME() trace.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

[PATCH v2] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Also free the paths in pStrokes dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60515..49e270c4fe 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } } -- 2.17.0

June 1, 2018

[PATCH v2] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Moved the declaration of WCHAR into the if statement to be with all the other declarations dlls/gdi32/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..9f47578a70 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2823,6 +2823,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, UINT cp; int len; char mbchs[2]; + WCHAR wChar = 0; cp = GdiGetCodePage(hdc); if (IsDBCSLeadByteEx(cp, uChar >> 8)) { @@ -2833,8 +2834,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

June 1, 2018

[PATCH] winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 2 +- dlls/dxgi/swapchain.c | 3 +-- dlls/winevulkan/make_vulkan | 7 ++++++- dlls/winex11.drv/vulkan.c | 3 +-- include/wine/vulkan.h | 7 ++++++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 91525b49a790..be0bd7acdf74 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -23,7 +23,7 @@ #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..080541c90462 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,11 +24,10 @@ #ifdef SONAME_LIBVKD3D #define VK_NO_PROTOTYPES -#define VKAPI_CALL #define VKD3D_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f0583b400385..2265ddc80b7d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2009,6 +2009,12 @@ class VkGenerator(object): f.write("#include <windef.h>\n") f.write("#include <stdint.h>\n\n") + f.write("/* Define WINE_VK_HOST to get 'host' headers. */\n") + f.write("#ifdef WINE_VK_HOST\n") + f.write("#define VKAPI_CALL\n") + f.write('#define WINE_VK_ALIGN(x)\n') + f.write("#endif\n\n") + f.write("#ifndef VKAPI_CALL\n") f.write("#define VKAPI_CALL __stdcall\n") f.write("#endif\n\n") @@ -2017,7 +2023,6 @@ class VkGenerator(object): f.write("#define VKAPI_PTR VKAPI_CALL\n") f.write("#endif\n\n") - f.write("/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */\n") f.write("#ifndef WINE_VK_ALIGN\n") f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n") f.write("#endif\n\n") diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index a72be33be341..7e252326b5ac 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -31,9 +31,8 @@ #include "wine/library.h" #include "x11drv.h" -/* We only want host compatible structures and don't need alignment. */ -#define WINE_VK_ALIGN(x) #define VK_NO_PROTOTYPES +#define WINE_VK_HOST #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7c938cd88fb2..d44687fabf7b 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6,6 +6,12 @@ #include <windef.h> #include <stdint.h> +/* Define WINE_VK_HOST to get 'host' headers. */ +#ifdef WINE_VK_HOST +#define VKAPI_CALL +#define WINE_VK_ALIGN(x) +#endif + #ifndef VKAPI_CALL #define VKAPI_CALL __stdcall #endif @@ -14,7 +20,6 @@ #define VKAPI_PTR VKAPI_CALL #endif -/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */ #ifndef WINE_VK_ALIGN #define WINE_VK_ALIGN DECLSPEC_ALIGN #endif -- 2.16.4

June 1, 2018

Re: [PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38891 Your paranoid android. === build (build) === Could not determine the test executable's base name

June 1, 2018

[PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/Makefile.in | 2 +- dlls/d3d12/tests/d3d12.c | 96 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in index d055aba108ad..b3406f9e6c11 100644 --- a/dlls/d3d12/tests/Makefile.in +++ b/dlls/d3d12/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d12.dll -IMPORTS = d3d12 +IMPORTS = d3d12 dxgi user32 C_SRCS = \ d3d12.c diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 27a6b2798265..c8f17f314ce1 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -237,7 +237,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex resource_desc.Height = 32; resource_desc.DepthOrArraySize = 1; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -443,6 +443,46 @@ static ID3D12Resource *create_readback_buffer_(unsigned int line, ID3D12Device * D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST); } +static HWND create_window(DWORD style) +{ + return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); +} + +static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, + unsigned int width, unsigned int height) +{ + IDXGISwapChain1 *swapchain1; + DXGI_SWAP_CHAIN_DESC1 desc; + IDXGISwapChain3 *swapchain; + IDXGIFactory4 *factory; + HRESULT hr; + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + desc.Width = width; + desc.Height = height; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.Stereo = FALSE; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = 2; + desc.Scaling = DXGI_SCALING_STRETCH; + desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &desc, NULL, NULL, &swapchain1); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + + hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain); + ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); + IDXGISwapChain1_Release(swapchain1); + return swapchain; +} + struct resource_readback { unsigned int width; @@ -651,8 +691,62 @@ static void test_draw(void) destroy_test_context(&context); } +static void test_swapchain_draw(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + struct test_context context; + ID3D12Resource *backbuffer; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + unsigned int index; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!init_test_context(&context)) + return; + command_list = context.list; + queue = context.queue; + + window = create_window(0); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + set_viewport(&context.viewport, 0.0f, 0.0f, rect.right, rect.bottom, 0.0f, 1.0f); + swapchain = create_swapchain(queue, window, rect.right, rect.bottom); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); + ID3D12Device_CreateRenderTargetView(context.device, backbuffer, NULL, context.rtv); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); + + refcount = ID3D12Resource_Release(backbuffer); + ok(!refcount, "Backbuffer has %u references left.\n", refcount); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { test_interfaces(); test_draw(); + test_swapchain_draw(); } -- 2.16.4

June 1, 2018

[PATCH 4/5] dxgi/tests: Run test_swapchain_backbuffer_index() also on D3D12.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 172 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 140 insertions(+), 32 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index e67883e3338f..2e68511137a7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "dxgi1_6.h" #include "d3d11.h" +#include "d3d12.h" #include "wine/heap.h" #include "wine/test.h" @@ -35,6 +36,8 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); +static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -464,6 +467,64 @@ success: return dxgi_device; } +static ID3D12Device *create_d3d12_device(void) +{ + IDXGIAdapter *adapter; + ID3D12Device *device; + HRESULT hr; + + if (!pD3D12CreateDevice) + return NULL; + + adapter = create_adapter(); + hr = pD3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + return NULL; + + return device; +} + +static ID3D12CommandQueue *create_d3d12_direct_queue(ID3D12Device *device) +{ + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + return queue; +} + +#define get_factory(a, b, c) get_factory_(__LINE__, a, b, c) +static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDXGIFactory **factory) +{ + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + if (is_d3d12) + { + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)factory); + ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + } + else + { + dxgi_device = (IDXGIDevice *)device; + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)factory); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + } +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -3534,40 +3595,33 @@ static void test_swapchain_present(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -static void test_swapchain_backbuffer_index(void) +static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; - unsigned int backbuffer_index; + unsigned int index, expected_index; IDXGISwapChain3 *swapchain3; IDXGISwapChain *swapchain; - IDXGIAdapter *adapter; + HRESULT hr, expected_hr; IDXGIFactory *factory; - IDXGIDevice *device; unsigned int i, j; ULONG refcount; - HRESULT hr; RECT rect; BOOL ret; - static const DXGI_SWAP_EFFECT swap_effects[] = - { - DXGI_SWAP_EFFECT_DISCARD, - DXGI_SWAP_EFFECT_SEQUENTIAL, - DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, - DXGI_SWAP_EFFECT_FLIP_DISCARD, - }; - - if (!(device = create_device(0))) + static const struct { - skip("Failed to create device.\n"); - return; + DXGI_SWAP_EFFECT swap_effect; + BOOL supported_in_d3d12; } + tests[] = + { + {DXGI_SWAP_EFFECT_DISCARD, FALSE}, + {DXGI_SWAP_EFFECT_SEQUENTIAL, FALSE}, + {DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + }; - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; @@ -3588,11 +3642,15 @@ static void test_swapchain_backbuffer_index(void) swapchain_desc.BufferDesc.Width = rect.right; swapchain_desc.BufferDesc.Height = rect.bottom; - for (i = 0; i < ARRAY_SIZE(swap_effects); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - swapchain_desc.SwapEffect = swap_effects[i]; + swapchain_desc.SwapEffect = tests[i].swap_effect; + expected_hr = !is_d3d12 || tests[i].supported_in_d3d12 ? S_OK : DXGI_ERROR_INVALID_CALL; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + todo_wine_if(is_d3d12 && tests[i].supported_in_d3d12) + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (FAILED(hr)) + continue; hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3); if (hr == E_NOINTERFACE) @@ -3602,10 +3660,11 @@ static void test_swapchain_backbuffer_index(void) goto done; } - for (j = 0; j < swapchain_desc.BufferCount; ++j) + for (j = 0; j < 2 * swapchain_desc.BufferCount; ++j) { - backbuffer_index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); - ok(!backbuffer_index, "Got unexpected back buffer index %u.\n", backbuffer_index); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); + expected_index = is_d3d12 ? j % swapchain_desc.BufferCount : 0; + ok(index == expected_index, "Got back buffer index %u, expected %u.\n", index, expected_index); hr = IDXGISwapChain3_Present(swapchain3, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } @@ -3616,11 +3675,9 @@ static void test_swapchain_backbuffer_index(void) } done: - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_maximum_frame_latency(void) @@ -3901,10 +3958,49 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) +{ + IDXGIDevice *device; + ULONG refcount; + + if (!(device = create_device(0))) + { + skip("Failed to create Direct3D 10 device.\n"); + return; + } + + test_func((IUnknown *)device, FALSE); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) +{ + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + + if (!(device = create_d3d12_device())) + { + skip("Failed to create Direct3D 12 device.\n"); + return; + } + + queue = create_d3d12_direct_queue(device); + + test_func((IUnknown *)queue, TRUE); + + refcount = ID3D12CommandQueue_Release(queue); + ok(!refcount, "Command queue has %u references left.\n", refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE dxgi_module, d3d12_module; unsigned int argc, i; - HMODULE dxgi_module; char **argv; dxgi_module = GetModuleHandleA("dxgi.dll"); @@ -3941,8 +4037,20 @@ START_TEST(device) test_swapchain_resize(); test_swapchain_parameters(); test_swapchain_present(); - test_swapchain_backbuffer_index(); + run_on_d3d10(test_swapchain_backbuffer_index); test_maximum_frame_latency(); test_output_desc(); test_object_wrapping(); + + if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) + { + skip("Direct3D 12 is not available.\n"); + return; + } + + pD3D12CreateDevice = (void *)GetProcAddress(d3d12_module, "D3D12CreateDevice"); + + run_on_d3d12(test_swapchain_backbuffer_index); + + FreeLibrary(d3d12_module); } -- 2.16.4

June 1, 2018

[PATCH 3/5] include/d3d12: Add PFN_D3D12_CREATE_DEVICE.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index e9dd22158036..69220e674cd7 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,6 +2171,9 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, + D3D_FEATURE_LEVEL minmum_feature_level, REFIID iid, void **device); + [local] HRESULT __stdcall D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); -- 2.16.4

June 1, 2018

[PATCH 2/5] dxgi/tests: Add test for IDXGISwapChain3::GetCurrentBackBufferIndex().

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8ad4935b1622..e67883e3338f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3534,6 +3534,95 @@ static void test_swapchain_present(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_swapchain_backbuffer_index(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + unsigned int backbuffer_index; + IDXGISwapChain3 *swapchain3; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + IDXGIDevice *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + RECT rect; + BOOL ret; + + static const DXGI_SWAP_EFFECT swap_effects[] = + { + DXGI_SWAP_EFFECT_DISCARD, + DXGI_SWAP_EFFECT_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_DISCARD, + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 4; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain_desc.BufferDesc.Width = rect.right; + swapchain_desc.BufferDesc.Height = rect.bottom; + + for (i = 0; i < ARRAY_SIZE(swap_effects); ++i) + { + swapchain_desc.SwapEffect = swap_effects[i]; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3); + if (hr == E_NOINTERFACE) + { + skip("IDXGISwapChain3 is not supported.\n"); + IDXGISwapChain_Release(swapchain); + goto done; + } + + for (j = 0; j < swapchain_desc.BufferCount; ++j) + { + backbuffer_index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); + ok(!backbuffer_index, "Got unexpected back buffer index %u.\n", backbuffer_index); + hr = IDXGISwapChain3_Present(swapchain3, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + IDXGISwapChain3_Release(swapchain3); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + +done: + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -3852,6 +3941,7 @@ START_TEST(device) test_swapchain_resize(); test_swapchain_parameters(); test_swapchain_present(); + test_swapchain_backbuffer_index(); test_maximum_frame_latency(); test_output_desc(); test_object_wrapping(); -- 2.16.4

June 1, 2018

[PATCH 1/5] dxgi: Translate VkResults to HRESULTs.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..a775df2446e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -847,6 +847,21 @@ struct dxgi_vk_funcs PFN_vkDestroyFence p_vkDestroyFence; }; +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + return E_OUTOFMEMORY; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; @@ -1187,18 +1202,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) < 0) + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { - ERR("Failed to wait for fences, vr %d.\n", vr); - return E_FAIL; + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) { ERR("Failed to reset fence, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } return S_OK; @@ -1574,7 +1589,7 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, { WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); heap_free(formats); - return DXGI_ERROR_INVALID_CALL; + return hresult_from_vk_result(vr); } for (i = 0; i < format_count; ++i) @@ -1612,11 +1627,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkInstance vk_instance; - HRESULT hr = E_FAIL; VkBool32 supported; VkDevice vk_device; VkFormat vk_format; VkResult vr; + HRESULT hr; swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; @@ -1674,6 +1689,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1682,17 +1698,18 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) goto fail; - hr = E_FAIL; if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1701,6 +1718,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1718,6 +1736,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1743,6 +1762,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1752,21 +1772,27 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) + { + hr = E_FAIL; goto fail; + } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } -- 2.16.4

June 1, 2018

Re: [PATCH] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Huw Davies

On Thu, May 31, 2018 at 11:03:36PM -0600, Alex Henrie wrote: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > CID 716634 (#1 of 1): Resource leak (RESOURCE_LEAK) > > leaked_storage: Variable pStrokes going out of scope leaks the storage > it points to. > > dlls/gdi32/path.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c > index 41cab60515..ceb8d29977 100644 > --- a/dlls/gdi32/path.c > +++ b/dlls/gdi32/path.c > @@ -1749,6 +1749,8 @@ static struct gdi_path *PATH_WidenPath(DC *dc) > break; > default: > ERR("Got path flag %c\n", flat_path->flags[i]); > + HeapFree(GetProcessHeap(), 0, pStrokes); > + free_gdi_path(flat_path); > return NULL; > } > } Not that this really matters, but since you're doing it, we should also free the paths stored in the pStrokes array. Huw.

June 1, 2018

Re: [PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 1, 2018

[PATCH] dxgi: Fix a trailing '\n' in a FIXME() trace.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b..5f151a86579 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1037,7 +1037,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!n", iface, fullscreen, target); + FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; } -- 2.17.0

June 1, 2018

[PATCH] wsdapi/tests: Add a trailing '\n' to an ok() call.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cfdd41fe83c..96c2ead7f9a 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -540,7 +540,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, "pSoap->Header.Action == '%s'\n", wine_dbgstr_w(pSoap->Header.Action)); - ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL\n"); /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) -- 2.17.0

June 1, 2018

[PATCH] schedsvc: Add a trailing '\n' to some ERR() messages.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/schedsvc/svc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 9342b50e4b9..22989261935 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -39,7 +39,7 @@ static HANDLE done_event, hjob_queue; void add_process_to_queue(HANDLE process) { if (!AssignProcessToJobObject(hjob_queue, process)) - ERR("AssignProcessToJobObject failed"); + ERR("AssignProcessToJobObject failed\n"); } static DWORD WINAPI tasks_monitor_thread(void *arg) @@ -69,14 +69,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) hjob_queue = CreateJobObjectW(NULL, NULL); if (!hjob_queue) { - ERR("CreateJobObject failed"); + ERR("CreateJobObject failed\n"); return -1; } hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); if (!hport) { - ERR("CreateIoCompletionPort failed"); + ERR("CreateIoCompletionPort failed\n"); return -1; } @@ -84,7 +84,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) info.CompletionPort = hport; if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) { - ERR("SetInformationJobObject failed"); + ERR("SetInformationJobObject failed\n"); return -1; } -- 2.17.0

June 1, 2018

[PATCH] shell32: Fix a typo in a comment.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e18d53..04ac0b6fd3c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -502,7 +502,7 @@ static INT_PTR CALLBACK file_properties_proc(HWND hwndDlg, UINT uMsg, WPARAM wPa ERR("failed to update file attributes of %s\n", debugstr_w(props->path)); } - /* Update filename it it was changed */ + /* Update filename if it was changed */ if (GetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, newname, ARRAY_SIZE(newname)) && strcmpW(props->filename, newname) && strlenW(props->dir) + strlenW(newname) + 2 < ARRAY_SIZE(newpath)) -- 2.17.0

June 1, 2018

[PATCH] dwrite: Fix typos in a couple of idl parameter names.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/dwrite_3.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index de14b910ee3..5958e6fb1bc 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -281,7 +281,7 @@ interface IDWriteFontSet1 : IDWriteFontSet UINT32 *actual_num_ranges); HRESULT GetFontFaceReference( UINT32 index, - IDWriteFontFaceReference1 **referece); + IDWriteFontFaceReference1 **reference); HRESULT CreateFontResource( UINT32 index, IDWriteFontResource **resource); @@ -651,7 +651,7 @@ interface IDWriteFontSetBuilder2 : IDWriteFontSetBuilder1 DWRITE_FONT_AXIS_RANGE const *axis_ranges, UINT32 num_ranges, DWRITE_FONT_PROPERTY const *props, - UINT32 num_properies); + UINT32 num_properties); HRESULT AddFontFile(const WCHAR *filepath); } -- 2.17.0

June 1, 2018

[PATCH] wscript/tests: Fix a typo in the WScript.BuildVersion check.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/wscript/tests/run.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5a5539b1734..a812a85c9e0 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); -- 2.17.0

June 1, 2018

[PATCH] Revert "testbot/web: Tweak VMDetails.pl to save the Item directly."

by Francois Gouget

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the VMDetails page is also used to create new VMs so we have no choice but to go through the collection. This reverts commit 71a9602bb6eab2b54e930080b8ef728064d6a664. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 057147157..9603e346a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -62,7 +62,8 @@ sub Save($) } } - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); } -- 2.17.0

June 1, 2018

[PATCH] dbghelp: Add a missing include to fix the build.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4018c9dbf2..7c40801d89 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -51,6 +51,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H -- 2.16.2

June 1, 2018

[PATCH] testbot/web: Fix the Submit.pl TestExecutable validation.

by Francois Gouget

Fix the parentheses and also make sure it does not contain a path. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2a4521edc..757efd1f5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -476,12 +476,13 @@ sub Validate($) elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || - ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) + $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || + ($self->GetParam("FileType") eq "patchprograms" && + $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || + ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { - $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; return !1; } -- 2.17.0

June 1, 2018

[PATCH] testbot/web: Don't trust the Submit.pl File / FileName field.

by Francois Gouget

Make sure the filename does not contain a path. Rename the variable to $BaseName to make that clearer. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 68 +++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 757efd1f5..ae69e7ce5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -506,6 +506,33 @@ sub Validate($) return $self->SUPER::Validate(); } +sub ValidateAndGetFileName($$) +{ + my ($self, $FieldName) = @_; + + my $FileName = $self->GetParam($FieldName); + if (!$FileName) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "You must provide a file to test"; + return undef; + } + if ($FileName =~ m=[/\\]=) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is invalid"; + return undef; + } + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is too long"; + return undef; + } + return $FileName; +} + sub DetermineFileType($$) { my ($self, $FileName) = @_; @@ -594,29 +621,13 @@ sub OnPage1Next($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); - if (! $FileName) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Must be entered"; - return !1; - } + my $BaseName = $self->ValidateAndGetFileName("File"); + return !1 if (!$BaseName); + my $Fh = $self->CGI->upload("File"); if (defined($Fh)) { - if ($FileName =~ /(\\|\/)/) - { - $FileName =~ m/^.*(\\|\/)(.*)/; - $FileName = $2; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "The filename is too long"; - return !1; - } - my $StagingFile = $self->GetTmpStagingFullPath($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -648,7 +659,7 @@ sub OnPage1Next($) return !1; } - $self->{FileName} = $FileName; + $self->{FileName} = $BaseName; $self->{FileType} = $FileType; if (defined($DllBaseName)) { @@ -706,10 +717,11 @@ sub OnPage2Prev($) { my ($self) = @_; - my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); - if ($StagingFileName) + my $FileName = $self->GetParam("File"); + if ($FileName) { - unlink($StagingFileName); + my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); + unlink($StagingFileName) if ($StagingFileName); } $self->{Page} = 1; @@ -737,16 +749,14 @@ sub OnSubmit($) { my ($self) = @_; - if (! $self->Validate()) - { - return !1; - } + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); # Store the file in the staging directory until the relevant Job and Step # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. - my $BaseName = $self->GetParam("FileName"); my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); -- 2.17.0

June 1, 2018

[PATCH] testbot/build: Document the Reconfig.pl commands.

by Francois Gouget

The information messages mirror those of Build.pl. They also add empty lines in the log, improving readability. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 6f461144e..f84c80458 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,17 @@ sub BEGIN use WineTestBot::Config; +sub InfoMsg(@) +{ + my $OldUMask = umask(002); + if (open LOGFILE, ">>$LogDir/Reconfig.log") + { + print LOGFILE @_; + close LOGFILE; + } + umask($OldUMask); +} + sub LogMsg(@) { my $OldUMask = umask(002); @@ -61,6 +72,7 @@ sub FatalError(@) sub GitPull() { + InfoMsg "Updating the Wine source\n"; system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -105,6 +117,7 @@ sub BuildTestAgentd() # so don't rebuild it. if (! -x "$BinDir/build/testagentd") { + InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -115,6 +128,7 @@ sub BuildTestAgentd() } } + InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -129,6 +143,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { + InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . ") >>$LogDir/Reconfig.log 2>&1"); @@ -146,6 +161,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . @@ -169,6 +185,7 @@ sub BuildCross($) mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding the $Bits-bit test executables\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . -- 2.17.0

June 1, 2018

[PATCH] testbot/build: Tweak the Build.pl information messages for readability.

by Francois Gouget

Add an empty line before the information messages to make the log more readable. Also tweak the native tools build message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 03733cef6..77bc9ca9d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -89,7 +89,7 @@ sub ApplyPatch($) my $Impacts = GetPatchImpact($PatchFile, "nounits"); if ($Impacts->{Makefiles}) { - InfoMsg "Running make_makefiles\n"; + InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . ") >> $LogDir/Build.log 2>&1"); @@ -102,7 +102,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { - InfoMsg "Running autoconf\n"; + InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . ") >>$LogDir/Build.log 2>&1"); @@ -131,6 +131,8 @@ sub CountCPUs() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -157,7 +159,7 @@ sub BuildTestExecutable($$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Building the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); @@ -256,7 +258,6 @@ if (!ApplyPatch($PatchFile)) CountCPUs(); -InfoMsg "Building tools\n"; if (!BuildNative()) { exit(1); -- 2.17.0

June 1, 2018

[PATCH] testbot: Remove a debug function from PatchUtils.pm.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 611d883e4..b05fe0aa4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -109,12 +109,6 @@ sub _AddTest($$$) $Tests->{$Module}->{Files}->{$File} = $Change; } -sub dumpstr($) -{ - my ($Str) = @_; - return defined $Str ? "[$Str]" : "<undef>"; -} - =pod =over 12 -- 2.17.0

June 1, 2018

[PATCH] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 716634 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable pStrokes going out of scope leaks the storage it points to. dlls/gdi32/path.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60515..ceb8d29977 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,8 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } } -- 2.17.0

June 1, 2018

[PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 713109 (#1 of 1): Reliance on integer endianness (INCOMPATIBLE_CAST) incompatible_cast: Pointer &uChar points to an object whose effective type is unsigned int (32 bits, unsigned) but is dereferenced as a narrower unsigned short (16 bits, unsigned). This may lead to unexpected results depending on machine endianness. dlls/gdi32/font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..3347c9208c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2817,6 +2817,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm, DWORD cbBuffer, LPVOID lpBuffer, const MAT2 *lpmat2 ) { + WCHAR wChar; + if (!lpmat2) return GDI_ERROR; if(!(fuFormat & GGO_GLYPH_INDEX)) { @@ -2833,8 +2835,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

June 1, 2018