On Fri, Jun 15, 2018 at 4:24 PM, Rhys Perry <[email protected]> wrote: > Signed-off-by: Rhys Perry <[email protected]> > --- > src/gallium/auxiliary/gallivm/lp_bld_limits.h | 1 + > src/gallium/auxiliary/tgsi/tgsi_exec.h | 1 + > src/gallium/drivers/nouveau/nv30/nv30_screen.c | 1 + > src/gallium/drivers/nouveau/nv50/nv50_screen.c | 1 + > src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 1 + > src/gallium/drivers/r300/r300_screen.c | 2 ++ > src/gallium/drivers/r600/r600_pipe.c | 1 + > src/gallium/drivers/radeonsi/si_get.c | 1 + > src/gallium/drivers/svga/svga_screen.c | 1 + > src/gallium/drivers/v3d/v3d_screen.c | 1 + > src/gallium/drivers/vc4/vc4_screen.c | 1 + > src/gallium/drivers/virgl/virgl_screen.c | 1 + > src/gallium/include/pipe/p_defines.h | 1 + > 13 files changed, 14 insertions(+) > > diff --git a/src/gallium/auxiliary/gallivm/lp_bld_limits.h > b/src/gallium/auxiliary/gallivm/lp_bld_limits.h > index c7755bfe1d..4e0b19f650 100644 > --- a/src/gallium/auxiliary/gallivm/lp_bld_limits.h > +++ b/src/gallium/auxiliary/gallivm/lp_bld_limits.h > @@ -120,6 +120,7 @@ gallivm_get_shader_param(enum pipe_shader_cap param) > return 1; > case PIPE_SHADER_CAP_INT64_ATOMICS: > case PIPE_SHADER_CAP_FP16: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: > return PIPE_MAX_SAMPLERS; > diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h > b/src/gallium/auxiliary/tgsi/tgsi_exec.h > index 0fac7ea456..30253426b3 100644 > --- a/src/gallium/auxiliary/tgsi/tgsi_exec.h > +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h > @@ -522,6 +522,7 @@ tgsi_exec_get_shader_param(enum pipe_shader_cap param) > return 1; > case PIPE_SHADER_CAP_INT64_ATOMICS: > case PIPE_SHADER_CAP_FP16: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: > return PIPE_MAX_SAMPLERS; > diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > index a77f70e6bb..57b2952ae5 100644 > --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > @@ -343,6 +343,7 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > default: > debug_printf("unknown vertex shader param %d\n", param); > diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > index 2495a545fd..1139b02eb4 100644 > --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > @@ -385,6 +385,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, > case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > default: > NOUVEAU_ERR("unknown PIPE_SHADER_CAP %d\n", param); > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > index f679cbdba3..412c5bf54d 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > @@ -422,6 +422,7 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen, > case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: > case PIPE_SHADER_CAP_INT64_ATOMICS: > case PIPE_SHADER_CAP_FP16: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > return 0; > diff --git a/src/gallium/drivers/r300/r300_screen.c > b/src/gallium/drivers/r300/r300_screen.c > index 459349e821..da526612d3 100644 > --- a/src/gallium/drivers/r300/r300_screen.c > +++ b/src/gallium/drivers/r300/r300_screen.c > @@ -378,6 +378,7 @@ static int r300_get_shader_param(struct pipe_screen > *pscreen, > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT: > return 32; > @@ -444,6 +445,7 @@ static int r300_get_shader_param(struct pipe_screen > *pscreen, > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT: > return 32; > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index ff7306998b..209bdf99e0 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -634,6 +634,7 @@ static int r600_get_shader_param(struct pipe_screen* > pscreen, > case PIPE_SHADER_CAP_TGSI_LDEXP_SUPPORTED: > case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS: > case PIPE_SHADER_CAP_MAX_SHADER_IMAGES: > diff --git a/src/gallium/drivers/radeonsi/si_get.c > b/src/gallium/drivers/radeonsi/si_get.c > index 01050cf02b..4ef6dbf574 100644 > --- a/src/gallium/drivers/radeonsi/si_get.c > +++ b/src/gallium/drivers/radeonsi/si_get.c > @@ -491,6 +491,7 @@ static int si_get_shader_param(struct pipe_screen* > pscreen, > case PIPE_SHADER_CAP_SUPPORTED_IRS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > } > return 0; > diff --git a/src/gallium/drivers/svga/svga_screen.c > b/src/gallium/drivers/svga/svga_screen.c > index 2744f3100e..12f0cea682 100644 > --- a/src/gallium/drivers/svga/svga_screen.c > +++ b/src/gallium/drivers/svga/svga_screen.c > @@ -621,6 +621,7 @@ vgpu9_get_shader_param(struct pipe_screen *screen, > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT: > return 32; > diff --git a/src/gallium/drivers/v3d/v3d_screen.c > b/src/gallium/drivers/v3d/v3d_screen.c > index d578265eef..b1f156d5e5 100644 > --- a/src/gallium/drivers/v3d/v3d_screen.c > +++ b/src/gallium/drivers/v3d/v3d_screen.c > @@ -409,6 +409,7 @@ v3d_screen_get_shader_param(struct pipe_screen *pscreen, > unsigned shader, > case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: > case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS: > diff --git a/src/gallium/drivers/vc4/vc4_screen.c > b/src/gallium/drivers/vc4/vc4_screen.c > index 6415d95746..29fc22b112 100644 > --- a/src/gallium/drivers/vc4/vc4_screen.c > +++ b/src/gallium/drivers/vc4/vc4_screen.c > @@ -463,6 +463,7 @@ vc4_screen_get_shader_param(struct pipe_screen *pscreen, > case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > return 0; > default: > fprintf(stderr, "unknown shader param %d\n", param); > diff --git a/src/gallium/drivers/virgl/virgl_screen.c > b/src/gallium/drivers/virgl/virgl_screen.c > index e8d1c75177..58e0d1da4a 100644 > --- a/src/gallium/drivers/virgl/virgl_screen.c > +++ b/src/gallium/drivers/virgl/virgl_screen.c > @@ -363,6 +363,7 @@ virgl_get_shader_param(struct pipe_screen *screen, > case PIPE_SHADER_CAP_FP16: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: > case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: > + case PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED: > default: > return 0; > } > diff --git a/src/gallium/include/pipe/p_defines.h > b/src/gallium/include/pipe/p_defines.h > index 6cc73a31bf..7865bcf30b 100644 > --- a/src/gallium/include/pipe/p_defines.h > +++ b/src/gallium/include/pipe/p_defines.h > @@ -897,6 +897,7 @@ enum pipe_shader_cap > PIPE_SHADER_CAP_TGSI_LDEXP_SUPPORTED, > PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS, > PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS, > + PIPE_SHADER_CAP_IMAGE_LOAD_FORMATTED,
This should probably be a PIPE_CAP -- it's not really a per-stage thing. I don't think it's going to be useful to allow stage A to support it but stage B to not support it. And it feeds nicely into testing for extensions in st/mesa. -ilia _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
