mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-27 14:31:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan: split physical device from logical device

Browse source
This commit is contained in:
Matthew Waters 2019-09-16 12:59:08 +10:00
parent 863e785770
commit 5f76c84feb
17 changed files with 830 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/vulkan/vkdownload.c
View file

@ -583,7 +583,8 @@ static gboolean
_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
struct choose_data *data)
{
guint flags = device->queue_family_props[queue->family].queueFlags;
guint flags =
device->physical_device->queue_family_props[queue->family].queueFlags;
if ((flags & VK_QUEUE_GRAPHICS_BIT) != 0) {
if (data->queue)

3
ext/vulkan/vkfullscreenrender.c
View file

@ -207,7 +207,8 @@ static gboolean
_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
struct choose_data *data)
{
guint flags = device->queue_family_props[queue->family].queueFlags;
guint flags =
device->physical_device->queue_family_props[queue->family].queueFlags;
GST_ERROR ("flags 0x%x", flags);

3
ext/vulkan/vkupload.c
View file

@ -1295,7 +1295,8 @@ static gboolean
_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
struct choose_data *data)
{
guint flags = device->queue_family_props[queue->family].queueFlags;
guint flags =
device->physical_device->queue_family_props[queue->family].queueFlags;
if ((flags & VK_QUEUE_GRAPHICS_BIT) != 0) {
if (data->queue)

2
gst-libs/gst/vulkan/gstvkdebug.c
View file

@ -111,7 +111,7 @@ FLAGS_TO_STRING(sample_count, VkSampleCountFlags);
/* *INDENT-ON* */
const gchar *
gst_vulkan_device_type_to_string (VkPhysicalDeviceType type)
gst_vulkan_physical_device_type_to_string (VkPhysicalDeviceType type)
{
switch (type) {
case VK_PHYSICAL_DEVICE_TYPE_OTHER:

2
gst-libs/gst/vulkan/gstvkdebug.h
View file

@ -31,7 +31,7 @@ G_BEGIN_DECLS
#define GST_VULKAN_EXTENT3D_ARGS(var) (var).width, (var).height, (var).depth
GST_VULKAN_API
const gchar * gst_vulkan_device_type_to_string (VkPhysicalDeviceType type);
const gchar * gst_vulkan_physical_device_type_to_string (VkPhysicalDeviceType type);
GST_VULKAN_API
gchar * gst_vulkan_memory_property_flags_to_string (VkMemoryPropertyFlags prop_bits);

559
gst-libs/gst/vulkan/gstvkdevice.c
View file

@ -23,8 +23,7 @@
#endif
#include "gstvkdevice.h"
#include "gstvkdebug-private.h"
#include "gstvkdebug.h"
#include <string.h>
@ -32,7 +31,7 @@
* SECTION:vkdevice
* @title: GstVulkanDevice
* @short_description: Vulkan device
* @see_also: #GstVulkanInstance
* @see_also: #GstVulkanInstance, #GstVulkanPhysicalDevice
*
* A #GstVulkanDevice encapsulates a VkDevice
*/
@ -41,10 +40,13 @@
GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
#define GET_PRIV(o) (gst_vulkan_device_get_instance_private (o))
enum
{
PROP_0,
PROP_INSTANCE,
PROP_PHYSICAL_DEVICE,
};
static void gst_vulkan_device_finalize (GObject * object);
@ -52,6 +54,8 @@ static void gst_vulkan_device_finalize (GObject * object);
struct _GstVulkanDevicePrivate
{
gboolean opened;
guint queue_family_id;
guint n_queues;
};
static void
@ -74,25 +78,47 @@ G_DEFINE_TYPE_WITH_CODE (GstVulkanDevice, gst_vulkan_device, GST_TYPE_OBJECT,
/**
* gst_vulkan_device_new:
* @instance: the parent #GstVulkanInstance
* @physical_device: the associated #GstVulkanPhysicalDevice
*
* Returns: (transfer full): a new #GstVulkanDevice
*
* Since: 1.18
*/
GstVulkanDevice *
gst_vulkan_device_new (GstVulkanInstance * instance)
gst_vulkan_device_new (GstVulkanPhysicalDevice * physical_device)
{
GstVulkanDevice *device;
g_return_val_if_fail (GST_IS_VULKAN_PHYSICAL_DEVICE (physical_device), NULL);
device = g_object_new (GST_TYPE_VULKAN_DEVICE, "physical-device",
physical_device, NULL);
gst_object_ref_sink (device);
return device;
}
/**
* gst_vulkan_device_new_with_index:
* @instance: the associated #GstVulkanInstance
* @device_index: the device index to create the new #GstVulkanDevice from
*
* Returns: (transfer full): a new #GstVulkanDevice
*
* Since: 1.18
*/
GstVulkanDevice *
gst_vulkan_device_new_with_index (GstVulkanInstance * instance,
guint device_index)
{
GstVulkanPhysicalDevice *physical;
GstVulkanDevice *device;
g_return_val_if_fail (GST_IS_VULKAN_INSTANCE (instance), NULL);
device = g_object_new (GST_TYPE_VULKAN_DEVICE, "instance", instance, NULL);
gst_object_ref_sink (device);
/* FIXME: select this externally */
device->device_index = 0;
physical = gst_vulkan_physical_device_new (instance, device_index);
device = gst_vulkan_device_new (physical);
gst_object_unref (physical);
return device;
}
@ -103,8 +129,8 @@ gst_vulkan_device_set_property (GObject * object, guint prop_id,
GstVulkanDevice *device = GST_VULKAN_DEVICE (object);
switch (prop_id) {
case PROP_INSTANCE:
device->instance = g_value_dup_object (value);
case PROP_PHYSICAL_DEVICE:
device->physical_device = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -122,6 +148,9 @@ gst_vulkan_device_get_property (GObject * object, guint prop_id,
case PROP_INSTANCE:
g_value_set_object (value, device->instance);
break;
case PROP_PHYSICAL_DEVICE:
g_value_set_object (value, device->physical_device);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -131,7 +160,14 @@ gst_vulkan_device_get_property (GObject * object, guint prop_id,
static void
gst_vulkan_device_init (GstVulkanDevice * device)
{
device->priv = gst_vulkan_device_get_instance_private (device);
}
static void
gst_vulkan_device_constructed (GObject * object)
{
GstVulkanDevice *device = GST_VULKAN_DEVICE (object);
g_object_get (device->physical_device, "instance", &device->instance, NULL);
}
static void
@ -142,11 +178,16 @@ gst_vulkan_device_class_init (GstVulkanDeviceClass * device_class)
gobject_class->set_property = gst_vulkan_device_set_property;
gobject_class->get_property = gst_vulkan_device_get_property;
gobject_class->finalize = gst_vulkan_device_finalize;
gobject_class->constructed = gst_vulkan_device_constructed;
g_object_class_install_property (gobject_class, PROP_INSTANCE,
g_param_spec_object ("instance", "Instance",
"Associated Vulkan Instance",
GST_TYPE_VULKAN_INSTANCE,
GST_TYPE_VULKAN_INSTANCE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PHYSICAL_DEVICE,
g_param_spec_object ("physical-device", "Physical Device",
"Associated Vulkan Physical Device",
GST_TYPE_VULKAN_PHYSICAL_DEVICE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
@ -155,401 +196,18 @@ gst_vulkan_device_finalize (GObject * object)
{
GstVulkanDevice *device = GST_VULKAN_DEVICE (object);
g_free (device->queue_family_props);
device->queue_family_props = NULL;
if (device->device) {
vkDeviceWaitIdle (device->device);
vkDestroyDevice (device->device, NULL);
}
device->device = VK_NULL_HANDLE;
if (device->instance)
gst_object_unref (device->instance);
device->instance = VK_NULL_HANDLE;
gst_clear_object (&device->physical_device);
gst_clear_object (&device->instance);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
#define DEBUG_BOOL(prefix, name, value) \
GST_DEBUG_OBJECT (device, prefix " " G_STRINGIFY(name) ": %s", \
value ? "YES" : "NO")
static gboolean
dump_features (GstVulkanDevice * device, GError ** error)
{
VkPhysicalDeviceFeatures features;
VkPhysicalDevice gpu;
gpu = gst_vulkan_device_get_physical_device (device);
vkGetPhysicalDeviceFeatures (gpu, &features);
#define DEBUG_BOOL_FEATURE(name) DEBUG_BOOL("support for", name, features.name)
DEBUG_BOOL_FEATURE (robustBufferAccess);
DEBUG_BOOL_FEATURE (fullDrawIndexUint32);
DEBUG_BOOL_FEATURE (imageCubeArray);
DEBUG_BOOL_FEATURE (independentBlend);
DEBUG_BOOL_FEATURE (geometryShader);
DEBUG_BOOL_FEATURE (tessellationShader);
DEBUG_BOOL_FEATURE (sampleRateShading);
DEBUG_BOOL_FEATURE (sampleRateShading);
DEBUG_BOOL_FEATURE (dualSrcBlend);
DEBUG_BOOL_FEATURE (logicOp);
DEBUG_BOOL_FEATURE (multiDrawIndirect);
DEBUG_BOOL_FEATURE (drawIndirectFirstInstance);
DEBUG_BOOL_FEATURE (depthClamp);
DEBUG_BOOL_FEATURE (depthBiasClamp);
DEBUG_BOOL_FEATURE (fillModeNonSolid);
DEBUG_BOOL_FEATURE (depthBounds);
DEBUG_BOOL_FEATURE (wideLines);
DEBUG_BOOL_FEATURE (largePoints);
DEBUG_BOOL_FEATURE (alphaToOne);
DEBUG_BOOL_FEATURE (multiViewport);
DEBUG_BOOL_FEATURE (samplerAnisotropy);
DEBUG_BOOL_FEATURE (textureCompressionETC2);
DEBUG_BOOL_FEATURE (textureCompressionASTC_LDR);
DEBUG_BOOL_FEATURE (textureCompressionBC);
DEBUG_BOOL_FEATURE (occlusionQueryPrecise);
DEBUG_BOOL_FEATURE (pipelineStatisticsQuery);
DEBUG_BOOL_FEATURE (vertexPipelineStoresAndAtomics);
DEBUG_BOOL_FEATURE (fragmentStoresAndAtomics);
DEBUG_BOOL_FEATURE (shaderTessellationAndGeometryPointSize);
DEBUG_BOOL_FEATURE (shaderImageGatherExtended);
DEBUG_BOOL_FEATURE (shaderStorageImageExtendedFormats);
DEBUG_BOOL_FEATURE (shaderStorageImageMultisample);
DEBUG_BOOL_FEATURE (shaderStorageImageReadWithoutFormat);
DEBUG_BOOL_FEATURE (shaderStorageImageWriteWithoutFormat);
DEBUG_BOOL_FEATURE (shaderUniformBufferArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderSampledImageArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderStorageBufferArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderStorageImageArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderClipDistance);
DEBUG_BOOL_FEATURE (shaderCullDistance);
DEBUG_BOOL_FEATURE (shaderFloat64);
DEBUG_BOOL_FEATURE (shaderInt64);
DEBUG_BOOL_FEATURE (shaderInt16);
DEBUG_BOOL_FEATURE (shaderResourceResidency);
DEBUG_BOOL_FEATURE (shaderResourceMinLod);
DEBUG_BOOL_FEATURE (sparseBinding);
DEBUG_BOOL_FEATURE (sparseResidencyBuffer);
DEBUG_BOOL_FEATURE (sparseResidencyImage2D);
DEBUG_BOOL_FEATURE (sparseResidencyImage3D);
DEBUG_BOOL_FEATURE (sparseResidency2Samples);
DEBUG_BOOL_FEATURE (sparseResidency4Samples);
DEBUG_BOOL_FEATURE (sparseResidency8Samples);
DEBUG_BOOL_FEATURE (sparseResidency16Samples);
DEBUG_BOOL_FEATURE (sparseResidencyAliased);
DEBUG_BOOL_FEATURE (variableMultisampleRate);
DEBUG_BOOL_FEATURE (inheritedQueries);
#undef DEBUG_BOOL_FEATURE
return TRUE;
}
static gboolean
dump_memory_properties (GstVulkanDevice * device, GError ** error)
{
VkPhysicalDeviceMemoryProperties props;
VkPhysicalDevice gpu;
int i;
gpu = gst_vulkan_device_get_physical_device (device);
vkGetPhysicalDeviceMemoryProperties (gpu, &props);
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " memory heaps",
props.memoryHeapCount);
for (i = 0; i < props.memoryHeapCount; i++) {
gchar *prop_flags_str =
gst_vulkan_memory_heap_flags_to_string (props.memoryHeaps[i].flags);
GST_LOG_OBJECT (device,
"memory heap at index %i has size %" G_GUINT64_FORMAT
" and flags (0x%x) \'%s\'", i, (guint64) props.memoryHeaps[i].size,
props.memoryHeaps[i].flags, prop_flags_str);
g_free (prop_flags_str);
}
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " memory types",
props.memoryTypeCount);
for (i = 0; i < props.memoryTypeCount; i++) {
gchar *prop_flags_str =
gst_vulkan_memory_property_flags_to_string (props.
memoryTypes[i].propertyFlags);
GST_LOG_OBJECT (device,
"memory type at index %i is allocatable from "
"heap %i with flags (0x%x) \'%s\'", i, props.memoryTypes[i].heapIndex,
props.memoryTypes[i].propertyFlags, prop_flags_str);
g_free (prop_flags_str);
}
return TRUE;
}
static gboolean
dump_queue_properties (GstVulkanDevice * device, GError ** error)
{
VkQueueFamilyProperties *props;
guint32 n_props;
VkPhysicalDevice gpu;
int i;
gpu = gst_vulkan_device_get_physical_device (device);
vkGetPhysicalDeviceQueueFamilyProperties (gpu, &n_props, NULL);
props = g_alloca (sizeof (VkQueueFamilyProperties) * n_props);
vkGetPhysicalDeviceQueueFamilyProperties (gpu, &n_props, props);
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " queue families",
n_props);
for (i = 0; i < n_props; i++) {
gchar *queue_flags_str =
gst_vulkan_queue_flags_to_string (props[i].queueFlags);
GST_LOG_OBJECT (device,
"queue family at index %i supports %i queues "
"with flags (0x%x) \'%s\', %" G_GUINT32_FORMAT " timestamp bits and "
"a minimum image transfer granuality of %" GST_VULKAN_EXTENT3D_FORMAT,
i, props[i].queueCount, props[i].queueFlags, queue_flags_str,
props[i].timestampValidBits,
GST_VULKAN_EXTENT3D_ARGS (props[i].minImageTransferGranularity));
g_free (queue_flags_str);
}
return TRUE;
}
static gboolean
dump_limits (GstVulkanDevice * device, GError ** error)
{
VkPhysicalDeviceProperties props;
VkPhysicalDevice gpu;
gpu = gst_vulkan_device_get_physical_device (device);
vkGetPhysicalDeviceProperties (gpu, &props);
#define DEBUG_LIMIT(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) ": %" format, \
(type) props.limits.limit)
#define DEBUG_LIMIT_2(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) \
": %" format ", %" format, \
(type) props.limits.limit[0], \
(type) props.limits.limit[1])
#define DEBUG_LIMIT_3(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) \
": %" format ", %" format ", %" format, \
(type) props.limits.limit[0], \
(type) props.limits.limit[1], \
(type) props.limits.limit[2])
#define DEBUG_BOOL_LIMIT(limit) DEBUG_BOOL("limit", limit, props.limits.limit)
#define DEBUG_UINT32_LIMIT(limit) DEBUG_LIMIT(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_UINT32_2_LIMIT(limit) DEBUG_LIMIT_2(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_UINT32_3_LIMIT(limit) DEBUG_LIMIT_3(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_INT32_LIMIT(limit) DEBUG_LIMIT(limit, G_GINT32_FORMAT, gint32)
#define DEBUG_UINT64_LIMIT(limit) DEBUG_LIMIT(limit, G_GUINT64_FORMAT, guint64)
#define DEBUG_SIZE_LIMIT(limit) DEBUG_LIMIT(limit, G_GSIZE_FORMAT, gsize)
#define DEBUG_FLOAT_LIMIT(limit) DEBUG_LIMIT(limit, "f", float)
#define DEBUG_FLOAT_2_LIMIT(limit) DEBUG_LIMIT_2(limit, "f", float)
#define DEBUG_FLAGS_LIMIT(limit, under_name_type) \
G_STMT_START { \
gchar *str = G_PASTE(G_PASTE(gst_vulkan_,under_name_type),_flags_to_string) (props.limits.limit); \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) ": %s", str); \
g_free (str); \
} G_STMT_END
DEBUG_UINT32_LIMIT (maxImageDimension1D);
DEBUG_UINT32_LIMIT (maxImageDimension2D);
DEBUG_UINT32_LIMIT (maxImageDimension3D);
DEBUG_UINT32_LIMIT (maxImageDimensionCube);
DEBUG_UINT32_LIMIT (maxImageArrayLayers);
DEBUG_UINT32_LIMIT (maxTexelBufferElements);
DEBUG_UINT32_LIMIT (maxUniformBufferRange);
DEBUG_UINT32_LIMIT (maxStorageBufferRange);
DEBUG_UINT32_LIMIT (maxPushConstantsSize);
DEBUG_UINT32_LIMIT (maxMemoryAllocationCount);
DEBUG_UINT32_LIMIT (maxSamplerAllocationCount);
DEBUG_UINT64_LIMIT (bufferImageGranularity);
DEBUG_UINT64_LIMIT (sparseAddressSpaceSize);
DEBUG_UINT32_LIMIT (maxBoundDescriptorSets);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorSamplers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorUniformBuffers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorStorageBuffers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorSampledImages);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorStorageImages);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorInputAttachments);
DEBUG_UINT32_LIMIT (maxPerStageResources);
DEBUG_UINT32_LIMIT (maxDescriptorSetSamplers);
DEBUG_UINT32_LIMIT (maxDescriptorSetUniformBuffers);
DEBUG_UINT32_LIMIT (maxDescriptorSetUniformBuffersDynamic);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageBuffers);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageBuffersDynamic);
DEBUG_UINT32_LIMIT (maxDescriptorSetSampledImages);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageImages);
DEBUG_UINT32_LIMIT (maxDescriptorSetInputAttachments);
DEBUG_UINT32_LIMIT (maxVertexInputAttributes);
DEBUG_UINT32_LIMIT (maxVertexInputBindings);
DEBUG_UINT32_LIMIT (maxVertexInputBindings);
DEBUG_UINT32_LIMIT (maxVertexInputAttributeOffset);
DEBUG_UINT32_LIMIT (maxVertexInputBindingStride);
DEBUG_UINT32_LIMIT (maxVertexOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationGenerationLevel);
DEBUG_UINT32_LIMIT (maxTessellationPatchSize);
DEBUG_UINT32_LIMIT (maxTessellationControlPerVertexInputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlPerVertexOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlPerPatchOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationEvaluationInputComponents);
DEBUG_UINT32_LIMIT (maxTessellationEvaluationOutputComponents);
DEBUG_UINT32_LIMIT (maxGeometryShaderInvocations);
DEBUG_UINT32_LIMIT (maxGeometryInputComponents);
DEBUG_UINT32_LIMIT (maxGeometryOutputComponents);
DEBUG_UINT32_LIMIT (maxGeometryOutputVertices);
DEBUG_UINT32_LIMIT (maxGeometryTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxFragmentInputComponents);
DEBUG_UINT32_LIMIT (maxFragmentOutputAttachments);
DEBUG_UINT32_LIMIT (maxFragmentDualSrcAttachments);
DEBUG_UINT32_LIMIT (maxFragmentCombinedOutputResources);
DEBUG_UINT32_LIMIT (maxComputeSharedMemorySize);
DEBUG_UINT32_3_LIMIT (maxComputeWorkGroupCount);
DEBUG_UINT32_LIMIT (maxComputeWorkGroupInvocations);
DEBUG_UINT32_3_LIMIT (maxComputeWorkGroupSize);
DEBUG_UINT32_LIMIT (subPixelPrecisionBits);
DEBUG_UINT32_LIMIT (subTexelPrecisionBits);
DEBUG_UINT32_LIMIT (mipmapPrecisionBits);
DEBUG_UINT32_LIMIT (maxDrawIndexedIndexValue);
DEBUG_UINT32_LIMIT (maxDrawIndirectCount);
DEBUG_FLOAT_LIMIT (maxSamplerLodBias);
DEBUG_FLOAT_LIMIT (maxSamplerAnisotropy);
DEBUG_UINT32_LIMIT (maxViewports);
DEBUG_UINT32_2_LIMIT (maxViewportDimensions);
DEBUG_FLOAT_2_LIMIT (viewportBoundsRange);
DEBUG_UINT32_LIMIT (viewportSubPixelBits);
DEBUG_SIZE_LIMIT (minMemoryMapAlignment);
DEBUG_UINT64_LIMIT (minTexelBufferOffsetAlignment);
DEBUG_UINT64_LIMIT (minUniformBufferOffsetAlignment);
DEBUG_UINT64_LIMIT (minStorageBufferOffsetAlignment);
DEBUG_INT32_LIMIT (minTexelOffset);
DEBUG_UINT32_LIMIT (maxTexelOffset);
DEBUG_INT32_LIMIT (minTexelGatherOffset);
DEBUG_UINT32_LIMIT (maxTexelGatherOffset);
DEBUG_FLOAT_LIMIT (minInterpolationOffset);
DEBUG_FLOAT_LIMIT (maxInterpolationOffset);
DEBUG_UINT32_LIMIT (subPixelInterpolationOffsetBits);
DEBUG_UINT32_LIMIT (maxFramebufferWidth);
DEBUG_UINT32_LIMIT (maxFramebufferHeight);
DEBUG_UINT32_LIMIT (maxFramebufferLayers);
DEBUG_FLAGS_LIMIT (framebufferColorSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferDepthSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferStencilSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferNoAttachmentsSampleCounts, sample_count);
DEBUG_UINT32_LIMIT (maxColorAttachments);
DEBUG_FLAGS_LIMIT (sampledImageColorSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageIntegerSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageDepthSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageStencilSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (storageImageSampleCounts, sample_count);
DEBUG_BOOL_LIMIT (timestampComputeAndGraphics);
DEBUG_FLOAT_LIMIT (timestampPeriod);
DEBUG_UINT32_LIMIT (maxClipDistances);
DEBUG_UINT32_LIMIT (maxCullDistances);
DEBUG_UINT32_LIMIT (maxCombinedClipAndCullDistances);
DEBUG_UINT32_LIMIT (discreteQueuePriorities);
DEBUG_FLOAT_2_LIMIT (pointSizeRange);
DEBUG_FLOAT_2_LIMIT (lineWidthRange);
DEBUG_FLOAT_LIMIT (pointSizeGranularity);
DEBUG_FLOAT_LIMIT (lineWidthGranularity);
DEBUG_BOOL_LIMIT (strictLines);
DEBUG_BOOL_LIMIT (standardSampleLocations);
DEBUG_UINT64_LIMIT (optimalBufferCopyOffsetAlignment);
DEBUG_UINT64_LIMIT (optimalBufferCopyRowPitchAlignment);
DEBUG_UINT64_LIMIT (nonCoherentAtomSize);
#undef DEBUG_LIMIT
#undef DEBUG_LIMIT_2
#undef DEBUG_LIMIT_3
#undef DEBUG_BOOL_LIMIT
#undef DEBUG_UINT32_LIMIT
#undef DEBUG_UINT32_2_LIMIT
#undef DEBUG_UINT32_3_LIMIT
#undef DEBUG_INT32_LIMIT
#undef DEBUG_UINT64_LIMIT
#undef DEBUG_SIZE_LIMIT
#undef DEBUG_FLOAT_LIMIT
#undef DEBUG_FLOAT_2_LIMIT
#undef DEBUG_FLAGS_LIMIT
return TRUE;
}
static gboolean
dump_sparse_properties (GstVulkanDevice * device, GError ** error)
{
VkPhysicalDeviceProperties props;
VkPhysicalDevice gpu;
gpu = gst_vulkan_device_get_physical_device (device);
vkGetPhysicalDeviceProperties (gpu, &props);
#define DEBUG_BOOL_SPARSE_PROPERTY(name) DEBUG_BOOL("sparse property", name, props.sparseProperties.name)
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard2DBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard2DMultisampleBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard3DBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyAlignedMipSize);
DEBUG_BOOL_SPARSE_PROPERTY (residencyNonResidentStrict);
#undef DEBUG_BOOL_SPARSE_PROPERTY
return TRUE;
}
static gboolean
_physical_device_info (GstVulkanDevice * device, GError ** error)
{
VkPhysicalDeviceProperties props;
VkPhysicalDevice gpu;
gpu = gst_vulkan_device_get_physical_device (device);
if (!gpu) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"Failed to retrieve physical device");
return FALSE;
}
vkGetPhysicalDeviceProperties (gpu, &props);
GST_INFO_OBJECT (device, "pyhsical device %i name \'%s\' type \'%s\' "
"api version %u.%u.%u, driver version %u.%u.%u vendor ID 0x%x, "
"device ID 0x%x", device->device_index, props.deviceName,
gst_vulkan_device_type_to_string (props.deviceType),
VK_VERSION_MAJOR (props.apiVersion), VK_VERSION_MINOR (props.apiVersion),
VK_VERSION_PATCH (props.apiVersion),
VK_VERSION_MAJOR (props.driverVersion),
VK_VERSION_MINOR (props.driverVersion),
VK_VERSION_PATCH (props.driverVersion), props.vendorID, props.deviceID);
if (!dump_queue_properties (device, error))
return FALSE;
if (!dump_memory_properties (device, error))
return FALSE;
if (!dump_features (device, error))
return FALSE;
if (!dump_limits (device, error))
return FALSE;
if (!dump_sparse_properties (device, error))
return FALSE;
return TRUE;
}
/**
* gst_vulkan_device_open:
* @device: a #GstVulkanDevice
@ -564,12 +222,9 @@ _physical_device_info (GstVulkanDevice * device, GError ** error)
gboolean
gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
{
GstVulkanDevicePrivate *priv = GET_PRIV (device);
const char *extension_names[64];
uint32_t enabled_extension_count = 0;
uint32_t device_extension_count = 0;
VkExtensionProperties *device_extensions = NULL;
uint32_t device_layer_count = 0;
VkLayerProperties *device_layers;
gboolean have_swapchain_ext;
VkPhysicalDevice gpu;
VkResult err;
@ -579,61 +234,22 @@ gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
GST_OBJECT_LOCK (device);
if (device->priv->opened) {
if (priv->opened) {
GST_OBJECT_UNLOCK (device);
return TRUE;
}
if (!_physical_device_info (device, error))
goto error;
gpu = gst_vulkan_device_get_physical_device (device);
/* Look for validation layers */
err = vkEnumerateDeviceLayerProperties (gpu, &device_layer_count, NULL);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceLayerProperties") < 0)
goto error;
device_layers = g_new0 (VkLayerProperties, device_layer_count);
err =
vkEnumerateDeviceLayerProperties (gpu, &device_layer_count,
device_layers);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceLayerProperties") < 0) {
g_free (device_layers);
goto error;
}
g_free (device_layers);
device_layers = NULL;
err =
vkEnumerateDeviceExtensionProperties (gpu, NULL,
&device_extension_count, NULL);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceExtensionProperties") < 0) {
goto error;
}
GST_DEBUG_OBJECT (device, "Found %u extensions", device_extension_count);
have_swapchain_ext = 0;
enabled_extension_count = 0;
memset (extension_names, 0, sizeof (extension_names));
device_extensions = g_new0 (VkExtensionProperties, device_extension_count);
err = vkEnumerateDeviceExtensionProperties (gpu, NULL,
&device_extension_count, device_extensions);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceExtensionProperties") < 0) {
g_free (device_extensions);
goto error;
}
for (i = 0; i < device_extension_count; i++) {
for (i = 0; i < device->physical_device->n_device_extensions; i++) {
GST_TRACE_OBJECT (device, "checking device extension %s",
device_extensions[i].extensionName);
device->physical_device->device_extensions[i].extensionName);
if (!strcmp (VK_KHR_SWAPCHAIN_EXTENSION_NAME,
device_extensions[i].extensionName)) {
device->physical_device->device_extensions[i].extensionName)) {
have_swapchain_ext = TRUE;
extension_names[enabled_extension_count++] =
(gchar *) VK_KHR_SWAPCHAIN_EXTENSION_NAME;
@ -647,33 +263,20 @@ gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
"\"");
goto error;
}
g_free (device_extensions);
vkGetPhysicalDeviceProperties (gpu, &device->gpu_props);
vkGetPhysicalDeviceMemoryProperties (gpu, &device->memory_properties);
vkGetPhysicalDeviceFeatures (gpu, &device->gpu_features);
vkGetPhysicalDeviceQueueFamilyProperties (gpu, &device->n_queue_families,
NULL);
g_assert (device->n_queue_families >= 1);
device->queue_family_props =
g_new0 (VkQueueFamilyProperties, device->n_queue_families);
vkGetPhysicalDeviceQueueFamilyProperties (gpu, &device->n_queue_families,
device->queue_family_props);
/* FIXME: allow overriding/selecting */
for (i = 0; i < device->n_queue_families; i++) {
if (device->queue_family_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)
for (i = 0; i < device->physical_device->n_queue_families; i++) {
if (device->physical_device->
queue_family_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)
break;
}
if (i >= device->n_queue_families) {
if (i >= device->physical_device->n_queue_families) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"Failed to find a compatible queue family");
goto error;
}
device->queue_family_id = i;
device->n_queues = 1;
priv->queue_family_id = i;
priv->n_queues = 1;
{
VkDeviceQueueCreateInfo queue_info = { 0, };
@ -682,8 +285,8 @@ gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_info.pNext = NULL;
queue_info.queueFamilyIndex = device->queue_family_id;
queue_info.queueCount = device->n_queues;
queue_info.queueFamilyIndex = priv->queue_family_id;
queue_info.queueCount = priv->n_queues;
queue_info.pQueuePriorities = &queue_priority;
device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
@ -702,6 +305,7 @@ gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
}
}
priv->opened = TRUE;
GST_OBJECT_UNLOCK (device);
return TRUE;
@ -726,13 +330,16 @@ GstVulkanQueue *
gst_vulkan_device_get_queue (GstVulkanDevice * device, guint32 queue_family,
guint32 queue_i)
{
GstVulkanDevicePrivate *priv = GET_PRIV (device);
GstVulkanQueue *ret;
g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), NULL);
g_return_val_if_fail (device->device != NULL, NULL);
g_return_val_if_fail (queue_family < device->n_queues, NULL);
g_return_val_if_fail (priv->opened, NULL);
g_return_val_if_fail (queue_family < priv->n_queues, NULL);
g_return_val_if_fail (queue_i <
device->queue_family_props[queue_family].queueCount, NULL);
device->physical_device->queue_family_props[queue_family].queueCount,
NULL);
ret = g_object_new (GST_TYPE_VULKAN_QUEUE, NULL);
gst_object_ref_sink (ret);
@ -759,12 +366,13 @@ void
gst_vulkan_device_foreach_queue (GstVulkanDevice * device,
GstVulkanDeviceForEachQueueFunc func, gpointer user_data)
{
GstVulkanDevicePrivate *priv = GET_PRIV (device);
gboolean done = FALSE;
guint i;
for (i = 0; i < device->n_queues; i++) {
for (i = 0; i < priv->n_queues; i++) {
GstVulkanQueue *queue =
gst_vulkan_device_get_queue (device, device->queue_family_id, i);
gst_vulkan_device_get_queue (device, priv->queue_family_id, i);
if (!func (device, queue, user_data))
done = TRUE;
@ -829,12 +437,7 @@ gst_vulkan_device_get_physical_device (GstVulkanDevice * device)
{
g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), NULL);
if (device->instance->physical_devices == NULL)
return NULL;
if (device->device_index >= device->instance->n_physical_devices)
return NULL;
return device->instance->physical_devices[device->device_index];
return gst_vulkan_physical_device_get_handle (device->physical_device);
}
/**

22
gst-libs/gst/vulkan/gstvkdevice.h
View file

@ -21,7 +21,7 @@
#ifndef __GST_VULKAN_DEVICE_H__
#define __GST_VULKAN_DEVICE_H__
#include <gst/vulkan/gstvkinstance.h>
#include <gst/vulkan/gstvkphysicaldevice.h>
#include <gst/vulkan/gstvkqueue.h>
G_BEGIN_DECLS
@ -44,20 +44,8 @@ struct _GstVulkanDevice
GstObject parent;
GstVulkanInstance *instance;
guint device_index;
GstVulkanPhysicalDevice *physical_device;
VkDevice device; /* hides a pointer */
VkPhysicalDeviceProperties gpu_props;
VkPhysicalDeviceFeatures gpu_features;
VkPhysicalDeviceMemoryProperties memory_properties;
VkQueueFamilyProperties *queue_family_props;
guint32 n_queue_families;
guint32 queue_family_id;
guint32 n_queues;
GstVulkanDevicePrivate *priv;
};
struct _GstVulkanDeviceClass
@ -66,9 +54,11 @@ struct _GstVulkanDeviceClass
};
GST_VULKAN_API
GstVulkanDevice * gst_vulkan_device_new (GstVulkanInstance * instance);
GstVulkanDevice * gst_vulkan_device_new (GstVulkanPhysicalDevice * physical_device);
GST_VULKAN_API
GstVulkanInstance * gst_vulkan_device_get_instance (GstVulkanDevice * device);
GstVulkanDevice * gst_vulkan_device_new_with_index (GstVulkanInstance * instance, guint device_index);
GST_VULKAN_API
GstVulkanInstance * gst_vulkan_device_get_instance (GstVulkanDevice * device);
GST_VULKAN_API
gboolean gst_vulkan_device_open (GstVulkanDevice * device,
GError ** error);

5
gst-libs/gst/vulkan/gstvkinstance.c
View file

@ -454,8 +454,9 @@ gst_vulkan_instance_create_device (GstVulkanInstance * instance,
g_signal_emit (instance, gst_vulkan_instance_signals[SIGNAL_CREATE_DEVICE], 0,
&device);
if (!device)
device = gst_vulkan_device_new (instance);
if (!device) {
device = gst_vulkan_device_new_with_index (instance, 0);
}
if (!gst_vulkan_device_open (device, error)) {
gst_object_unref (device);

2
gst-libs/gst/vulkan/gstvkmemory.c
View file

@ -236,7 +236,7 @@ gst_vulkan_memory_find_memory_type_index_with_type_properties (GstVulkanDevice *
for (i = 0; i < 32; i++) {
if ((type_bits & 1) == 1) {
/* Type is available, does it match user properties? */
if ((device->memory_properties.memoryTypes[i].
if ((device->physical_device->memory_properties.memoryTypes[i].
propertyFlags & properties) == properties) {
*type_index = i;
return TRUE;

638
gst-libs/gst/vulkan/gstvkphysicaldevice.c Normal file
View file

@ -0,0 +1,638 @@
/*
* GStreamer
* Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstvkphysicaldevice.h"
#include "gstvkdebug.h"
#include <string.h>
/**
* SECTION:vkphysicaldevice
* @title: GstVulkanPhysicalDevice
* @short_description: Vulkan physical device
* @see_also: #GstVulkanInstance, #GstVulkanDevice
*
* A #GstVulkanPhysicalDevice encapsulates a VkPhysicalDevice
*/
#define GST_CAT_DEFAULT gst_vulkan_physical_device_debug
GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
enum
{
PROP_0,
PROP_INSTANCE,
PROP_DEVICE_ID,
PROP_NAME,
};
static void gst_vulkan_physical_device_finalize (GObject * object);
struct _GstVulkanPhysicalDevicePrivate
{
guint dummy;
};
static void
_init_debug (void)
{
static volatile gsize init;
if (g_once_init_enter (&init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkandevice", 0,
"Vulkan Device");
g_once_init_leave (&init, 1);
}
}
#define gst_vulkan_physical_device_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstVulkanPhysicalDevice, gst_vulkan_physical_device,
GST_TYPE_OBJECT, G_ADD_PRIVATE (GstVulkanPhysicalDevice);
_init_debug ());
static gboolean gst_vulkan_physical_device_fill_info (GstVulkanPhysicalDevice *
device, GError ** error);
/**
* gst_vulkan_physical_device_new:
* @instance: the parent #GstVulkanInstance
*
* Returns: (transfer full): a new #GstVulkanPhysicalDevice
*
* Since: 1.18
*/
GstVulkanPhysicalDevice *
gst_vulkan_physical_device_new (GstVulkanInstance * instance,
guint device_index)
{
GstVulkanPhysicalDevice *device;
g_return_val_if_fail (GST_IS_VULKAN_INSTANCE (instance), NULL);
device = g_object_new (GST_TYPE_VULKAN_PHYSICAL_DEVICE, "instance", instance,
"device-index", device_index, NULL);
gst_object_ref_sink (device);
return device;
}
static void
gst_vulkan_physical_device_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstVulkanPhysicalDevice *device = GST_VULKAN_PHYSICAL_DEVICE (object);
switch (prop_id) {
case PROP_INSTANCE:
device->instance = g_value_dup_object (value);
break;
case PROP_DEVICE_ID:{
guint device_id = g_value_get_uint (value);
if (device_id >= device->instance->n_physical_devices) {
g_critical ("%s: Cannot set device-index larger than the "
"number of physical devices", GST_OBJECT_NAME (device));
} else {
device->device_index = device_id;
}
break;
}
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_vulkan_physical_device_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstVulkanPhysicalDevice *device = GST_VULKAN_PHYSICAL_DEVICE (object);
switch (prop_id) {
case PROP_INSTANCE:
g_value_set_object (value, device->instance);
break;
case PROP_DEVICE_ID:
g_value_set_uint (value, device->device_index);
break;
case PROP_NAME:
g_value_set_string (value, device->properties.deviceName);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_vulkan_physical_device_init (GstVulkanPhysicalDevice * device)
{
}
static void
gst_vulkan_physical_device_constructed (GObject * object)
{
GstVulkanPhysicalDevice *device = GST_VULKAN_PHYSICAL_DEVICE (object);
GError *error = NULL;
device->device = device->instance->physical_devices[device->device_index];
if (!gst_vulkan_physical_device_fill_info (device, &error)) {
GST_ERROR_OBJECT (object, "%s", error->message);
g_clear_error (&error);
}
}
static void
gst_vulkan_physical_device_class_init (GstVulkanPhysicalDeviceClass *
device_class)
{
GObjectClass *gobject_class = (GObjectClass *) device_class;
gobject_class->set_property = gst_vulkan_physical_device_set_property;
gobject_class->get_property = gst_vulkan_physical_device_get_property;
gobject_class->finalize = gst_vulkan_physical_device_finalize;
gobject_class->constructed = gst_vulkan_physical_device_constructed;
g_object_class_install_property (gobject_class, PROP_INSTANCE,
g_param_spec_object ("instance", "Instance",
"Associated Vulkan Instance",
GST_TYPE_VULKAN_INSTANCE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DEVICE_ID,
g_param_spec_uint ("device-index", "Device Index", "Device Index", 0,
G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_NAME,
g_param_spec_string ("name", "Name", "Device Name", NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
static void
gst_vulkan_physical_device_finalize (GObject * object)
{
GstVulkanPhysicalDevice *device = GST_VULKAN_PHYSICAL_DEVICE (object);
g_free (device->device_layers);
device->device_layers = NULL;
g_free (device->device_extensions);
device->device_extensions = NULL;
g_free (device->queue_family_props);
device->queue_family_props = NULL;
if (device->instance)
gst_object_unref (device->instance);
device->instance = VK_NULL_HANDLE;
G_OBJECT_CLASS (parent_class)->finalize (object);
}
#define DEBUG_BOOL(prefix, name, value) \
GST_DEBUG_OBJECT (device, prefix " " G_STRINGIFY(name) ": %s", \
value ? "YES" : "NO")
static gboolean
dump_features (GstVulkanPhysicalDevice * device, GError ** error)
{
#define DEBUG_BOOL_FEATURE(name) DEBUG_BOOL("support for", name, device->features.name)
DEBUG_BOOL_FEATURE (robustBufferAccess);
DEBUG_BOOL_FEATURE (fullDrawIndexUint32);
DEBUG_BOOL_FEATURE (imageCubeArray);
DEBUG_BOOL_FEATURE (independentBlend);
DEBUG_BOOL_FEATURE (geometryShader);
DEBUG_BOOL_FEATURE (tessellationShader);
DEBUG_BOOL_FEATURE (sampleRateShading);
DEBUG_BOOL_FEATURE (sampleRateShading);
DEBUG_BOOL_FEATURE (dualSrcBlend);
DEBUG_BOOL_FEATURE (logicOp);
DEBUG_BOOL_FEATURE (multiDrawIndirect);
DEBUG_BOOL_FEATURE (drawIndirectFirstInstance);
DEBUG_BOOL_FEATURE (depthClamp);
DEBUG_BOOL_FEATURE (depthBiasClamp);
DEBUG_BOOL_FEATURE (fillModeNonSolid);
DEBUG_BOOL_FEATURE (depthBounds);
DEBUG_BOOL_FEATURE (wideLines);
DEBUG_BOOL_FEATURE (largePoints);
DEBUG_BOOL_FEATURE (alphaToOne);
DEBUG_BOOL_FEATURE (multiViewport);
DEBUG_BOOL_FEATURE (samplerAnisotropy);
DEBUG_BOOL_FEATURE (textureCompressionETC2);
DEBUG_BOOL_FEATURE (textureCompressionASTC_LDR);
DEBUG_BOOL_FEATURE (textureCompressionBC);
DEBUG_BOOL_FEATURE (occlusionQueryPrecise);
DEBUG_BOOL_FEATURE (pipelineStatisticsQuery);
DEBUG_BOOL_FEATURE (vertexPipelineStoresAndAtomics);
DEBUG_BOOL_FEATURE (fragmentStoresAndAtomics);
DEBUG_BOOL_FEATURE (shaderTessellationAndGeometryPointSize);
DEBUG_BOOL_FEATURE (shaderImageGatherExtended);
DEBUG_BOOL_FEATURE (shaderStorageImageExtendedFormats);
DEBUG_BOOL_FEATURE (shaderStorageImageMultisample);
DEBUG_BOOL_FEATURE (shaderStorageImageReadWithoutFormat);
DEBUG_BOOL_FEATURE (shaderStorageImageWriteWithoutFormat);
DEBUG_BOOL_FEATURE (shaderUniformBufferArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderSampledImageArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderStorageBufferArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderStorageImageArrayDynamicIndexing);
DEBUG_BOOL_FEATURE (shaderClipDistance);
DEBUG_BOOL_FEATURE (shaderCullDistance);
DEBUG_BOOL_FEATURE (shaderFloat64);
DEBUG_BOOL_FEATURE (shaderInt64);
DEBUG_BOOL_FEATURE (shaderInt16);
DEBUG_BOOL_FEATURE (shaderResourceResidency);
DEBUG_BOOL_FEATURE (shaderResourceMinLod);
DEBUG_BOOL_FEATURE (sparseBinding);
DEBUG_BOOL_FEATURE (sparseResidencyBuffer);
DEBUG_BOOL_FEATURE (sparseResidencyImage2D);
DEBUG_BOOL_FEATURE (sparseResidencyImage3D);
DEBUG_BOOL_FEATURE (sparseResidency2Samples);
DEBUG_BOOL_FEATURE (sparseResidency4Samples);
DEBUG_BOOL_FEATURE (sparseResidency8Samples);
DEBUG_BOOL_FEATURE (sparseResidency16Samples);
DEBUG_BOOL_FEATURE (sparseResidencyAliased);
DEBUG_BOOL_FEATURE (variableMultisampleRate);
DEBUG_BOOL_FEATURE (inheritedQueries);
#undef DEBUG_BOOL_FEATURE
return TRUE;
}
static gboolean
dump_memory_properties (GstVulkanPhysicalDevice * device, GError ** error)
{
int i;
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " memory heaps",
device->memory_properties.memoryHeapCount);
for (i = 0; i < device->memory_properties.memoryHeapCount; i++) {
gchar *prop_flags_str =
gst_vulkan_memory_heap_flags_to_string (device->
memory_properties.memoryHeaps[i].flags);
GST_LOG_OBJECT (device,
"memory heap at index %i has size %" G_GUINT64_FORMAT
" and flags (0x%x) \'%s\'", i,
(guint64) device->memory_properties.memoryHeaps[i].size,
device->memory_properties.memoryHeaps[i].flags, prop_flags_str);
g_free (prop_flags_str);
}
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " memory types",
device->memory_properties.memoryTypeCount);
for (i = 0; i < device->memory_properties.memoryTypeCount; i++) {
gchar *prop_flags_str =
gst_vulkan_memory_property_flags_to_string (device->memory_properties.
memoryTypes[i].propertyFlags);
GST_LOG_OBJECT (device,
"memory type at index %i is allocatable from "
"heap %i with flags (0x%x) \'%s\'", i,
device->memory_properties.memoryTypes[i].heapIndex,
device->memory_properties.memoryTypes[i].propertyFlags, prop_flags_str);
g_free (prop_flags_str);
}
return TRUE;
}
static gboolean
dump_queue_properties (GstVulkanPhysicalDevice * device, GError ** error)
{
int i;
GST_DEBUG_OBJECT (device, "found %" G_GUINT32_FORMAT " queue families",
device->n_queue_families);
for (i = 0; i < device->n_queue_families; i++) {
gchar *queue_flags_str =
gst_vulkan_queue_flags_to_string (device->
queue_family_props[i].queueFlags);
GST_LOG_OBJECT (device,
"queue family at index %i supports %i queues "
"with flags (0x%x) \'%s\', %" G_GUINT32_FORMAT " timestamp bits and "
"a minimum image transfer granuality of %" GST_VULKAN_EXTENT3D_FORMAT,
i, device->queue_family_props[i].queueCount,
device->queue_family_props[i].queueFlags, queue_flags_str,
device->queue_family_props[i].timestampValidBits,
GST_VULKAN_EXTENT3D_ARGS (device->
queue_family_props[i].minImageTransferGranularity));
g_free (queue_flags_str);
}
return TRUE;
}
static gboolean
dump_limits (GstVulkanPhysicalDevice * device, GError ** error)
{
#define DEBUG_LIMIT(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) ": %" format, \
(type) device->properties.limits.limit)
#define DEBUG_LIMIT_2(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) \
": %" format ", %" format, \
(type) device->properties.limits.limit[0], \
(type) device->properties.limits.limit[1])
#define DEBUG_LIMIT_3(limit, format, type) \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) \
": %" format ", %" format ", %" format, \
(type) device->properties.limits.limit[0], \
(type) device->properties.limits.limit[1], \
(type) device->properties.limits.limit[2])
#define DEBUG_BOOL_LIMIT(limit) DEBUG_BOOL("limit", limit, device->properties.limits.limit)
#define DEBUG_UINT32_LIMIT(limit) DEBUG_LIMIT(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_UINT32_2_LIMIT(limit) DEBUG_LIMIT_2(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_UINT32_3_LIMIT(limit) DEBUG_LIMIT_3(limit, G_GUINT32_FORMAT, guint32)
#define DEBUG_INT32_LIMIT(limit) DEBUG_LIMIT(limit, G_GINT32_FORMAT, gint32)
#define DEBUG_UINT64_LIMIT(limit) DEBUG_LIMIT(limit, G_GUINT64_FORMAT, guint64)
#define DEBUG_SIZE_LIMIT(limit) DEBUG_LIMIT(limit, G_GSIZE_FORMAT, gsize)
#define DEBUG_FLOAT_LIMIT(limit) DEBUG_LIMIT(limit, "f", float)
#define DEBUG_FLOAT_2_LIMIT(limit) DEBUG_LIMIT_2(limit, "f", float)
#define DEBUG_FLAGS_LIMIT(limit, under_name_type) \
G_STMT_START { \
gchar *str = G_PASTE(G_PASTE(gst_vulkan_,under_name_type),_flags_to_string) (device->properties.limits.limit); \
GST_DEBUG_OBJECT (device, "limit " G_STRINGIFY(limit) ": (0x%x) %s", \
device->properties.limits.limit, str); \
g_free (str); \
} G_STMT_END
DEBUG_UINT32_LIMIT (maxImageDimension1D);
DEBUG_UINT32_LIMIT (maxImageDimension2D);
DEBUG_UINT32_LIMIT (maxImageDimension3D);
DEBUG_UINT32_LIMIT (maxImageDimensionCube);
DEBUG_UINT32_LIMIT (maxImageArrayLayers);
DEBUG_UINT32_LIMIT (maxTexelBufferElements);
DEBUG_UINT32_LIMIT (maxUniformBufferRange);
DEBUG_UINT32_LIMIT (maxStorageBufferRange);
DEBUG_UINT32_LIMIT (maxPushConstantsSize);
DEBUG_UINT32_LIMIT (maxMemoryAllocationCount);
DEBUG_UINT32_LIMIT (maxSamplerAllocationCount);
DEBUG_UINT64_LIMIT (bufferImageGranularity);
DEBUG_UINT64_LIMIT (sparseAddressSpaceSize);
DEBUG_UINT32_LIMIT (maxBoundDescriptorSets);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorSamplers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorUniformBuffers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorStorageBuffers);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorSampledImages);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorStorageImages);
DEBUG_UINT32_LIMIT (maxPerStageDescriptorInputAttachments);
DEBUG_UINT32_LIMIT (maxPerStageResources);
DEBUG_UINT32_LIMIT (maxDescriptorSetSamplers);
DEBUG_UINT32_LIMIT (maxDescriptorSetUniformBuffers);
DEBUG_UINT32_LIMIT (maxDescriptorSetUniformBuffersDynamic);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageBuffers);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageBuffersDynamic);
DEBUG_UINT32_LIMIT (maxDescriptorSetSampledImages);
DEBUG_UINT32_LIMIT (maxDescriptorSetStorageImages);
DEBUG_UINT32_LIMIT (maxDescriptorSetInputAttachments);
DEBUG_UINT32_LIMIT (maxVertexInputAttributes);
DEBUG_UINT32_LIMIT (maxVertexInputBindings);
DEBUG_UINT32_LIMIT (maxVertexInputBindings);
DEBUG_UINT32_LIMIT (maxVertexInputAttributeOffset);
DEBUG_UINT32_LIMIT (maxVertexInputBindingStride);
DEBUG_UINT32_LIMIT (maxVertexOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationGenerationLevel);
DEBUG_UINT32_LIMIT (maxTessellationPatchSize);
DEBUG_UINT32_LIMIT (maxTessellationControlPerVertexInputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlPerVertexOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlPerPatchOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationControlTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxTessellationEvaluationInputComponents);
DEBUG_UINT32_LIMIT (maxTessellationEvaluationOutputComponents);
DEBUG_UINT32_LIMIT (maxGeometryShaderInvocations);
DEBUG_UINT32_LIMIT (maxGeometryInputComponents);
DEBUG_UINT32_LIMIT (maxGeometryOutputComponents);
DEBUG_UINT32_LIMIT (maxGeometryOutputVertices);
DEBUG_UINT32_LIMIT (maxGeometryTotalOutputComponents);
DEBUG_UINT32_LIMIT (maxFragmentInputComponents);
DEBUG_UINT32_LIMIT (maxFragmentOutputAttachments);
DEBUG_UINT32_LIMIT (maxFragmentDualSrcAttachments);
DEBUG_UINT32_LIMIT (maxFragmentCombinedOutputResources);
DEBUG_UINT32_LIMIT (maxComputeSharedMemorySize);
DEBUG_UINT32_3_LIMIT (maxComputeWorkGroupCount);
DEBUG_UINT32_LIMIT (maxComputeWorkGroupInvocations);
DEBUG_UINT32_3_LIMIT (maxComputeWorkGroupSize);
DEBUG_UINT32_LIMIT (subPixelPrecisionBits);
DEBUG_UINT32_LIMIT (subTexelPrecisionBits);
DEBUG_UINT32_LIMIT (mipmapPrecisionBits);
DEBUG_UINT32_LIMIT (maxDrawIndexedIndexValue);
DEBUG_UINT32_LIMIT (maxDrawIndirectCount);
DEBUG_FLOAT_LIMIT (maxSamplerLodBias);
DEBUG_FLOAT_LIMIT (maxSamplerAnisotropy);
DEBUG_UINT32_LIMIT (maxViewports);
DEBUG_UINT32_2_LIMIT (maxViewportDimensions);
DEBUG_FLOAT_2_LIMIT (viewportBoundsRange);
DEBUG_UINT32_LIMIT (viewportSubPixelBits);
DEBUG_SIZE_LIMIT (minMemoryMapAlignment);
DEBUG_UINT64_LIMIT (minTexelBufferOffsetAlignment);
DEBUG_UINT64_LIMIT (minUniformBufferOffsetAlignment);
DEBUG_UINT64_LIMIT (minStorageBufferOffsetAlignment);
DEBUG_INT32_LIMIT (minTexelOffset);
DEBUG_UINT32_LIMIT (maxTexelOffset);
DEBUG_INT32_LIMIT (minTexelGatherOffset);
DEBUG_UINT32_LIMIT (maxTexelGatherOffset);
DEBUG_FLOAT_LIMIT (minInterpolationOffset);
DEBUG_FLOAT_LIMIT (maxInterpolationOffset);
DEBUG_UINT32_LIMIT (subPixelInterpolationOffsetBits);
DEBUG_UINT32_LIMIT (maxFramebufferWidth);
DEBUG_UINT32_LIMIT (maxFramebufferHeight);
DEBUG_UINT32_LIMIT (maxFramebufferLayers);
DEBUG_FLAGS_LIMIT (framebufferColorSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferDepthSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferStencilSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (framebufferNoAttachmentsSampleCounts, sample_count);
DEBUG_UINT32_LIMIT (maxColorAttachments);
DEBUG_FLAGS_LIMIT (sampledImageColorSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageIntegerSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageDepthSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (sampledImageStencilSampleCounts, sample_count);
DEBUG_FLAGS_LIMIT (storageImageSampleCounts, sample_count);
DEBUG_BOOL_LIMIT (timestampComputeAndGraphics);
DEBUG_FLOAT_LIMIT (timestampPeriod);
DEBUG_UINT32_LIMIT (maxClipDistances);
DEBUG_UINT32_LIMIT (maxCullDistances);
DEBUG_UINT32_LIMIT (maxCombinedClipAndCullDistances);
DEBUG_UINT32_LIMIT (discreteQueuePriorities);
DEBUG_FLOAT_2_LIMIT (pointSizeRange);
DEBUG_FLOAT_2_LIMIT (lineWidthRange);
DEBUG_FLOAT_LIMIT (pointSizeGranularity);
DEBUG_FLOAT_LIMIT (lineWidthGranularity);
DEBUG_BOOL_LIMIT (strictLines);
DEBUG_BOOL_LIMIT (standardSampleLocations);
DEBUG_UINT64_LIMIT (optimalBufferCopyOffsetAlignment);
DEBUG_UINT64_LIMIT (optimalBufferCopyRowPitchAlignment);
DEBUG_UINT64_LIMIT (nonCoherentAtomSize);
#undef DEBUG_LIMIT
#undef DEBUG_LIMIT_2
#undef DEBUG_LIMIT_3
#undef DEBUG_BOOL_LIMIT
#undef DEBUG_UINT32_LIMIT
#undef DEBUG_UINT32_2_LIMIT
#undef DEBUG_UINT32_3_LIMIT
#undef DEBUG_INT32_LIMIT
#undef DEBUG_UINT64_LIMIT
#undef DEBUG_SIZE_LIMIT
#undef DEBUG_FLOAT_LIMIT
#undef DEBUG_FLOAT_2_LIMIT
#undef DEBUG_FLAGS_LIMIT
return TRUE;
}
static gboolean
dump_sparse_properties (GstVulkanPhysicalDevice * device, GError ** error)
{
#define DEBUG_BOOL_SPARSE_PROPERTY(name) DEBUG_BOOL("sparse property", name, device->properties.sparseProperties.name)
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard2DBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard2DMultisampleBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyStandard3DBlockShape);
DEBUG_BOOL_SPARSE_PROPERTY (residencyAlignedMipSize);
DEBUG_BOOL_SPARSE_PROPERTY (residencyNonResidentStrict);
#undef DEBUG_BOOL_SPARSE_PROPERTY
return TRUE;
}
static gboolean
physical_device_info (GstVulkanPhysicalDevice * device, GError ** error)
{
GST_INFO_OBJECT (device, "physical device %i name \'%s\' type \'%s\' "
"api version %u.%u.%u, driver version %u.%u.%u vendor ID 0x%x, "
"device ID 0x%x", device->device_index, device->properties.deviceName,
gst_vulkan_physical_device_type_to_string (device->properties.deviceType),
VK_VERSION_MAJOR (device->properties.apiVersion),
VK_VERSION_MINOR (device->properties.apiVersion),
VK_VERSION_PATCH (device->properties.apiVersion),
VK_VERSION_MAJOR (device->properties.driverVersion),
VK_VERSION_MINOR (device->properties.driverVersion),
VK_VERSION_PATCH (device->properties.driverVersion),
device->properties.vendorID, device->properties.deviceID);
if (!dump_queue_properties (device, error))
return FALSE;
if (!dump_memory_properties (device, error))
return FALSE;
if (!dump_features (device, error))
return FALSE;
if (!dump_limits (device, error))
return FALSE;
if (!dump_sparse_properties (device, error))
return FALSE;
return TRUE;
}
static gboolean
gst_vulkan_physical_device_fill_info (GstVulkanPhysicalDevice * device,
GError ** error)
{
VkResult err;
device->device = gst_vulkan_physical_device_get_handle (device);
if (!device->device) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"Failed to retrieve physical device");
goto error;
}
err =
vkEnumerateDeviceLayerProperties (device->device,
&device->n_device_layers, NULL);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceLayerProperties") < 0)
goto error;
device->device_layers = g_new0 (VkLayerProperties, device->n_device_layers);
err =
vkEnumerateDeviceLayerProperties (device->device,
&device->n_device_layers, device->device_layers);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceLayerProperties") < 0) {
goto error;
}
err =
vkEnumerateDeviceExtensionProperties (device->device, NULL,
&device->n_device_extensions, NULL);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceExtensionProperties") < 0) {
goto error;
}
GST_DEBUG_OBJECT (device, "Found %u extensions", device->n_device_extensions);
device->device_extensions =
g_new0 (VkExtensionProperties, device->n_device_extensions);
err =
vkEnumerateDeviceExtensionProperties (device->device, NULL,
&device->n_device_extensions, device->device_extensions);
if (gst_vulkan_error_to_g_error (err, error,
"vkEnumerateDeviceExtensionProperties") < 0) {
goto error;
}
vkGetPhysicalDeviceProperties (device->device, &device->properties);
vkGetPhysicalDeviceMemoryProperties (device->device,
&device->memory_properties);
vkGetPhysicalDeviceFeatures (device->device, &device->features);
vkGetPhysicalDeviceQueueFamilyProperties (device->device,
&device->n_queue_families, NULL);
if (device->n_queue_families > 0) {
device->queue_family_props =
g_new0 (VkQueueFamilyProperties, device->n_queue_families);
vkGetPhysicalDeviceQueueFamilyProperties (device->device,
&device->n_queue_families, device->queue_family_props);
}
if (!physical_device_info (device, error))
goto error;
return TRUE;
error:
return FALSE;
}
/**
* gst_vulkan_physical_device_get_physical_device: (skip)
* @device: a #GstVulkanPhysicalDevice
*
* Returns: The associated `VkPhysicalDevice` handle
*
* Since: 1.18
*/
VkPhysicalDevice
gst_vulkan_physical_device_get_handle (GstVulkanPhysicalDevice * device)
{
g_return_val_if_fail (GST_IS_VULKAN_PHYSICAL_DEVICE (device), NULL);
return device->device;
}

78
gst-libs/gst/vulkan/gstvkphysicaldevice.h Normal file
View file

@ -0,0 +1,78 @@
/*
* GStreamer
* Copyright (C) 2019 Matthew Waters <matthew@centricular.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/
#ifndef __GST_VULKAN_PHYSICAL_DEVICE_H__
#define __GST_VULKAN_PHYSICAL_DEVICE_H__
#include <gst/vulkan/gstvkinstance.h>
#include <gst/vulkan/gstvkqueue.h>
G_BEGIN_DECLS
#define GST_TYPE_VULKAN_PHYSICAL_DEVICE (gst_vulkan_physical_device_get_type())
#define GST_VULKAN_PHYSICAL_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_VULKAN_PHYSICAL_DEVICE, GstVulkanPhysicalDevice))
#define GST_VULKAN_PHYSICAL_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_TYPE_VULKAN_PHYSICAL_DEVICE, GstVulkanPhysicalDeviceClass))
#define GST_IS_VULKAN_PHYSICAL_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_VULKAN_PHYSICAL_DEVICE))
#define GST_IS_VULKAN_PHYSICAL_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_TYPE_VULKAN_PHYSICAL_DEVICE))
#define GST_VULKAN_PHYSICAL_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_TYPE_VULKAN_PHYSICAL_DEVICE, GstVulkanPhysicalDeviceClass))
GST_VULKAN_API
GType gst_vulkan_physical_device_get_type (void);
struct _GstVulkanPhysicalDevice
{
GstObject parent;
GstVulkanInstance *instance;
guint device_index;
VkPhysicalDevice device; /* hides a pointer */
VkLayerProperties *device_layers;
guint32 n_device_layers;
VkExtensionProperties *device_extensions;
guint32 n_device_extensions;
VkPhysicalDeviceProperties properties;
VkPhysicalDeviceFeatures features;
VkPhysicalDeviceMemoryProperties memory_properties;
VkQueueFamilyProperties *queue_family_props;
guint32 n_queue_families;
GstVulkanPhysicalDevicePrivate *priv;
};
struct _GstVulkanPhysicalDeviceClass
{
GstObjectClass parent_class;
};
GST_VULKAN_API
GstVulkanPhysicalDevice * gst_vulkan_physical_device_new (GstVulkanInstance * instance, guint device_index);
GST_VULKAN_API
GstVulkanInstance * gst_vulkan_physical_device_get_instance (GstVulkanPhysicalDevice * device);
GST_VULKAN_API
VkPhysicalDevice gst_vulkan_physical_device_get_handle (GstVulkanPhysicalDevice * device);
G_END_DECLS
#endif /* __GST_VULKAN_PHYSICAL_DEVICE_H__ */

