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

panvk: Move panvk_cmd_compute_state to a common place

Browse source 
panvk_cmd_compute_state is exactly the same in JM and CSF, so let's move
it to a common place.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31911>
This commit is contained in:
Boris Brezillon 2024-11-07 14:33:35 +01:00 • committed by Marge Bot
parent b67b350b4c
commit b304a0c49b
3 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/panfrost/vulkan/csf/panvk_cmd_buffer.h
View file

@ -15,6 +15,7 @@
#include "genxml/cs_builder.h"
#include "panvk_cmd_desc_state.h"
#include "panvk_cmd_dispatch.h"
#include "panvk_cmd_draw.h"
#include "panvk_cmd_push_constant.h"
#include "panvk_queue.h"
@ -307,16 +308,6 @@ struct panvk_tls_state {
unsigned max_wg_count;
};
struct panvk_cmd_compute_state {
struct panvk_descriptor_state desc_state;
const struct panvk_shader *shader;
struct panvk_compute_sysvals sysvals;
mali_ptr push_uniforms;
struct {
struct panvk_shader_desc_state desc;
} cs;
};
struct panvk_cmd_buffer {
struct vk_command_buffer vk;
VkCommandBufferUsageFlags flags;

13
src/panfrost/vulkan/jm/panvk_cmd_buffer.h
View file

@ -15,6 +15,7 @@
#include "vulkan/runtime/vk_command_buffer.h"
#include "panvk_cmd_desc_state.h"
#include "panvk_cmd_dispatch.h"
#include "panvk_cmd_draw.h"
#include "panvk_cmd_push_constant.h"
#include "panvk_descriptor_set.h"
@ -72,18 +73,6 @@ struct panvk_cmd_event_op {
struct panvk_event *event;
};
struct panvk_cmd_compute_state {
struct panvk_descriptor_state desc_state;
const struct panvk_shader *shader;
struct panvk_compute_sysvals sysvals;
mali_ptr push_uniforms;
#if PAN_ARCH <= 7
struct {
struct panvk_shader_desc_state desc;
} cs;
#endif
};
struct panvk_cmd_buffer {
struct vk_command_buffer vk;

23
src/panfrost/vulkan/panvk_cmd_dispatch.h Normal file
View file

@ -0,0 +1,23 @@
/*
* Copyright © 2024 Collabora Ltd.
* SPDX-License-Identifier: MIT
*/
#ifndef PANVK_CMD_DISPATCH_H
#define PANVK_CMD_DISPATCH_H
#ifndef PAN_ARCH
#error "PAN_ARCH must be defined"
#endif
struct panvk_cmd_compute_state {
struct panvk_descriptor_state desc_state;
const struct panvk_shader *shader;
struct panvk_compute_sysvals sysvals;
mali_ptr push_uniforms;
struct {
struct panvk_shader_desc_state desc;
} cs;
};
#endif