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

vc4,v3d,v3dv: avoid compiling in unused sim_file field in the {vc4,v3d}_screen/v3dv_physical_device struct

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30287>
This commit is contained in:
Eric Engestrom 2024-07-21 17:43:36 +02:00 • committed by Marge Bot
parent eae740f2e4
commit f1f8c465d5
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,9 @@ struct v3dv_physical_device {
struct v3d_device_info devinfo; struct v3d_device_info devinfo;
#if USE_V3D_SIMULATOR
struct v3d_simulator_file *sim_file; struct v3d_simulator_file *sim_file;
#endif
const struct v3d_compiler *compiler; const struct v3d_compiler *compiler;
uint32_t next_program_id; uint32_t next_program_id;

5
src/gallium/drivers/v3d/v3d_screen.c
View file

@ -84,8 +84,9 @@ v3d_screen_destroy(struct pipe_screen *pscreen)
if (screen->ro) if (screen->ro)
screen->ro->destroy(screen->ro); screen->ro->destroy(screen->ro);
if (USE_V3D_SIMULATOR) #if USE_V3D_SIMULATOR
v3d_simulator_destroy(screen->sim_file); v3d_simulator_destroy(screen->sim_file);
#endif
v3d_compiler_free(screen->compiler); v3d_compiler_free(screen->compiler);

2
src/gallium/drivers/v3d/v3d_screen.h
View file

@ -87,7 +87,9 @@ struct v3d_screen {
bool has_perfmon; bool has_perfmon;
bool nonmsaa_texture_size_limit; bool nonmsaa_texture_size_limit;
#if USE_V3D_SIMULATOR
struct v3d_simulator_file *sim_file; struct v3d_simulator_file *sim_file;
#endif
#ifdef ENABLE_SHADER_CACHE #ifdef ENABLE_SHADER_CACHE
struct disk_cache *disk_cache; struct disk_cache *disk_cache;

2
src/gallium/drivers/vc4/vc4_screen.h
View file

@ -105,7 +105,9 @@ struct vc4_screen {
bool has_perfmon_ioctl; bool has_perfmon_ioctl;
bool has_syncobj; bool has_syncobj;
#if USE_V3D_SIMULATOR
struct vc4_simulator_file *sim_file; struct vc4_simulator_file *sim_file;
#endif
}; };
static inline struct vc4_screen * static inline struct vc4_screen *