9
gst-libs/gst/vulkan/gstvkswapper.c
View file

@ -258,7 +258,8 @@ static gboolean
_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
struct choose_data *data)
{
guint flags = device->queue_family_props[queue->family].queueFlags;
guint flags =
device->physical_device->queue_family_props[queue->family].queueFlags;
VkPhysicalDevice gpu;
gboolean supports_present;
@ -324,7 +325,8 @@ gst_vulkan_swapper_choose_queue (GstVulkanSwapper * swapper,
if (available_queue) {
guint flags =
swapper->device->queue_family_props[available_queue->family].queueFlags;
swapper->device->physical_device->
queue_family_props[available_queue->family].queueFlags;
gboolean supports_present;
supports_present =
@ -649,7 +651,8 @@ gst_vulkan_swapper_get_supported_caps (GstVulkanSwapper * swapper,
}
{
guint32 max_dim = swapper->device->gpu_props.limits.maxImageDimension2D;
guint32 max_dim =
swapper->device->physical_device->properties.limits.maxImageDimension2D;
gst_structure_set (s, "width", GST_TYPE_INT_RANGE, 1, (gint) max_dim,
"height", GST_TYPE_INT_RANGE, 1, (gint) max_dim, "pixel-aspect-ratio",

2
gst-libs/gst/vulkan/meson.build
View file

@ -17,6 +17,7 @@ vulkan_sources = [
'gstvkimagebufferpool.c',
'gstvkinstance.c',
'gstvkmemory.c',
'gstvkphysicaldevice.c',
'gstvkqueue.c',
'gstvkswapper.c',
'gstvktrash.c',
@ -40,6 +41,7 @@ vulkan_headers = [
'gstvkimagebufferpool.h',
'gstvkinstance.h',
'gstvkmemory.h',
'gstvkphysicaldevice.h',
'gstvkqueue.h',
'gstvkswapper.h',
'gstvktrash.h',

1
gst-libs/gst/vulkan/vulkan.h
View file

@ -28,6 +28,7 @@
#include <gst/vulkan/gstvkdebug.h>
#include <gst/vulkan/gstvkerror.h>
#include <gst/vulkan/gstvkinstance.h>
#include <gst/vulkan/gstvkphysicaldevice.h>
#include <gst/vulkan/gstvkdevice.h>
#include <gst/vulkan/gstvkqueue.h>
#include <gst/vulkan/gstvkfence.h>

4
gst-libs/gst/vulkan/vulkan_fwd.h
View file

@ -33,6 +33,10 @@ typedef struct _GstVulkanDevice GstVulkanDevice;
typedef struct _GstVulkanDeviceClass GstVulkanDeviceClass;
typedef struct _GstVulkanDevicePrivate GstVulkanDevicePrivate;
typedef struct _GstVulkanPhysicalDevice GstVulkanPhysicalDevice;
typedef struct _GstVulkanPhysicalDeviceClass GstVulkanPhysicalDeviceClass;
typedef struct _GstVulkanPhysicalDevicePrivate GstVulkanPhysicalDevicePrivate;
typedef struct _GstVulkanQueue GstVulkanQueue;
typedef struct _GstVulkanQueueClass GstVulkanQueueClass;

2
tests/check/libs/vkdevice.c
View file

@ -46,7 +46,7 @@ GST_START_TEST (test_device_new)
GstVulkanDevice *device;
GstVulkanInstance *dev_instance;
device = gst_vulkan_device_new (instance);
device = gst_vulkan_device_new_with_index (instance, 0);
g_object_get (device, "instance", &dev_instance, NULL);
fail_unless (dev_instance == instance);
gst_object_unref (dev_instance);

2
tests/check/libs/vkmemory.c
View file

@ -34,7 +34,7 @@ setup (void)
{
instance = gst_vulkan_instance_new ();
fail_unless (gst_vulkan_instance_open (instance, NULL));
device = gst_vulkan_device_new (instance);
device = gst_vulkan_device_new_with_index (instance, 0);
fail_unless (gst_vulkan_device_open (device, NULL));
}