mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Remove vkd3d_application_info structure 

This thing has no right to exist.

We don't get this information in D3D12 and it's getting in the way of me refactoring config flags.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2021-03-01 18:10:26 +00:00 committed by Hans-Kristian Arntzen
parent 78b5b347b8
commit 64a6bae1a0
3 changed files with 1 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d.h
View File

@ -67,7 +67,6 @@ enum vkd3d_structure_type
/* 1.2 */
VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO,
VKD3D_STRUCTURE_TYPE_APPLICATION_INFO,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE),
};
@ -107,19 +106,6 @@ struct vkd3d_optional_instance_extensions_info
uint32_t extension_count;
};
/* Extends vkd3d_instance_create_info. Available since 1.2. */
struct vkd3d_application_info
{
enum vkd3d_structure_type type;
const void *next;
const char *application_name;
uint32_t application_version;
const char *engine_name; /* "vkd3d" if NULL */
uint32_t engine_version; /* vkd3d version if engine_name is NULL */
};
struct vkd3d_device_create_info
{
enum vkd3d_structure_type type;

13
libs/vkd3d/device.c
View File

@ -485,7 +485,6 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs;
const struct vkd3d_optional_instance_extensions_info *optional_extensions;
const char *debug_layer_name = "VK_LAYER_KHRONOS_validation";
const struct vkd3d_application_info *vkd3d_application_info;
bool *user_extension_supported = NULL;
VkApplicationInfo application_info;
VkInstanceCreateInfo instance_info;
@ -559,17 +558,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
INFO("vkd3d-proton - build: %"PRIx64".\n", vkd3d_build);
if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO)))
{
application_info.pApplicationName = vkd3d_application_info->application_name;
application_info.applicationVersion = vkd3d_application_info->application_version;
if (vkd3d_application_info->engine_name)
{
application_info.pEngineName = vkd3d_application_info->engine_name;
application_info.engineVersion = vkd3d_application_info->engine_version;
}
}
else if (vkd3d_get_program_name(application_name))
if (vkd3d_get_program_name(application_name))
{
application_info.pApplicationName = application_name;
}

44
tests/vkd3d_api.c
View File

@ -1058,49 +1058,6 @@ static void test_formats(void)
}
}
static void test_application_info(void)
{
struct vkd3d_instance_create_info create_info;
struct vkd3d_application_info app_info;
struct vkd3d_instance *instance;
ULONG refcount;
HRESULT hr;
app_info.type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.next = NULL;
app_info.engine_name = NULL;
app_info.engine_version = 0;
app_info.application_name = NULL;
app_info.application_version = 0;
create_info = instance_default_create_info;
create_info.next = &app_info;
hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
refcount = vkd3d_instance_decref(instance);
ok(!refcount, "Instance has %u references left.\n", refcount);
app_info.application_name = "vkd3d_api_tests";
app_info.application_version = 0xdeadbeef;
hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
refcount = vkd3d_instance_decref(instance);
ok(!refcount, "Instance has %u references left.\n", refcount);
app_info.engine_name = "engine_name";
hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
refcount = vkd3d_instance_decref(instance);
ok(!refcount, "Instance has %u references left.\n", refcount);
app_info.engine_name = "engine_name";
app_info.engine_version = 2;
hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
refcount = vkd3d_instance_decref(instance);
ok(!refcount, "Instance has %u references left.\n", refcount);
}
static bool have_d3d12_device(void)
{
ID3D12Device *device;
@ -1132,5 +1089,4 @@ START_TEST(vkd3d_api)
run_test(test_external_resource_map);
run_test(test_external_resource_present_state);
run_test(test_formats);
run_test(test_application_info);
}