diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index 93185752e92..992e127b3bc 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -754,30 +754,30 @@ pipe_screen::get_compute_param. ``processor-arch-manufacturer-os`` that will be passed on to the compiler. This CAP is only relevant for drivers that specify PIPE_SHADER_IR_NATIVE for their preferred IR. - Value type: null-terminated string. Shader IR type dependent. + Value type: null-terminated string. * ``PIPE_COMPUTE_CAP_GRID_DIMENSION``: Number of supported dimensions - for grid and block coordinates. Value type: ``uint64_t``. Shader IR type dependent. + for grid and block coordinates. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_GRID_SIZE``: Maximum grid size in block - units. Value type: ``uint64_t []``. Shader IR type dependent. + units. Value type: ``uint64_t []``. * ``PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE``: Maximum block size in thread - units. Value type: ``uint64_t []``. Shader IR type dependent. + units. Value type: ``uint64_t []``. * ``PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE_CLOVER``: Same as ``PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE`` but used by clover only. * ``PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK``: Maximum number of threads that - a single block can contain. Value type: ``uint64_t``. Shader IR type dependent. + a single block can contain. Value type: ``uint64_t``. This may be less than the product of the components of MAX_BLOCK_SIZE and is usually limited by the number of threads that can be resident simultaneously on a compute unit. * ``PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK_CLOVER``: Same as ``PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK`` but used by clover only. * ``PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE``: Maximum size of the GLOBAL - resource. Value type: ``uint64_t``. Shader IR type dependent. + resource. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE``: Maximum size of the LOCAL - resource. Value type: ``uint64_t``. Shader IR type dependent. + resource. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE``: Maximum size of the PRIVATE - resource. Value type: ``uint64_t``. Shader IR type dependent. + resource. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_INPUT_SIZE``: Maximum size of the INPUT - resource. Value type: ``uint64_t``. Shader IR type dependent. + resource. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE``: Maximum size of a memory object allocation in bytes. Value type: ``uint64_t``. * ``PIPE_COMPUTE_CAP_MAX_CLOCK_FREQUENCY``: Maximum frequency of the GPU diff --git a/src/gallium/auxiliary/driver_ddebug/dd_screen.c b/src/gallium/auxiliary/driver_ddebug/dd_screen.c index 72f8f164351..25f383251b3 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_screen.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_screen.c @@ -76,13 +76,12 @@ dd_screen_get_disk_shader_cache(struct pipe_screen *_screen) static int dd_screen_get_compute_param(struct pipe_screen *_screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { struct pipe_screen *screen = dd_screen(_screen)->screen; - return screen->get_compute_param(screen, ir_type, param, ret); + return screen->get_compute_param(screen, param, ret); } static int diff --git a/src/gallium/auxiliary/driver_noop/noop_pipe.c b/src/gallium/auxiliary/driver_noop/noop_pipe.c index c67db0899a2..eb30e9853d5 100644 --- a/src/gallium/auxiliary/driver_noop/noop_pipe.c +++ b/src/gallium/auxiliary/driver_noop/noop_pipe.c @@ -506,13 +506,12 @@ static int noop_get_shader_param(struct pipe_screen* pscreen, } static int noop_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { struct pipe_screen *screen = ((struct noop_pipe_screen*)pscreen)->oscreen; - return screen->get_compute_param(screen, ir_type, param, ret); + return screen->get_compute_param(screen, param, ret); } static bool noop_is_format_supported(struct pipe_screen* pscreen, diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index aaf84d5f9e4..3ad31a8e20a 100644 --- a/src/gallium/auxiliary/driver_trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c @@ -177,7 +177,6 @@ trace_screen_get_shader_param(struct pipe_screen *_screen, static int trace_screen_get_compute_param(struct pipe_screen *_screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *data) { @@ -188,11 +187,10 @@ trace_screen_get_compute_param(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_compute_param"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(pipe_shader_ir, ir_type); trace_dump_arg_enum(pipe_compute_cap, param); trace_dump_arg(ptr, data); - result = screen->get_compute_param(screen, ir_type, param, data); + result = screen->get_compute_param(screen, param, data); trace_dump_ret(int, result); diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index 2b075fb4f95..30b60cb2981 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -2078,7 +2078,7 @@ agx_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type shader, } static int -agx_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, +agx_get_compute_param(struct pipe_screen *pscreen, enum pipe_compute_cap param, void *ret) { struct agx_device *dev = agx_device(pscreen); diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index 6f48c7e66fe..809c8fdf863 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -229,7 +229,6 @@ crocus_get_shader_param(struct pipe_screen *pscreen, static int crocus_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index 4a998a0d061..afbff240d9a 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -236,7 +236,6 @@ d3d12_get_shader_param(struct pipe_screen *pscreen, static int d3d12_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir, enum pipe_compute_cap cap, void *ret) { diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index e41699ab86c..db620a8df4c 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -344,7 +344,7 @@ fd_screen_get_shader_param(struct pipe_screen *pscreen, * into per-generation backend? */ static int -fd_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, +fd_get_compute_param(struct pipe_screen *pscreen, enum pipe_compute_cap param, void *ret) { struct fd_screen *screen = fd_screen(pscreen); diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index 29c6ead4acb..3c04ef306de 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -274,7 +274,6 @@ iris_get_shader_param(struct pipe_screen *pscreen, static int iris_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index afc6e29f9b0..d22af6248fe 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -175,7 +175,6 @@ llvmpipe_get_shader_param(struct pipe_screen *screen, static int llvmpipe_get_compute_param(struct pipe_screen *_screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 87753505a1d..08d6f4aff0c 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -175,7 +175,6 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, static int nv50_screen_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *data) { struct nv50_screen *screen = nv50_screen(pscreen); diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index d7081ade464..98e7eb27a08 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -192,7 +192,6 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen, static int nvc0_screen_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *data) { struct nvc0_screen *screen = nvc0_screen(pscreen); diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 726ddbe5a13..1bcf04c630c 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -448,7 +448,6 @@ panfrost_is_dmabuf_modifier_supported(struct pipe_screen *screen, static int panfrost_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { struct panfrost_device *dev = pan_device(pscreen); diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index cf3b9b08b18..796174e5d0e 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -269,7 +269,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, case PIPE_SHADER_CAP_MAX_CONST_BUFFER0_SIZE: if (shader == PIPE_SHADER_COMPUTE) { uint64_t max_const_buffer_size; - pscreen->get_compute_param(pscreen, PIPE_SHADER_IR_NIR, + pscreen->get_compute_param(pscreen, PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE, &max_const_buffer_size); return MIN2(max_const_buffer_size, INT_MAX); diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index 9d3cee9f27c..024e8445a8a 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -850,7 +850,6 @@ const char *r600_get_llvm_processor_name(enum radeon_family family) } static int r600_get_compute_param(struct pipe_screen *screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { @@ -929,7 +928,7 @@ static int r600_get_compute_param(struct pipe_screen *screen, uint64_t *max_global_size = ret; uint64_t max_mem_alloc_size; - r600_get_compute_param(screen, ir_type, + r600_get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE, &max_mem_alloc_size); diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index ca8279a129d..760c4335515 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -812,7 +812,7 @@ static bool si_vid_is_target_buffer_supported(struct pipe_screen *screen, return si_vid_is_format_supported(screen, format, profile, entrypoint); } -static int si_get_compute_param(struct pipe_screen *screen, enum pipe_shader_ir ir_type, +static int si_get_compute_param(struct pipe_screen *screen, enum pipe_compute_cap param, void *ret) { struct si_screen *sscreen = (struct si_screen *)screen; @@ -891,7 +891,7 @@ static int si_get_compute_param(struct pipe_screen *screen, enum pipe_shader_ir uint64_t *max_global_size = ret; uint64_t max_mem_alloc_size; - si_get_compute_param(screen, ir_type, PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE, + si_get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE, &max_mem_alloc_size); /* In OpenCL, the MAX_MEM_ALLOC_SIZE must be at least diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index b31978c22d6..ff3b9ab6768 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -414,7 +414,6 @@ softpipe_flush_frontbuffer(struct pipe_screen *_screen, static int softpipe_get_compute_param(struct pipe_screen *_screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 6592c515c8e..98188eec411 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -470,7 +470,6 @@ svga_get_shader_param(struct pipe_screen *screen, enum pipe_shader_type shader, static int svga_sm5_get_compute_param(struct pipe_screen *screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/tegra/tegra_screen.c b/src/gallium/drivers/tegra/tegra_screen.c index 28faddeebfc..45e2786120a 100644 --- a/src/gallium/drivers/tegra/tegra_screen.c +++ b/src/gallium/drivers/tegra/tegra_screen.c @@ -95,13 +95,12 @@ tegra_screen_get_video_param(struct pipe_screen *pscreen, static int tegra_screen_get_compute_param(struct pipe_screen *pscreen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *retp) { struct tegra_screen *screen = to_tegra_screen(pscreen); - return screen->gpu->get_compute_param(screen->gpu, ir_type, param, + return screen->gpu->get_compute_param(screen->gpu, param, retp); } diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c index 5abd6ee2bbe..ba54836e291 100644 --- a/src/gallium/drivers/v3d/v3d_screen.c +++ b/src/gallium/drivers/v3d/v3d_screen.c @@ -219,7 +219,7 @@ v3d_screen_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type s } static int -v3d_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, +v3d_get_compute_param(struct pipe_screen *pscreen, enum pipe_compute_cap param, void *ret) { struct v3d_screen *screen = v3d_screen(pscreen); diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index 20887c2784e..faf9adccdf1 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -278,7 +278,6 @@ virgl_get_video_param(struct pipe_screen *screen, static int virgl_get_compute_param(struct pipe_screen *screen, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret) { diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index e42355b70b8..300272d192d 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -450,7 +450,7 @@ zink_screen_get_pipeline_cache(struct zink_screen *screen, struct zink_program * } static int -zink_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, +zink_get_compute_param(struct pipe_screen *pscreen, enum pipe_compute_cap param, void *ret) { struct zink_screen *screen = zink_screen(pscreen); diff --git a/src/gallium/frontends/clover/core/device.cpp b/src/gallium/frontends/clover/core/device.cpp index 9b05d5349f3..e01c8840ca4 100644 --- a/src/gallium/frontends/clover/core/device.cpp +++ b/src/gallium/frontends/clover/core/device.cpp @@ -36,12 +36,12 @@ using namespace clover; namespace { template std::vector - get_compute_param(pipe_screen *pipe, pipe_shader_ir ir_format, + get_compute_param(pipe_screen *pipe, pipe_compute_cap cap) { - int sz = pipe->get_compute_param(pipe, ir_format, cap, NULL); + int sz = pipe->get_compute_param(pipe, cap, NULL); std::vector v(sz / sizeof(T)); - pipe->get_compute_param(pipe, ir_format, cap, &v.front()); + pipe->get_compute_param(pipe, cap, &v.front()); return v; } @@ -269,19 +269,19 @@ device::max_samplers() const { cl_ulong device::max_mem_global() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE)[0]; } cl_ulong device::max_mem_local() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE)[0]; } cl_ulong device::max_mem_input() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_INPUT_SIZE)[0]; } @@ -300,24 +300,24 @@ device::max_const_buffers() const { size_t device::max_threads_per_block() const { return get_compute_param( - pipe, ir_format(), PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK_CLOVER)[0]; + pipe, PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK_CLOVER)[0]; } cl_ulong device::max_mem_alloc_size() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE)[0]; } cl_uint device::max_clock_frequency() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_CLOCK_FREQUENCY)[0]; } cl_uint device::max_compute_units() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_COMPUTE_UNITS)[0]; } @@ -328,7 +328,7 @@ device::max_printf_buffer_size() const { bool device::image_support() const { - bool supports_images = get_compute_param(pipe, ir_format(), + bool supports_images = get_compute_param(pipe, PIPE_COMPUTE_CAP_IMAGES_SUPPORTED)[0]; if (!supports_images) return false; @@ -414,7 +414,7 @@ device::allows_user_pointers() const { std::vector device::max_block_size() const { - auto v = get_compute_param(pipe, ir_format(), + auto v = get_compute_param(pipe, PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE_CLOVER); return { v.begin(), v.end() }; } @@ -422,7 +422,7 @@ device::max_block_size() const { cl_uint device::subgroup_size() const { cl_uint subgroup_sizes = - get_compute_param(pipe, ir_format(), PIPE_COMPUTE_CAP_SUBGROUP_SIZES)[0]; + get_compute_param(pipe, PIPE_COMPUTE_CAP_SUBGROUP_SIZES)[0]; if (!subgroup_sizes) return 0; return 1 << (util_last_bit(subgroup_sizes) - 1); @@ -430,7 +430,7 @@ device::subgroup_size() const { cl_uint device::address_bits() const { - return get_compute_param(pipe, ir_format(), + return get_compute_param(pipe, PIPE_COMPUTE_CAP_ADDRESS_BITS)[0]; } @@ -453,7 +453,7 @@ device::ir_format() const { std::string device::ir_target() const { std::vector target = get_compute_param( - pipe, ir_format(), PIPE_COMPUTE_CAP_IR_TARGET); + pipe, PIPE_COMPUTE_CAP_IR_TARGET); return { target.data() }; } diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index ad76630469a..993c3c7b9df 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -782,14 +782,14 @@ lvp_get_properties(const struct lvp_physical_device *device, struct vk_propertie uint64_t grid_size[3], block_size[3]; uint64_t max_threads_per_block, max_local_size; - device->pscreen->get_compute_param(device->pscreen, PIPE_SHADER_IR_NIR, + device->pscreen->get_compute_param(device->pscreen, PIPE_COMPUTE_CAP_MAX_GRID_SIZE, grid_size); - device->pscreen->get_compute_param(device->pscreen, PIPE_SHADER_IR_NIR, + device->pscreen->get_compute_param(device->pscreen, PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE, block_size); - device->pscreen->get_compute_param(device->pscreen, PIPE_SHADER_IR_NIR, + device->pscreen->get_compute_param(device->pscreen, PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK, &max_threads_per_block); - device->pscreen->get_compute_param(device->pscreen, PIPE_SHADER_IR_NIR, + device->pscreen->get_compute_param(device->pscreen, PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE, &max_local_size); diff --git a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs index d20955be9b4..ca28f937f60 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs @@ -298,7 +298,6 @@ impl PipeScreen { unsafe { self.screen().get_compute_param.unwrap()( self.screen.as_ptr(), - pipe_shader_ir::PIPE_SHADER_IR_NIR, cap, ptr, ) diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index e1d90deeed1..faeda157d6c 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -151,8 +151,6 @@ struct pipe_screen { /** * Query a compute-specific capability/parameter/limit. - * \param ir_type shader IR type for which the param applies, or don't care - * if the param is not shader related * \param param one of PIPE_COMPUTE_CAP_x * \param ret pointer to a preallocated buffer that will be * initialized to the parameter value, or NULL. @@ -160,7 +158,6 @@ struct pipe_screen { * returned. */ int (*get_compute_param)(struct pipe_screen *, - enum pipe_shader_ir ir_type, enum pipe_compute_cap param, void *ret); diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 7ce1828d303..46383066d04 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1668,14 +1668,14 @@ void st_init_extensions(struct pipe_screen *screen, uint64_t grid_size[3], block_size[3]; uint64_t max_local_size, max_threads_per_block; - screen->get_compute_param(screen, PIPE_SHADER_IR_NIR, + screen->get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_GRID_SIZE, grid_size); - screen->get_compute_param(screen, PIPE_SHADER_IR_NIR, + screen->get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE, block_size); - screen->get_compute_param(screen, PIPE_SHADER_IR_NIR, + screen->get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK, &max_threads_per_block); - screen->get_compute_param(screen, PIPE_SHADER_IR_NIR, + screen->get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE, &max_local_size); @@ -1696,7 +1696,7 @@ void st_init_extensions(struct pipe_screen *screen, if (extensions->ARB_compute_shader) { uint64_t max_variable_threads_per_block = 0; - screen->get_compute_param(screen, PIPE_SHADER_IR_NIR, + screen->get_compute_param(screen, PIPE_COMPUTE_CAP_MAX_VARIABLE_THREADS_PER_BLOCK, &max_variable_threads_per_block);