mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-09 08:58:02 +02:00
venus: clang-format
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34830>
This commit is contained in:
parent
a35415530d
commit
0c345c2c5e
5 changed files with 31 additions and 24 deletions
|
|
@ -265,10 +265,8 @@ vn_device_fix_create_info(const struct vn_device *dev,
|
|||
VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME;
|
||||
block_exts[block_count++] =
|
||||
VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME;
|
||||
block_exts[block_count++] =
|
||||
VK_EXT_HDR_METADATA_EXTENSION_NAME;
|
||||
block_exts[block_count++] =
|
||||
VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME;
|
||||
block_exts[block_count++] = VK_EXT_HDR_METADATA_EXTENSION_NAME;
|
||||
block_exts[block_count++] = VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME;
|
||||
}
|
||||
|
||||
if (app_exts->ANDROID_native_buffer) {
|
||||
|
|
|
|||
|
|
@ -445,7 +445,8 @@ vn_DestroyInstance(VkInstance _instance,
|
|||
vn_renderer_shmem_pool_fini(instance->renderer,
|
||||
&instance->reply_shmem_pool);
|
||||
|
||||
vn_renderer_shmem_pool_fini(instance->renderer, &instance->cs_shmem_pool);
|
||||
vn_renderer_shmem_pool_fini(instance->renderer,
|
||||
&instance->cs_shmem_pool);
|
||||
|
||||
vn_renderer_destroy(instance->renderer, alloc);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,18 +187,21 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
|
|||
VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR
|
||||
ray_tracing_position_fetch;
|
||||
VkPhysicalDeviceShaderClockFeaturesKHR shader_clock;
|
||||
VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR shader_maximal_reconvergence;
|
||||
VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR
|
||||
shader_maximal_reconvergence;
|
||||
VkPhysicalDeviceShaderQuadControlFeaturesKHR shader_quad_control;
|
||||
VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR
|
||||
shader_relaxed_extended_instruction;
|
||||
VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR shader_subgroup_uniform_control_flow;
|
||||
VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR
|
||||
shader_subgroup_uniform_control_flow;
|
||||
VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR
|
||||
workgroup_memory_explicit_layout;
|
||||
|
||||
/* EXT */
|
||||
VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT
|
||||
attachment_feedback_loop_dynamic_state;
|
||||
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT attachment_feedback_loop_layout;
|
||||
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
|
||||
attachment_feedback_loop_layout;
|
||||
VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT
|
||||
blend_operation_advanced;
|
||||
VkPhysicalDeviceBorderColorSwizzleFeaturesEXT border_color_swizzle;
|
||||
|
|
@ -230,7 +233,8 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
|
|||
VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT mutable_descriptor_type;
|
||||
VkPhysicalDeviceNestedCommandBufferFeaturesEXT nested_command_buffer;
|
||||
VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT non_seamless_cube_map;
|
||||
VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT pipeline_library_group_handles;
|
||||
VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT
|
||||
pipeline_library_group_handles;
|
||||
VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT
|
||||
primitive_topology_list_restart;
|
||||
VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT
|
||||
|
|
@ -521,7 +525,8 @@ vn_physical_device_sanitize_properties(struct vn_physical_device *physical_dev)
|
|||
|
||||
/* force prime blit on NV proprietary driver */
|
||||
if (props->driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) {
|
||||
physical_dev->base.vk.supported_extensions.EXT_image_drm_format_modifier = false;
|
||||
physical_dev->base.vk.supported_extensions
|
||||
.EXT_image_drm_format_modifier = false;
|
||||
}
|
||||
|
||||
/* store renderer VkDriverId for implementation specific workarounds */
|
||||
|
|
@ -1816,8 +1821,8 @@ enumerate_physical_devices(struct vn_instance *instance,
|
|||
VkResult result;
|
||||
|
||||
if (!instance->renderer) {
|
||||
*out_count = 0;
|
||||
return VK_SUCCESS;
|
||||
*out_count = 0;
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
uint32_t count = 0;
|
||||
result = vn_call_vkEnumeratePhysicalDevices(
|
||||
|
|
@ -2104,8 +2109,9 @@ vn_GetPhysicalDeviceQueueFamilyProperties2(
|
|||
physical_dev->queue_family_properties[i].queueFamilyProperties;
|
||||
|
||||
if (physical_dev->base.vk.supported_features.globalPriorityQuery) {
|
||||
VkQueueFamilyGlobalPriorityProperties *prio_props = vk_find_struct(
|
||||
props->pNext, QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES);
|
||||
VkQueueFamilyGlobalPriorityProperties *prio_props =
|
||||
vk_find_struct(props->pNext,
|
||||
QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES);
|
||||
if (prio_props) {
|
||||
void *pnext = prio_props->pNext;
|
||||
*prio_props = physical_dev->global_priority_properties[i];
|
||||
|
|
|
|||
|
|
@ -19,12 +19,13 @@
|
|||
#include <sys/sysmacros.h>
|
||||
#endif
|
||||
|
||||
#include "virtio/virtio-gpu/venus_hw.h"
|
||||
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
#include "util/os_file.h"
|
||||
#include "util/sparse_array.h"
|
||||
|
||||
#include "vn_renderer_internal.h"
|
||||
#include "virtio/virtio-gpu/venus_hw.h"
|
||||
|
||||
#ifndef VIRTGPU_PARAM_GUEST_VRAM
|
||||
/* All guest allocations happen via virtgpu dedicated heap. */
|
||||
|
|
@ -597,8 +598,7 @@ virtgpu_ioctl_get_caps(struct virtgpu *gpu,
|
|||
}
|
||||
|
||||
static int
|
||||
virtgpu_ioctl_context_init(struct virtgpu *gpu,
|
||||
uint32_t capset_id)
|
||||
virtgpu_ioctl_context_init(struct virtgpu *gpu, uint32_t capset_id)
|
||||
{
|
||||
struct drm_virtgpu_context_set_param ctx_set_params[3] = {
|
||||
{
|
||||
|
|
@ -1238,7 +1238,8 @@ virtgpu_bo_create_from_device_memory(
|
|||
struct vn_renderer_bo **out_bo)
|
||||
{
|
||||
struct virtgpu *gpu = (struct virtgpu *)renderer;
|
||||
const uint32_t blob_flags = virtgpu_bo_blob_flags(gpu, flags, external_handles);
|
||||
const uint32_t blob_flags =
|
||||
virtgpu_bo_blob_flags(gpu, flags, external_handles);
|
||||
|
||||
uint32_t res_id;
|
||||
uint32_t gem_handle = virtgpu_ioctl_resource_create_blob(
|
||||
|
|
@ -1505,8 +1506,10 @@ static VkResult
|
|||
virtgpu_init_params(struct virtgpu *gpu)
|
||||
{
|
||||
const uint64_t required_params[] = {
|
||||
VIRTGPU_PARAM_3D_FEATURES, VIRTGPU_PARAM_CAPSET_QUERY_FIX,
|
||||
VIRTGPU_PARAM_RESOURCE_BLOB, VIRTGPU_PARAM_CONTEXT_INIT,
|
||||
VIRTGPU_PARAM_3D_FEATURES,
|
||||
VIRTGPU_PARAM_CAPSET_QUERY_FIX,
|
||||
VIRTGPU_PARAM_RESOURCE_BLOB,
|
||||
VIRTGPU_PARAM_CONTEXT_INIT,
|
||||
};
|
||||
uint64_t val;
|
||||
for (uint32_t i = 0; i < ARRAY_SIZE(required_params); i++) {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
* Copyright 2014, 2015 Red Hat.
|
||||
*/
|
||||
|
||||
#include "virtio/virtio-gpu/venus_hw.h"
|
||||
#include <errno.h>
|
||||
#include <netinet/in.h>
|
||||
#include <poll.h>
|
||||
|
|
@ -15,15 +16,14 @@
|
|||
#include <sys/un.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
#include "util/os_file.h"
|
||||
#include "util/os_misc.h"
|
||||
#include "util/sparse_array.h"
|
||||
#include "util/u_process.h"
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
#include "vtest/vtest_protocol.h"
|
||||
|
||||
#include "vn_renderer_internal.h"
|
||||
#include "virtio/virtio-gpu/venus_hw.h"
|
||||
|
||||
#define VTEST_PCI_VENDOR_ID 0x1af4
|
||||
#define VTEST_PCI_DEVICE_ID 0x1050
|
||||
|
|
@ -299,8 +299,7 @@ vtest_vcmd_get_capset(struct vtest *vtest,
|
|||
}
|
||||
|
||||
static void
|
||||
vtest_vcmd_context_init(struct vtest *vtest,
|
||||
uint32_t capset_id)
|
||||
vtest_vcmd_context_init(struct vtest *vtest, uint32_t capset_id)
|
||||
{
|
||||
uint32_t vtest_hdr[VTEST_HDR_SIZE];
|
||||
uint32_t vcmd_context_init[VCMD_CONTEXT_INIT_SIZE];
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue