[Mesa-dev] [PATCH] gallium: add geometry shader output limits
Roland Scheidegger
sroland at vmware.com
Wed Feb 5 15:45:09 PST 2014
Am 05.02.2014 22:58, schrieb Grigori Goronzy:
> ---
> src/gallium/drivers/freedreno/freedreno_screen.c | 5 +++++
> src/gallium/drivers/i915/i915_screen.c | 5 +++++
> src/gallium/drivers/ilo/ilo_screen.c | 3 +++
> src/gallium/drivers/llvmpipe/lp_screen.c | 3 +++
> src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 ++
> src/gallium/drivers/nouveau/nv50/nv50_screen.c | 3 +++
> src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 3 +++
> src/gallium/drivers/r300/r300_screen.c | 2 ++
> src/gallium/drivers/r600/r600_pipe.c | 6 ++++++
> src/gallium/drivers/radeonsi/si_pipe.c | 6 ++++++
> src/gallium/drivers/softpipe/sp_screen.c | 3 +++
> src/gallium/drivers/svga/svga_screen.c | 2 ++
> src/gallium/include/pipe/p_defines.h | 4 +++-
> src/mesa/state_tracker/st_extensions.c | 2 ++
> 14 files changed, 48 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
> index aa294b3..e1b5dae 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -212,6 +212,11 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return 0;
>
> + /* Geometry shader output, unsupported. */
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 0;
> +
> /* Texturing. */
> case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
> case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
> diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
> index a658b1b..9f08f86 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -257,6 +257,11 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap)
> case PIPE_CAP_MAX_RENDER_TARGETS:
> return 1;
>
> + /* Geometry shader output, unsupported. */
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 0;
> +
> /* Fragment coordinate conventions. */
> case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT:
> case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER:
> diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
> index bc8f62d..9c363ac 100644
> --- a/src/gallium/drivers/ilo/ilo_screen.c
> +++ b/src/gallium/drivers/ilo/ilo_screen.c
> @@ -372,6 +372,9 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param)
> return ILO_MAX_SO_BINDINGS / ILO_MAX_SO_BUFFERS;
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return ILO_MAX_SO_BINDINGS;
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 0;
> case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> if (is->dev.gen >= ILO_GEN(7))
> return is->dev.has_gen7_sol_reset;
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 3f84d74..62be5c8 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -187,6 +187,9 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return 16*4;
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 0;
I think this should be 1024 for llvmpipe (for both). Not that we claim
to support GL 3.2 right now...
> case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> return 1;
> case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index 787802d..9e2a90c 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -106,6 +106,8 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_TEXEL_OFFSET:
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
> case PIPE_CAP_TEXTURE_BARRIER:
> case PIPE_CAP_SEAMLESS_CUBE_MAP:
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index 2b6ec3a..a740adf 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -141,6 +141,9 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> return 64;
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 1024;
> case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> return (class_3d >= NVA0_3D_CLASS) ? 1 : 0;
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index 752d72b..7183a2f 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -125,6 +125,9 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return 128;
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 1024;
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> case PIPE_CAP_INDEP_BLEND_ENABLE:
> case PIPE_CAP_INDEP_BLEND_FUNC:
> diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
> index 4b790af..fcb01e8 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -151,6 +151,8 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> case PIPE_CAP_FRAGMENT_COLOR_CLAMPED:
> case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
> diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
> index 6c72d07..f5f956c 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -409,6 +409,12 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return 32*4;
>
> + /* Geometry shader output. */
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + return 1024;
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 16384;
> +
> /* Texturing. */
> case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
> case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index 14dfd30..2f4098c 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -299,6 +299,12 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return sscreen->b.has_streamout ? 32*4 : 0;
>
> + /* Geometry shader output. */
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + return 1024;
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 16384;
> +
> /* Texturing. */
> case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
> case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
> index dbdbbc9..147196e 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -119,6 +119,9 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> return 16*4;
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> + return 0;
> case PIPE_CAP_PRIMITIVE_RESTART:
> return 1;
> case PIPE_CAP_SHADER_STENCIL_EXPORT:
> diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
> index 350ee5c..d5ae69a 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -251,6 +251,8 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)
> case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
> case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
> case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
> + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
> + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
> case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
> case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY:
> case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY:
> diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
> index 8d08a90..42d3d89 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -521,7 +521,9 @@ enum pipe_cap {
> PIPE_CAP_MAX_VIEWPORTS = 84,
> PIPE_CAP_ENDIANNESS = 85,
> PIPE_CAP_MIXED_FRAMEBUFFER_SIZES = 86,
> - PIPE_CAP_TGSI_VS_LAYER = 87
> + PIPE_CAP_TGSI_VS_LAYER = 87,
> + PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES = 88,
> + PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 89
> };
>
> #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 9829eb5..f9b7a44 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -262,6 +262,8 @@ void st_init_limits(struct st_context *st)
> c->Program[MESA_SHADER_VERTEX].MaxOutputComponents = c->MaxVarying * 4;
> c->Program[MESA_SHADER_GEOMETRY].MaxInputComponents = c->MaxVarying * 4;
> c->Program[MESA_SHADER_GEOMETRY].MaxOutputComponents = c->MaxVarying * 4;
> + c->MaxGeometryOutputVertices = screen->get_param(screen, PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES);
> + c->MaxGeometryTotalOutputComponents = screen->get_param(screen, PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS);
>
> c->MinProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MIN_TEXEL_OFFSET);
> c->MaxProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXEL_OFFSET);
>
Other than that looks good to me, though I wonder if you need the
PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES query since every gallium driver
has the same limit (surely because d3d10 requires that - interestingly
the intel driver can't do it since it seems to specify vertex size in
16byte units so it is limited to 256, I wonder how they made that work
with d3d10 as d3d10 has just a total limit and no separate vertices
limit). Though it might not hurt to be prepared for other hw...
Roland
More information about the mesa-dev
mailing list