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

Merge branch 'increase-ssbo-count' into 'main'

Browse source 
svga: Increase max_combined_shader_output_resources and SSBO limit to 16

See merge request mesa/mesa!39043
This commit is contained in:
Ian Forbes 2025-12-19 18:50:17 -06:00
commit 17b315fc17
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/svga/svga_context.h
View file

@ -85,9 +85,10 @@ enum svga_hud {
#define CONST0_UPLOAD_ALIGNMENT 256 #define CONST0_UPLOAD_ALIGNMENT 256
#define SVGA_MAX_UAVIEWS SVGA3D_DX11_1_MAX_UAVIEWS #define SVGA_MAX_UAVIEWS SVGA3D_DX11_1_MAX_UAVIEWS
#define SVGA_MAX_IMAGES SVGA3D_DX11_MAX_UAVIEWS #define SVGA_MAX_IMAGES SVGA3D_DX11_MAX_UAVIEWS
#define SVGA_MAX_SHADER_BUFFERS SVGA3D_DX11_MAX_UAVIEWS #define SVGA_MAX_SHADER_BUFFERS 16
#define SVGA_MAX_ATOMIC_BUFFERS SVGA3D_DX11_MAX_UAVIEWS #define SVGA_MAX_ATOMIC_BUFFERS SVGA3D_DX11_MAX_UAVIEWS
enum svga_surface_state enum svga_surface_state
{ {
SVGA_SURFACE_STATE_CREATED, SVGA_SURFACE_STATE_CREATED,
@ -365,7 +366,7 @@ struct svga_state
/* HW atomic buffers */ /* HW atomic buffers */
unsigned num_atomic_buffers; unsigned num_atomic_buffers;
struct svga_shader_buffer atomic_buffers[SVGA_MAX_SHADER_BUFFERS]; struct svga_shader_buffer atomic_buffers[SVGA_MAX_ATOMIC_BUFFERS];
struct { struct {
/* Determine the layout of the grid (in block units) to be used. */ /* Determine the layout of the grid (in block units) to be used. */

8
src/gallium/drivers/svga/svga_shader.h
View file

@ -131,10 +131,10 @@ struct svga_compile_key
unsigned sampler_index:5; unsigned sampler_index:5;
} tex[PIPE_MAX_SAMPLERS]; } tex[PIPE_MAX_SAMPLERS];
unsigned uav_splice_index:4; /* starting uav index */ uint8_t uav_splice_index; /* starting uav index */
unsigned srv_raw_constbuf_index:8; /* start index for srv raw buffers */ uint8_t srv_raw_constbuf_index; /* start index for srv raw buffers */
unsigned srv_raw_shaderbuf_index:8; /* start index for srv raw shader bufs */ uint8_t srv_raw_shaderbuf_index; /* start index for srv raw shader bufs */
unsigned image_size_used:1; bool image_size_used;
uint16_t raw_constbufs; /* bitmask of raw constant buffers */ uint16_t raw_constbufs; /* bitmask of raw constant buffers */
uint64_t raw_shaderbufs; /* bitmask of raw shader buffers */ uint64_t raw_shaderbufs; /* bitmask of raw shader buffers */

2
src/gallium/drivers/svga/svga_shader_buffer.h
View file

@ -11,8 +11,8 @@
struct svga_shader_buffer { struct svga_shader_buffer {
struct pipe_shader_buffer desc; struct pipe_shader_buffer desc;
struct pipe_resource *resource; struct pipe_resource *resource;
unsigned uav_index;
struct svga_winsys_surface *handle; struct svga_winsys_surface *handle;
unsigned uav_index;
bool writeAccess; bool writeAccess;
}; };