AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: move to subclassing instance/physical device.

Browse Source 
This doesn't use any of the features yet, just moves to subclassing.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8676>
This commit is contained in:
Dave Airlie
2021-01-25 08:57:46 +10:00
committed by Marge Bot
parent bcdf481d13
commit fd3c665df0
5 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/lavapipe/lvp_device.c
+34 -19
View File
@@ -44,8 +44,13 @@ lvp_physical_device_init(struct lvp_physical_device *device,
struct pipe_loader_device *pld)
{
VkResult result;
device->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
device->instance = instance;
result = vk_physical_device_init(&device->vk, &instance->vk,
NULL, NULL);
if (result != VK_SUCCESS) {
vk_error(instance, result);
goto fail;
}
device->pld = pld;
device->pscreen = pipe_loader_create_screen(device->pld);
@@ -56,6 +61,7 @@ lvp_physical_device_init(struct lvp_physical_device *device,
lvp_physical_device_get_supported_extensions(device, &device->supported_extensions);
result = lvp_init_wsi(device);
if (result != VK_SUCCESS) {
vk_physical_device_finish(&device->vk);
vk_error(instance, result);
goto fail;
}
@@ -70,6 +76,7 @@ lvp_physical_device_finish(struct lvp_physical_device *device)
{
lvp_finish_wsi(device);
device->pscreen->destroy(device->pscreen);
vk_physical_device_finish(&device->vk);
}
static void *
@@ -105,6 +112,7 @@ VkResult lvp_CreateInstance(
VkInstance* pInstance)
{
struct lvp_instance *instance;
VkResult result;
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO);
@@ -116,17 +124,23 @@ VkResult lvp_CreateInstance(
client_version = VK_API_VERSION_1_0;
}
instance = vk_zalloc2(&default_alloc, pAllocator, sizeof(*instance), 8,
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
if (pAllocator == NULL)
pAllocator = &default_alloc;
instance = vk_zalloc(pAllocator, sizeof(*instance), 8,
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
if (!instance)
return vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY);
vk_object_base_init(NULL, &instance->base, VK_OBJECT_TYPE_INSTANCE);
if (pAllocator)
instance->alloc = *pAllocator;
else
instance->alloc = default_alloc;
result = vk_instance_init(&instance->vk,
NULL, NULL,
pCreateInfo,
pAllocator);
if (result != VK_SUCCESS) {
vk_free(pAllocator, instance);
return vk_error(instance, result);
}
instance->apiVersion = client_version;
instance->physicalDeviceCount = -1;
@@ -214,8 +228,8 @@ void lvp_DestroyInstance(
pipe_loader_release(&instance->devs, instance->num_devices);
vk_object_base_finish(&instance->base);
vk_free(&instance->alloc, instance);
vk_instance_finish(&instance->vk);
vk_free(&instance->vk.alloc, instance);
}
static void lvp_get_image(struct dri_drawable *dri_drawable,
@@ -881,7 +895,7 @@ static int lvp_get_device_extension_index(const char *name)
static void
lvp_device_init_dispatch(struct lvp_device *device)
{
const struct lvp_instance *instance = device->physical_device->instance;
const struct lvp_instance *instance = (struct lvp_instance *)device->physical_device->vk.instance;
const struct lvp_device_dispatch_table *dispatch_table_layer = NULL;
bool unchecked = instance->debug_flags & LVP_DEBUG_ALL_ENTRYPOINTS;
@@ -915,6 +929,7 @@ VkResult lvp_CreateDevice(
LVP_FROM_HANDLE(lvp_physical_device, physical_device, physicalDevice);
struct lvp_device *device;
struct lvp_instance *instance = (struct lvp_instance *)physical_device->vk.instance;
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO);
@@ -927,25 +942,25 @@ VkResult lvp_CreateDevice(
unsigned num_features = sizeof(VkPhysicalDeviceFeatures) / sizeof(VkBool32);
for (uint32_t i = 0; i < num_features; i++) {
if (enabled_feature[i] && !supported_feature[i])
return vk_error(physical_device->instance, VK_ERROR_FEATURE_NOT_PRESENT);
return vk_error(instance, VK_ERROR_FEATURE_NOT_PRESENT);
}
}
device = vk_zalloc2(&physical_device->instance->alloc, pAllocator,
device = vk_zalloc2(&physical_device->vk.instance->alloc, pAllocator,
sizeof(*device), 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!device)
return vk_error(physical_device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
return vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result = vk_device_init(&device->vk, NULL, NULL, pCreateInfo,
&physical_device->instance->alloc,
&physical_device->vk.instance->alloc,
pAllocator);
if (result != VK_SUCCESS) {
vk_free(&device->vk.alloc, device);
return vk_error(physical_device->instance, result);
return vk_error(instance, result);
}
device->instance = physical_device->instance;
device->instance = (struct lvp_instance *)physical_device->vk.instance;
device->physical_device = physical_device;
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
@@ -954,7 +969,7 @@ VkResult lvp_CreateDevice(
if (index < 0 || !physical_device->supported_extensions.extensions[index]) {
vk_device_finish(&device->vk);
vk_free(&device->vk.alloc, device);
return vk_error(physical_device->instance, VK_ERROR_EXTENSION_NOT_PRESENT);
return vk_error(instance, VK_ERROR_EXTENSION_NOT_PRESENT);
}
device->enabled_extensions.extensions[index] = true;
src/gallium/frontends/lavapipe/lvp_private.h
+4 -5
View File
@@ -53,6 +53,8 @@ typedef uint32_t xcb_window_t;
#include "lvp_extensions.h"
#include "lvp_entrypoints.h"
#include "vk_device.h"
#include "vk_instance.h"
#include "vk_physical_device.h"
#include "wsi_common.h"
@@ -202,8 +204,7 @@ mesa_to_vk_shader_stage(gl_shader_stage mesa_stage)
__tmp &= ~(1 << (stage)))
struct lvp_physical_device {
VK_LOADER_DATA _loader_data;
struct lvp_instance * instance;
struct vk_physical_device vk;
struct pipe_loader_device *pld;
struct pipe_screen *pscreen;
@@ -214,9 +215,7 @@ struct lvp_physical_device {
};
struct lvp_instance {
struct vk_object_base base;
VkAllocationCallbacks alloc;
struct vk_instance vk;
uint32_t apiVersion;
int physicalDeviceCount;
src/gallium/frontends/lavapipe/lvp_wsi.c
+3 -3
View File
@@ -35,7 +35,7 @@ lvp_init_wsi(struct lvp_physical_device *physical_device)
return wsi_device_init(&physical_device->wsi_device,
lvp_physical_device_to_handle(physical_device),
lvp_wsi_proc_addr,
&physical_device->instance->alloc,
&physical_device->vk.instance->alloc,
-1, NULL, true);
}
@@ -43,7 +43,7 @@ void
lvp_finish_wsi(struct lvp_physical_device *physical_device)
{
wsi_device_finish(&physical_device->wsi_device,
&physical_device->instance->alloc);
&physical_device->vk.instance->alloc);
}
void lvp_DestroySurfaceKHR(
@@ -54,7 +54,7 @@ void lvp_DestroySurfaceKHR(
LVP_FROM_HANDLE(lvp_instance, instance, _instance);
ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
vk_free2(&instance->alloc, pAllocator, surface);
vk_free2(&instance->vk.alloc, pAllocator, surface);
}
VkResult lvp_GetPhysicalDeviceSurfaceSupportKHR(
src/gallium/frontends/lavapipe/lvp_wsi_wayland.c
+1 -1
View File
@@ -49,7 +49,7 @@ VkResult lvp_CreateWaylandSurfaceKHR(
if (pAllocator)
alloc = pAllocator;
else
alloc = &instance->alloc;
alloc = &instance->vk.alloc;
return wsi_create_wl_surface(alloc, pCreateInfo, pSurface);
}
src/gallium/frontends/lavapipe/lvp_wsi_x11.c
+2 -2
View File
@@ -68,7 +68,7 @@ VkResult lvp_CreateXcbSurfaceKHR(
if (pAllocator)
alloc = pAllocator;
else
alloc = &instance->alloc;
alloc = &instance->vk.alloc;
return wsi_create_xcb_surface(alloc, pCreateInfo, pSurface);
}
@@ -87,7 +87,7 @@ VkResult lvp_CreateXlibSurfaceKHR(
if (pAllocator)
alloc = pAllocator;
else
alloc = &instance->alloc;
alloc = &instance->vk.alloc;
return wsi_create_xlib_surface(alloc, pCreateInfo, pSurface);
}