Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek
On Fri, Oct 21, 2016 at 9:07 AM, Ilia Mirkin <imir...@alum.mit.edu> wrote: > This allows the driver to signal that it can't handle random > interleaving of attributes across buffers. This is required for > ARB_transform_feedback3, and it's initialized to whatever the previous > value of PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME was except for nv50 where > it is disabled. Note that the proprietary drivers never expose > ARB_transform_feedback3 on any GT21x's (where nouveau previously did), > and after some effort I was unable to get it to work. > > Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> > --- > docs/features.txt | 2 +- > src/gallium/docs/source/screen.rst | 3 +++ > 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/swr/swr_screen.cpp | 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 + > src/mesa/state_tracker/st_extensions.c | 2 +- > 19 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/docs/features.txt b/docs/features.txt > index a677bfb..2c6691f 100644 > --- a/docs/features.txt > +++ b/docs/features.txt > @@ -133,7 +133,7 @@ GL 4.0, GLSL 4.00 --- all DONE: i965/gen8+, nvc0, r600, > radeonsi > GL_ARB_texture_gather DONE (i965/gen6+, > nv50, llvmpipe, softpipe, swr) > GL_ARB_texture_query_lod DONE (i965, nv50, > softpipe) > GL_ARB_transform_feedback2 DONE (i965/gen7+, > nv50, llvmpipe, softpipe, swr) > - GL_ARB_transform_feedback3 DONE (i965/gen7+, > nv50, llvmpipe, softpipe, swr) > + GL_ARB_transform_feedback3 DONE (i965/gen7+, > llvmpipe, softpipe, swr) > > > GL 4.1, GLSL 4.10 --- all DONE: i965/gen8+, nvc0, r600, radeonsi > diff --git a/src/gallium/docs/source/screen.rst > b/src/gallium/docs/source/screen.rst > index d79e75e..6ad2bec 100644 > --- a/src/gallium/docs/source/screen.rst > +++ b/src/gallium/docs/source/screen.rst > @@ -361,6 +361,9 @@ The integer capabilities: > equal interpolation qualifiers. > Components may overlap, notably when the gaps in an array of dvec3 are > filled in. > +* ``PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS``: Whether interleaved stream > + output mode is able to interleave across buffers. This is required for > + ARB_transform_feedback3. > > > .. _pipe_capf: > diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c > b/src/gallium/drivers/freedreno/freedreno_screen.c > index 1f7c2a5..97da0d7 100644 > --- a/src/gallium/drivers/freedreno/freedreno_screen.c > +++ b/src/gallium/drivers/freedreno/freedreno_screen.c > @@ -307,6 +307,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > return PIPE_MAX_SO_BUFFERS; > return 0; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > if (is_ir3(screen)) > return 1; > return 0; > diff --git a/src/gallium/drivers/i915/i915_screen.c > b/src/gallium/drivers/i915/i915_screen.c > index 003f855..bfadca3 100644 > --- a/src/gallium/drivers/i915/i915_screen.c > +++ b/src/gallium/drivers/i915/i915_screen.c > @@ -282,6 +282,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap > cap) > > case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY: > case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: > case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: > diff --git a/src/gallium/drivers/ilo/ilo_screen.c > b/src/gallium/drivers/ilo/ilo_screen.c > index 1904cd6..f3f182c 100644 > --- a/src/gallium/drivers/ilo/ilo_screen.c > +++ b/src/gallium/drivers/ilo/ilo_screen.c > @@ -399,6 +399,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: > return ILO_MAX_SO_BINDINGS; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > if (ilo_dev_gen(&is->dev) >= ILO_GEN(7)) > return is->dev.has_gen7_sol_reset; > else > diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c > b/src/gallium/drivers/llvmpipe/lp_screen.c > index 3e4f1ef..4b502f0 100644 > --- a/src/gallium/drivers/llvmpipe/lp_screen.c > +++ b/src/gallium/drivers/llvmpipe/lp_screen.c > @@ -200,6 +200,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE: > return 2048; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > return 1; > case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: > return 0; > diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > index 961c22c..96708c0 100644 > --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c > +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c > @@ -119,6 +119,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR: /* XXX: yes? */ > case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_MIN_TEXEL_OFFSET: > case PIPE_CAP_MAX_TEXEL_OFFSET: > case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET: > diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > index 59f7034..42aed81 100644 > --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c > +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c > @@ -256,6 +256,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_TGSI_VOTE: > case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: > case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > 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 0ec918e..b8fb50b 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > @@ -189,6 +189,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_QUERY_TIME_ELAPSED: > case PIPE_CAP_OCCLUSION_QUERY: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_QUERY_PIPELINE_STATISTICS: > case PIPE_CAP_BLEND_EQUATION_SEPARATE: > case PIPE_CAP_INDEP_BLEND_ENABLE: > diff --git a/src/gallium/drivers/r300/r300_screen.c > b/src/gallium/drivers/r300/r300_screen.c > index 0b147f9..1e1dc87 100644 > --- a/src/gallium/drivers/r300/r300_screen.c > +++ b/src/gallium/drivers/r300/r300_screen.c > @@ -165,6 +165,7 @@ static int r300_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS: > case PIPE_CAP_MAX_VERTEX_STREAMS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: > case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: > case PIPE_CAP_COMPUTE: > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index 95c6d99..970a20e 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -385,6 +385,7 @@ static int r600_get_param(struct pipe_screen* pscreen, > enum pipe_cap param) > case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: > return rscreen->b.has_streamout ? 4 : 0; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > return rscreen->b.has_streamout ? 1 : 0; > case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: > case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: > diff --git a/src/gallium/drivers/radeonsi/si_pipe.c > b/src/gallium/drivers/radeonsi/si_pipe.c > index 10a2ada..ed186d9 100644 > --- a/src/gallium/drivers/radeonsi/si_pipe.c > +++ b/src/gallium/drivers/radeonsi/si_pipe.c > @@ -479,6 +479,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum > pipe_cap param) > case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: > return sscreen->b.has_streamout ? 4 : 0; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > return sscreen->b.has_streamout ? 1 : 0; > case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: > case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: > diff --git a/src/gallium/drivers/softpipe/sp_screen.c > b/src/gallium/drivers/softpipe/sp_screen.c > index 6244987..275adab 100644 > --- a/src/gallium/drivers/softpipe/sp_screen.c > +++ b/src/gallium/drivers/softpipe/sp_screen.c > @@ -163,6 +163,7 @@ softpipe_get_param(struct pipe_screen *screen, enum > pipe_cap param) > case PIPE_CAP_USER_INDEX_BUFFERS: > case PIPE_CAP_USER_CONSTANT_BUFFERS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: > return 1; > case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: > diff --git a/src/gallium/drivers/svga/svga_screen.c > b/src/gallium/drivers/svga/svga_screen.c > index f969dd3..67a35cf 100644 > --- a/src/gallium/drivers/svga/svga_screen.c > +++ b/src/gallium/drivers/svga/svga_screen.c > @@ -298,6 +298,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: > return sws->have_vgpu10 ? SVGA3D_MAX_STREAMOUT_DECLS : 0; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > return 0; > case PIPE_CAP_TEXTURE_MULTISAMPLE: > return svgascreen->ms_samples ? 1 : 0; > diff --git a/src/gallium/drivers/swr/swr_screen.cpp > b/src/gallium/drivers/swr/swr_screen.cpp > index 2495efb..704a684 100644 > --- a/src/gallium/drivers/swr/swr_screen.cpp > +++ b/src/gallium/drivers/swr/swr_screen.cpp > @@ -248,6 +248,7 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_USER_INDEX_BUFFERS: > case PIPE_CAP_USER_CONSTANT_BUFFERS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: > return 1; > case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: > diff --git a/src/gallium/drivers/vc4/vc4_screen.c > b/src/gallium/drivers/vc4/vc4_screen.c > index 72fd09a..d15ce17 100644 > --- a/src/gallium/drivers/vc4/vc4_screen.c > +++ b/src/gallium/drivers/vc4/vc4_screen.c > @@ -244,6 +244,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > /* Stream output. */ > case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: > case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: > return 0; > diff --git a/src/gallium/drivers/virgl/virgl_screen.c > b/src/gallium/drivers/virgl/virgl_screen.c > index 81935ec..2817809 100644 > --- a/src/gallium/drivers/virgl/virgl_screen.c > +++ b/src/gallium/drivers/virgl/virgl_screen.c > @@ -148,6 +148,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap > param) > case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: > return 16; > case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: > + case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: > return vscreen->caps.caps.v1.bset.streamout_pause_resume; > case PIPE_CAP_START_INSTANCE: > return vscreen->caps.caps.v1.bset.start_instance; > diff --git a/src/gallium/include/pipe/p_defines.h > b/src/gallium/include/pipe/p_defines.h > index 746a822..69d290c 100644 > --- a/src/gallium/include/pipe/p_defines.h > +++ b/src/gallium/include/pipe/p_defines.h > @@ -739,6 +739,7 @@ enum pipe_cap > PIPE_CAP_VIEWPORT_SUBPIXEL_BITS, > PIPE_CAP_MIXED_COLOR_DEPTH_BITS, > PIPE_CAP_TGSI_ARRAY_COMPONENTS, > + PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS, > }; > > #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0) > diff --git a/src/mesa/state_tracker/st_extensions.c > b/src/mesa/state_tracker/st_extensions.c > index a8fb70f..c51cc12 100644 > --- a/src/mesa/state_tracker/st_extensions.c > +++ b/src/mesa/state_tracker/st_extensions.c > @@ -615,7 +615,7 @@ void st_init_extensions(struct pipe_screen *screen, > { o(ARB_texture_view), PIPE_CAP_SAMPLER_VIEW_TARGET > }, > { o(ARB_timer_query), PIPE_CAP_QUERY_TIMESTAMP > }, > { o(ARB_transform_feedback2), > PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME }, > - { o(ARB_transform_feedback3), > PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME }, > + { o(ARB_transform_feedback3), > PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS }, > > { o(EXT_blend_equation_separate), > PIPE_CAP_BLEND_EQUATION_SEPARATE }, > { o(EXT_depth_bounds_test), PIPE_CAP_DEPTH_BOUNDS_TEST > }, > -- > 2.7.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev