From 2e5d49b3ddbd2119aee527102792d78a2a130799 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 5 Apr 2024 11:39:33 -0400 Subject: [PATCH] gallium: delete PIPE_CAP_NIR_COMPACT_ARRAYS this is now nir_shader_compiler_options::compact_arrays Reviewed-by: Jesse Natalie Part-of: --- docs/gallium/screen.rst | 1 - src/gallium/auxiliary/util/u_screen.c | 1 - src/gallium/drivers/asahi/agx_pipe.c | 1 - src/gallium/drivers/crocus/crocus_screen.c | 1 - src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 --- src/gallium/drivers/freedreno/freedreno_screen.c | 1 - src/gallium/drivers/iris/iris_screen.c | 1 - src/gallium/drivers/v3d/v3d_screen.c | 1 - src/gallium/drivers/zink/zink_screen.c | 3 --- src/gallium/include/pipe/p_defines.h | 1 - 10 files changed, 14 deletions(-) diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index 643df436d0c4e..54fc0778f4bf4 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -545,7 +545,6 @@ The integer capabilities: * ``PIPE_CAP_DEST_SURFACE_SRGB_CONTROL``: Indicates whether the drivers supports switching the format between sRGB and linear for a surface that is used as destination in draw and blit calls. -* ``PIPE_CAP_NIR_COMPACT_ARRAYS``: True if the compiler backend supports NIR's compact array feature, for all shader stages. * ``PIPE_CAP_MAX_VARYINGS``: The maximum number of fragment shader varyings. This will generally correspond to ``PIPE_SHADER_CAP_MAX_INPUTS`` for the fragment shader, but in some diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index a9c3f6c37ddd9..0abe02eebbd7a 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -359,7 +359,6 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_POST_DEPTH_COVERAGE: case PIPE_CAP_BINDLESS_TEXTURE: case PIPE_CAP_NIR_SAMPLERS_AS_DEREF: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_QUERY_SO_OVERFLOW: case PIPE_CAP_MEMOBJ: case PIPE_CAP_LOAD_CONSTBUF: diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index 5aa71f0206295..22ebda24089d1 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -1551,7 +1551,6 @@ agx_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_PACK_HALF_FLOAT: case PIPE_CAP_FS_FINE_DERIVATIVE: case PIPE_CAP_CULL_DISTANCE_NOCOMBINE: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: case PIPE_CAP_DOUBLES: return 1; diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index 81f65aa78b4e4..f1a1f265d7ae8 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -182,7 +182,6 @@ crocus_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_GATHER_SM5: case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_FS_POSITION_IS_SYSVAL: case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_INVALIDATE_BUFFER: diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index 5e23b59091dc4..7216843c904e3 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -308,9 +308,6 @@ d3d12_get_param_default(struct pipe_screen *pscreen, enum pipe_cap param) /* Subtract one so that implicit position can be added */ return D3D12_PS_INPUT_REGISTER_COUNT - 1; - case PIPE_CAP_NIR_COMPACT_ARRAYS: - return 1; - case PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES: if (screen->max_feature_level <= D3D_FEATURE_LEVEL_11_0) return D3D12_PS_CS_UAV_REGISTER_COUNT; diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index 8d3fe52005e0b..4461f7963205c 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -244,7 +244,6 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_BARRIER: case PIPE_CAP_INVALIDATE_BUFFER: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE: case PIPE_CAP_GL_SPIRV: case PIPE_CAP_FBFETCH_COHERENT: diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index 7a72d8656cb6b..f979fd170167c 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -278,7 +278,6 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS: case PIPE_CAP_LOAD_CONSTBUF: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_FS_POSITION_IS_SYSVAL: case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c index d1f6abdacf333..e479aaa15462e 100644 --- a/src/gallium/drivers/v3d/v3d_screen.c +++ b/src/gallium/drivers/v3d/v3d_screen.c @@ -150,7 +150,6 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_CONDITIONAL_RENDER: case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: case PIPE_CAP_CUBE_MAP_ARRAY: - case PIPE_CAP_NIR_COMPACT_ARRAYS: case PIPE_CAP_TEXTURE_BARRIER: return 1; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 328cea2fa0340..e90a06d674e00 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -995,9 +995,6 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FS_COORD_PIXEL_CENTER_INTEGER: return 0; - case PIPE_CAP_NIR_COMPACT_ARRAYS: - return 1; - case PIPE_CAP_FS_FACE_IS_INTEGER_SYSVAL: case PIPE_CAP_FS_POINT_IS_SYSVAL: return 1; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 736b433fd7fbb..f94c7c6c2620c 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -863,7 +863,6 @@ enum pipe_cap PIPE_CAP_IMAGE_ATOMIC_FLOAT_ADD, PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE, PIPE_CAP_DEST_SURFACE_SRGB_CONTROL, - PIPE_CAP_NIR_COMPACT_ARRAYS, PIPE_CAP_MAX_VARYINGS, PIPE_CAP_COMPUTE_GRID_INFO_LAST_BLOCK, PIPE_CAP_COMPUTE_SHADER_DERIVATIVES,