You forgot to update a few PIPE_SHADER_CAP occurences. Also, documentation of all PIPE_CAPs is typically added into screen.rst. Other than those:
Reviewed-by: Marek Olšák <[email protected]> Marek On Fri, Jun 15, 2018 at 6:06 PM, Rhys Perry <[email protected]> wrote: > Signed-off-by: Rhys Perry <[email protected]> > --- > src/gallium/drivers/etnaviv/etnaviv_screen.c | 1 + > src/gallium/drivers/freedreno/freedreno_screen.c | 1 + > src/gallium/drivers/i915/i915_screen.c | 1 + > src/gallium/drivers/llvmpipe/lp_screen.c | 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 | 1 + > src/gallium/drivers/r600/r600_pipe.c | 1 + > src/gallium/drivers/radeonsi/si_get.c | 1 + > src/gallium/drivers/softpipe/sp_screen.c | 1 + > src/gallium/drivers/svga/svga_screen.c | 1 + > src/gallium/drivers/swr/swr_screen.cpp | 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 + > 17 files changed, 17 insertions(+) > > diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c > b/src/gallium/drivers/etnaviv/etnaviv_screen.c > index e031807117..3fc7e9e47b 100644 > --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c > +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c > @@ -281,6 +281,7 @@ etna_screen_get_param(struct pipe_screen *pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > case PIPE_CAP_PACKED_UNIFORMS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > /* Stream output. */ > diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c > b/src/gallium/drivers/freedreno/freedreno_screen.c > index a414cb6d60..3d0d2bb60f 100644 > --- a/src/gallium/drivers/freedreno/freedreno_screen.c > +++ b/src/gallium/drivers/freedreno/freedreno_screen.c > @@ -347,6 +347,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_CONTEXT_PRIORITY_MASK: > diff --git a/src/gallium/drivers/i915/i915_screen.c > b/src/gallium/drivers/i915/i915_screen.c > index b08d2283e7..d879c8c1ba 100644 > --- a/src/gallium/drivers/i915/i915_screen.c > +++ b/src/gallium/drivers/i915/i915_screen.c > @@ -333,6 +333,7 @@ i915_get_param(struct pipe_screen *screen, enum > pipe_cap cap) > case PIPE_CAP_FENCE_SIGNAL: > case PIPE_CAP_CONSTBUF0_FLAGS: > case PIPE_CAP_PACKED_UNIFORMS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_MAX_VIEWPORTS: > diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c > b/src/gallium/drivers/llvmpipe/lp_screen.c > index f12ad09298..ff8d10a86e 100644 > --- a/src/gallium/drivers/llvmpipe/lp_screen.c > +++ b/src/gallium/drivers/llvmpipe/lp_screen.c > @@ -370,6 +370,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > } > /* should only get here on unhandled cases */ > diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > index a77f70e6bb..bbf5d76f19 100644 > --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > @@ -236,6 +236,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_VENDOR_ID: > diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > index 2495a545fd..9e482128f4 100644 > --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > @@ -289,6 +289,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_VENDOR_ID: > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > index f679cbdba3..4c31bb4347 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > @@ -319,6 +319,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSTBUF0_FLAGS: > case PIPE_CAP_PACKED_UNIFORMS: > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_VENDOR_ID: > diff --git a/src/gallium/drivers/r300/r300_screen.c > b/src/gallium/drivers/r300/r300_screen.c > index 459349e821..6a12457aed 100644 > --- a/src/gallium/drivers/r300/r300_screen.c > +++ b/src/gallium/drivers/r300/r300_screen.c > @@ -258,6 +258,7 @@ static int r300_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > /* SWTCL-only features. */ > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index ff7306998b..9e4dae7fbe 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -428,6 +428,7 @@ static int r600_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_DOUBLES: > diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/ > radeonsi/si_get.c > index 01050cf02b..db7dc5f8e6 100644 > --- a/src/gallium/drivers/radeonsi/si_get.c > +++ b/src/gallium/drivers/radeonsi/si_get.c > @@ -257,6 +257,7 @@ static int si_get_param(struct pipe_screen *pscreen, > enum pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_FENCE_SIGNAL: > diff --git a/src/gallium/drivers/softpipe/sp_screen.c > b/src/gallium/drivers/softpipe/sp_screen.c > index f9c916d938..49ac10c2e2 100644 > --- a/src/gallium/drivers/softpipe/sp_screen.c > +++ b/src/gallium/drivers/softpipe/sp_screen.c > @@ -322,6 +322,7 @@ softpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: > return 4; > diff --git a/src/gallium/drivers/svga/svga_screen.c > b/src/gallium/drivers/svga/svga_screen.c > index 2744f3100e..1dc86cf3ff 100644 > --- a/src/gallium/drivers/svga/svga_screen.c > +++ b/src/gallium/drivers/svga/svga_screen.c > @@ -468,6 +468,7 @@ svga_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_FENCE_SIGNAL: > case PIPE_CAP_CONSTBUF0_FLAGS: > case PIPE_CAP_PACKED_UNIFORMS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > } > > diff --git a/src/gallium/drivers/swr/swr_screen.cpp > b/src/gallium/drivers/swr/swr_screen.cpp > index 091d322d38..fb7265cc79 100644 > --- a/src/gallium/drivers/swr/swr_screen.cpp > +++ b/src/gallium/drivers/swr/swr_screen.cpp > @@ -355,6 +355,7 @@ swr_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > > case PIPE_CAP_VENDOR_ID: > 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..00741eeea9 100644 > --- a/src/gallium/drivers/virgl/virgl_screen.c > +++ b/src/gallium/drivers/virgl/virgl_screen.c > @@ -291,6 +291,7 @@ virgl_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES: > case PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE: > case PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS: > + case PIPE_CAP_IMAGE_LOAD_FORMATTED: > return 0; > case PIPE_CAP_VENDOR_ID: > return 0x1af4; > diff --git a/src/gallium/include/pipe/p_defines.h > b/src/gallium/include/pipe/p_defines.h > index 6cc73a31bf..78d7a18ba7 100644 > --- a/src/gallium/include/pipe/p_defines.h > +++ b/src/gallium/include/pipe/p_defines.h > @@ -813,6 +813,7 @@ enum pipe_cap > PIPE_CAP_CONSERVATIVE_RASTER_PRE_SNAP_POINTS_LINES, > PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS, > PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE, > + PIPE_CAP_IMAGE_LOAD_FORMATTED, > }; > > /** > -- > 2.14.4 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
