fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pvr: limit hw-defs to rogue
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Because we are using these carefully picked HW-defs in common code here,
we need to set PVR_BUILD_ARCH_ROGUE first.

Acked-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38922>
This commit is contained in:
Erik Faye-Lund 2025-11-27 11:28:08 +01:00
parent 13d12b33c0
commit c1e4c073cd
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/imagination/vulkan/pvr_csb.h
View file

@ -50,6 +50,7 @@
#define __pvr_make_address(addr_u64) PVR_DEV_ADDR(addr_u64) #define __pvr_make_address(addr_u64) PVR_DEV_ADDR(addr_u64)
/* clang-format on */ /* clang-format on */
#if defined(PVR_BUILD_ARCH_ROGUE)
# include "csbgen/rogue/cdm.h" # include "csbgen/rogue/cdm.h"
# include "csbgen/rogue/cr.h" # include "csbgen/rogue/cr.h"
# include "csbgen/rogue/ipf.h" # include "csbgen/rogue/ipf.h"
@ -60,6 +61,7 @@
# include "csbgen/rogue/ppp.h" # include "csbgen/rogue/ppp.h"
# include "csbgen/rogue/texstate.h" # include "csbgen/rogue/texstate.h"
# include "csbgen/rogue/vdm.h" # include "csbgen/rogue/vdm.h"
#endif
/** /**
* \brief Size of the individual csb buffer object. * \brief Size of the individual csb buffer object.

1
src/imagination/vulkan/pvr_image.c
View file

@ -317,6 +317,7 @@ void pvr_GetImageSubresourceLayout(VkDevice device,
} }
/* Leave this at the very end, to avoid leakage of HW-defs here */ /* Leave this at the very end, to avoid leakage of HW-defs here */
#define PVR_BUILD_ARCH_ROGUE
#include "pvr_csb.h" #include "pvr_csb.h"
static unsigned get_pbe_stride_align(const struct pvr_device_info *dev_info) static unsigned get_pbe_stride_align(const struct pvr_device_info *dev_info)

1
src/imagination/vulkan/pvr_physical_device.c
View file

@ -1238,6 +1238,7 @@ pvr_physical_device_setup_formats(struct pvr_physical_device *const pdevice)
} }
/* Leave this at the very end, to avoid leakage of HW-defs here */ /* Leave this at the very end, to avoid leakage of HW-defs here */
#define PVR_BUILD_ARCH_ROGUE
#include "pvr_border.h" #include "pvr_border.h"
static unsigned static unsigned

1
src/imagination/vulkan/pvr_transfer_frag_store.c
View file

@ -399,6 +399,7 @@ void pvr_transfer_frag_store_fini(struct pvr_device *device,
} }
/* Leave this at the very end, to avoid leakage of HW-defs here */ /* Leave this at the very end, to avoid leakage of HW-defs here */
#define PVR_BUILD_ARCH_ROGUE
#include "pvr_csb.h" #include "pvr_csb.h"
static uint32_t get_doutu_sample_rate(const struct pvr_device_info *dev_info, static uint32_t get_doutu_sample_rate(const struct pvr_device_info *dev_info,