On Sat, Oct 10, 2015 at 9:09 PM, Marek Olšák <mar...@gmail.com> wrote: > From: Marek Olšák <marek.ol...@amd.com> > > I'll let drivers figure out how to do it. > --- > src/gallium/docs/source/screen.rst | 2 ++ > src/gallium/drivers/freedreno/freedreno_screen.c | 1 + > src/gallium/drivers/i915/i915_screen.c | 1 + > src/gallium/drivers/ilo/ilo_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_pipe.c | 1 + > src/gallium/drivers/softpipe/sp_screen.c | 1 + > src/gallium/drivers/svga/svga_screen.c | 1 + > src/gallium/drivers/vc4/vc4_screen.c | 1 + > src/gallium/include/pipe/p_defines.h | 1 + > 15 files changed, 16 insertions(+) > > diff --git a/src/gallium/docs/source/screen.rst > b/src/gallium/docs/source/screen.rst > index e08844b..72f7596 100644 > --- a/src/gallium/docs/source/screen.rst > +++ b/src/gallium/docs/source/screen.rst > @@ -276,6 +276,8 @@ The integer capabilities: > GL4 hardware will likely need to emulate it with a shader variant, or by > selecting the interpolation weights with a conditional assignment > in the shader. > +* ``PIPE_CAP_SHAREABLE_SHADERS``: Whether shader CSOs can be used by any > + pipe_context.
An extra sentence along the lines that drivers supporting this cap can save pipe->screen ptr but not pipe ptr in the CSO might not hurt.. other than that nitpick, lgtm.. BR, -R > > > > diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c > b/src/gallium/drivers/freedreno/freedreno_screen.c > index 0d01005..2e8bf47 100644 > --- a/src/gallium/drivers/freedreno/freedreno_screen.c > +++ b/src/gallium/drivers/freedreno/freedreno_screen.c > @@ -236,6 +236,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > case PIPE_CAP_MAX_VIEWPORTS: > diff --git a/src/gallium/drivers/i915/i915_screen.c > b/src/gallium/drivers/i915/i915_screen.c > index 9d6b3d3..c91408d 100644 > --- a/src/gallium/drivers/i915/i915_screen.c > +++ b/src/gallium/drivers/i915/i915_screen.c > @@ -249,6 +249,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap > cap) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: > diff --git a/src/gallium/drivers/ilo/ilo_screen.c > b/src/gallium/drivers/ilo/ilo_screen.c > index 76812a6..acf688f 100644 > --- a/src/gallium/drivers/ilo/ilo_screen.c > +++ b/src/gallium/drivers/ilo/ilo_screen.c > @@ -471,6 +471,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > case PIPE_CAP_VENDOR_ID: > diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c > b/src/gallium/drivers/llvmpipe/lp_screen.c > index 50c3781..e2ed267 100644 > --- a/src/gallium/drivers/llvmpipe/lp_screen.c > +++ b/src/gallium/drivers/llvmpipe/lp_screen.c > @@ -298,6 +298,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > 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 335c163..d4cf143 100644 > --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > @@ -171,6 +171,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > 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 812b246..a4431f2 100644 > --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > @@ -216,6 +216,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_DEVICE_RESET_STATUS_QUERY: > case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > 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 afd91e6..57c9c6c 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > @@ -202,6 +202,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: > case PIPE_CAP_DEVICE_RESET_STATUS_QUERY: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > 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 1165ac8..c1c522b 100644 > --- a/src/gallium/drivers/r300/r300_screen.c > +++ b/src/gallium/drivers/r300/r300_screen.c > @@ -197,6 +197,7 @@ static int r300_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > /* SWTCL-only features. */ > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index efb4889..89f592c 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -343,6 +343,7 @@ static int r600_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > /* Stream output. */ > diff --git a/src/gallium/drivers/radeonsi/si_pipe.c > b/src/gallium/drivers/radeonsi/si_pipe.c > index a0283b7..aa5a9ea 100644 > --- a/src/gallium/drivers/radeonsi/si_pipe.c > +++ b/src/gallium/drivers/radeonsi/si_pipe.c > @@ -337,6 +337,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum > pipe_cap param) > case PIPE_CAP_TEXTURE_GATHER_OFFSETS: > case PIPE_CAP_SAMPLER_VIEW_TARGET: > case PIPE_CAP_VERTEXID_NOBASE: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: > diff --git a/src/gallium/drivers/softpipe/sp_screen.c > b/src/gallium/drivers/softpipe/sp_screen.c > index d468cf4..e7006d2 100644 > --- a/src/gallium/drivers/softpipe/sp_screen.c > +++ b/src/gallium/drivers/softpipe/sp_screen.c > @@ -248,6 +248,7 @@ softpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > } > /* should only get here on unhandled cases */ > diff --git a/src/gallium/drivers/svga/svga_screen.c > b/src/gallium/drivers/svga/svga_screen.c > index e0a2878..4ddb9c0 100644 > --- a/src/gallium/drivers/svga/svga_screen.c > +++ b/src/gallium/drivers/svga/svga_screen.c > @@ -381,6 +381,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > } > > diff --git a/src/gallium/drivers/vc4/vc4_screen.c > b/src/gallium/drivers/vc4/vc4_screen.c > index 739ac86..3b12464 100644 > --- a/src/gallium/drivers/vc4/vc4_screen.c > +++ b/src/gallium/drivers/vc4/vc4_screen.c > @@ -182,6 +182,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_DEPTH_BOUNDS_TEST: > case PIPE_CAP_TGSI_TXQS: > case PIPE_CAP_FORCE_PERSAMPLE_INTERP: > + case PIPE_CAP_SHAREABLE_SHADERS: > return 0; > > /* Stream output. */ > diff --git a/src/gallium/include/pipe/p_defines.h > b/src/gallium/include/pipe/p_defines.h > index a494715..3a1265d 100644 > --- a/src/gallium/include/pipe/p_defines.h > +++ b/src/gallium/include/pipe/p_defines.h > @@ -632,6 +632,7 @@ enum pipe_cap > PIPE_CAP_DEPTH_BOUNDS_TEST, > PIPE_CAP_TGSI_TXQS, > PIPE_CAP_FORCE_PERSAMPLE_INTERP, > + PIPE_CAP_SHAREABLE_SHADERS, > }; > > #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0) > -- > 2.1.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
