fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan: Move the descriptor set limit to vk_limits.h

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27024>
This commit is contained in:
Faith Ekstrand 2024-01-02 16:48:18 -06:00 • committed by Marge Bot
parent 498d58a5f8
commit 6ad294202e
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vulkan/runtime/vk_limits.h
View file

@ -24,6 +24,8 @@
#ifndef VK_LIMITS_H
#define VK_LIMITS_H
#define MESA_VK_MAX_DESCRIPTOR_SETS 32
#define MESA_VK_MAX_VERTEX_BINDINGS 32
#define MESA_VK_MAX_VERTEX_ATTRIBUTES 32

2
src/vulkan/runtime/vk_pipeline_layout.c
View file

@ -37,7 +37,7 @@ vk_pipeline_layout_init(struct vk_device *device,
const VkPipelineLayoutCreateInfo *pCreateInfo)
{
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO);
assert(pCreateInfo->setLayoutCount <= VK_MESA_PIPELINE_LAYOUT_MAX_SETS);
assert(pCreateInfo->setLayoutCount <= MESA_VK_MAX_DESCRIPTOR_SETS);
vk_object_base_init(device, &layout->base, VK_OBJECT_TYPE_PIPELINE_LAYOUT);

5
src/vulkan/runtime/vk_pipeline_layout.h
View file

@ -23,6 +23,7 @@
#ifndef VK_PIPELINE_LAYOUT_H
#define VK_PIPELINE_LAYOUT_H
#include "vk_limits.h"
#include "vk_object.h"
#include "util/u_atomic.h"
@ -33,8 +34,6 @@ extern "C" {
struct vk_descriptor_set_layout;
#define VK_MESA_PIPELINE_LAYOUT_MAX_SETS 32
struct vk_pipeline_layout {
struct vk_object_base base;
@ -61,7 +60,7 @@ struct vk_pipeline_layout {
uint32_t set_count;
/** Array of pointers to descriptor set layouts, indexed by set index */
struct vk_descriptor_set_layout *set_layouts[VK_MESA_PIPELINE_LAYOUT_MAX_SETS];
struct vk_descriptor_set_layout *set_layouts[MESA_VK_MAX_DESCRIPTOR_SETS];
/** Destroy callback
*