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

v3dv: remove gen-dependant includes from v3dv_private

Browse source 
As we are here, we move the hooks for the packet definitions (used by
the broadcom packets helpers) to v3dv_cl

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11310>
This commit is contained in:
Alejandro Piñeiro 2021-05-28 13:46:57 +02:00
parent 2e40f13f9a
commit f257c79ea4
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/broadcom/vulkan/v3dv_cl.h
View file

@ -46,6 +46,16 @@ struct v3dv_cl_reloc {
uint32_t offset; uint32_t offset;
}; };
static inline void
pack_emit_reloc(void *cl, const void *reloc) {}
#define __gen_user_data struct v3dv_cl
#define __gen_address_type struct v3dv_cl_reloc
#define __gen_address_offset(reloc) (((reloc)->bo ? (reloc)->bo->offset : 0) + \
(reloc)->offset)
#define __gen_emit_reloc cl_pack_emit_reloc
#define __gen_unpack_address(cl, s, e) __unpack_address(cl, s, e)
struct v3dv_cl { struct v3dv_cl {
void *base; void *base;
struct v3dv_job *job; struct v3dv_job *job;

16
src/broadcom/vulkan/v3dv_private.h
View file

@ -75,24 +75,12 @@
#include "drm-uapi/v3d_drm.h" #include "drm-uapi/v3d_drm.h"
/* FIXME: hooks for the packet definition functions. */
static inline void
pack_emit_reloc(void *cl, const void *reloc) {}
#define __gen_user_data struct v3dv_cl
#define __gen_address_type struct v3dv_cl_reloc
#define __gen_address_offset(reloc) (((reloc)->bo ? (reloc)->bo->offset : 0) + \
(reloc)->offset)
#define __gen_emit_reloc cl_pack_emit_reloc
#define __gen_unpack_address(cl, s, e) __unpack_address(cl, s, e)
#include "v3dv_cl.h"
#include "vk_alloc.h" #include "vk_alloc.h"
#include "simulator/v3d_simulator.h" #include "simulator/v3d_simulator.h"
#include "wsi_common.h" #include "v3dv_cl.h"
#include "broadcom/cle/v3dx_pack.h" #include "wsi_common.h"
/* A non-fatal assert. Useful for debugging. */ /* A non-fatal assert. Useful for debugging. */
#ifdef DEBUG #ifdef DEBUG

3
src/broadcom/vulkan/v3dv_uniforms.c
View file

@ -28,6 +28,9 @@
#include "v3dv_private.h" #include "v3dv_private.h"
#include "vk_format_info.h" #include "vk_format_info.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
/* Our Vulkan resource indices represent indices in descriptor maps which /* Our Vulkan resource indices represent indices in descriptor maps which
* include all shader stages, so we need to size the arrays below * include all shader stages, so we need to size the arrays below
* accordingly. For now we only support a maximum of 2 stages for VS and * accordingly. For now we only support a maximum of 2 stages for VS and