Reviewed-by: Roland Scheidegger <srol...@vmware.com>
Am 03.07.2014 17:17, schrieb Ilia Mirkin:
> Now that this cap is used to determine the availability of both, adjust
> its name to reflect the new reality.
>
> Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
> ---
> src/gallium/auxiliary/util/u_blitter.c | 2 +-
> src/gallium/docs/source/screen.rst | 6 ++++--
> src/gallium/drivers/freedreno/freedreno_screen.c | 2 +-
> src/gallium/drivers/i915/i915_screen.c | 2 +-
> src/gallium/drivers/ilo/ilo_screen.c | 2 +-
> src/gallium/drivers/llvmpipe/lp_screen.c | 2 +-
> src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 +-
> src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +-
> src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +-
> src/gallium/drivers/r300/r300_screen.c | 2 +-
> src/gallium/drivers/r600/r600_pipe.c | 2 +-
> src/gallium/drivers/radeonsi/si_pipe.c | 2 +-
> src/gallium/drivers/softpipe/sp_screen.c | 2 +-
> src/gallium/drivers/svga/svga_screen.c | 2 +-
> src/gallium/include/pipe/p_defines.h | 2 +-
> src/mesa/state_tracker/st_cb_clear.c | 2 +-
> src/mesa/state_tracker/st_extensions.c | 2 +-
> 17 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_blitter.c
> b/src/gallium/auxiliary/util/u_blitter.c
> index 7b058fe..db0d1b8 100644
> --- a/src/gallium/auxiliary/util/u_blitter.c
> +++ b/src/gallium/auxiliary/util/u_blitter.c
> @@ -325,7 +325,7 @@ struct blitter_context *util_blitter_create(struct
> pipe_context *pipe)
> }
>
> if (pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_INSTANCEID) &&
> - pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_VS_LAYER)) {
> + pipe->screen->get_param(pipe->screen,
> PIPE_CAP_TGSI_VS_LAYER_VIEWPORT)) {
> ctx->vs_layered = util_make_layered_clear_vertex_shader(pipe);
> }
>
> diff --git a/src/gallium/docs/source/screen.rst
> b/src/gallium/docs/source/screen.rst
> index 2ea0da8..ba583fe 100644
> --- a/src/gallium/docs/source/screen.rst
> +++ b/src/gallium/docs/source/screen.rst
> @@ -174,8 +174,10 @@ The integer capabilities:
> * ``PIPE_CAP_MIXED_FRAMEBUFFER_SIZES``: Whether it is allowed to have
> different sizes for fb color/zs attachments. This controls whether
> ARB_framebuffer_object is provided.
> -* ``PIPE_CAP_TGSI_VS_LAYER``: Whether TGSI_SEMANTIC_LAYER is supported
> - as a vertex shader output.
> +* ``PIPE_CAP_TGSI_VS_LAYER_VIEWPORT``: Whether ``TGSI_SEMANTIC_LAYER`` and
> + ``TGSI_SEMANTIC_VIEWPORT_INDEX`` are supported as vertex shader
> + outputs. Note that the viewport will only be used if multiple viewports are
> + exposed.
> * ``PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES``: The maximum number of vertices
> output by a single invocation of a geometry shader.
> * ``PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS``: The maximum number of
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c
> b/src/gallium/drivers/freedreno/freedreno_screen.c
> index ce3cf90..c574cb8 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -207,7 +207,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_USER_INDEX_BUFFERS:
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_FAKE_SW_MSAA:
> diff --git a/src/gallium/drivers/i915/i915_screen.c
> b/src/gallium/drivers/i915/i915_screen.c
> index 25432f2..86a7a67 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -230,7 +230,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap
> cap)
> 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:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> case PIPE_CAP_DRAW_INDIRECT:
> return 0;
> diff --git a/src/gallium/drivers/ilo/ilo_screen.c
> b/src/gallium/drivers/ilo/ilo_screen.c
> index 8f8e152..a7eaa1b 100644
> --- a/src/gallium/drivers/ilo/ilo_screen.c
> +++ b/src/gallium/drivers/ilo/ilo_screen.c
> @@ -434,7 +434,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
> return PIPE_ENDIAN_LITTLE;
> case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
> return true;
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c
> b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 356fad7..3218eb6 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -240,7 +240,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> return PIPE_MAX_VIEWPORTS;
> case PIPE_CAP_ENDIANNESS:
> return PIPE_ENDIAN_NATIVE;
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index 2866c47..32f5523 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -137,7 +137,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
> case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
> case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_FAKE_SW_MSAA:
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index 375f0dc..17d8fa3 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -193,7 +193,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY:
> case PIPE_CAP_TGSI_TEXCOORD:
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_FAKE_SW_MSAA:
> case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index 36c1d54..dc9b143 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -180,7 +180,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> 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:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_FAKE_SW_MSAA:
> case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
> case PIPE_CAP_DRAW_INDIRECT:
> diff --git a/src/gallium/drivers/r300/r300_screen.c
> b/src/gallium/drivers/r300/r300_screen.c
> index 424ef78..efa69d3 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -169,7 +169,7 @@ static int r300_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
> case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
> case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_TEXTURE_QUERY_LOD:
> diff --git a/src/gallium/drivers/r600/r600_pipe.c
> b/src/gallium/drivers/r600/r600_pipe.c
> index 9fc4c98..ca6399f 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -302,7 +302,7 @@ static int r600_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> /* Supported on Evergreen. */
> case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
> case PIPE_CAP_CUBE_MAP_ARRAY:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> return family >= CHIP_CEDAR ? 1 : 0;
>
> /* Unsupported features. */
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c
> b/src/gallium/drivers/radeonsi/si_pipe.c
> index 184235d..b90c307 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -209,7 +209,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum
> pipe_cap param)
> case PIPE_CAP_TGSI_INSTANCEID:
> case PIPE_CAP_COMPUTE:
> case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> case PIPE_CAP_CUBE_MAP_ARRAY:
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c
> b/src/gallium/drivers/softpipe/sp_screen.c
> index cfb10b1..13f4723 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -158,7 +158,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_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> return 1;
> case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
> return 16;
> diff --git a/src/gallium/drivers/svga/svga_screen.c
> b/src/gallium/drivers/svga/svga_screen.c
> index 806eb9d..b213b04 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -268,7 +268,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
> case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
> - case PIPE_CAP_TGSI_VS_LAYER:
> + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> case PIPE_CAP_TEXTURE_GATHER_SM5:
> case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
> diff --git a/src/gallium/include/pipe/p_defines.h
> b/src/gallium/include/pipe/p_defines.h
> index 4d941a0..d9b6e5a 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -547,7 +547,7 @@ 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_VIEWPORT = 87,
> PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES = 88,
> PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 89,
> PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS = 90,
> diff --git a/src/mesa/state_tracker/st_cb_clear.c
> b/src/mesa/state_tracker/st_cb_clear.c
> index 371f7fc..4bfa8d7 100644
> --- a/src/mesa/state_tracker/st_cb_clear.c
> +++ b/src/mesa/state_tracker/st_cb_clear.c
> @@ -136,7 +136,7 @@ set_vertex_shader_layered(struct st_context *st)
> struct pipe_context *pipe = st->pipe;
>
> if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_INSTANCEID) ||
> - !pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_VS_LAYER)) {
> + !pipe->screen->get_param(pipe->screen,
> PIPE_CAP_TGSI_VS_LAYER_VIEWPORT)) {
> assert(!"Got layered clear, but the VS layer output is unsupported");
> set_vertex_shader(st);
> return;
> diff --git a/src/mesa/state_tracker/st_extensions.c
> b/src/mesa/state_tracker/st_extensions.c
> index b8b3d50..4207cb6 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -624,7 +624,7 @@ void st_init_extensions(struct st_context *st)
> /* This extension needs full OpenGL 3.2, but we don't know if that's
> * supported at this point. Only check the GLSL version. */
> if (ctx->Const.GLSLVersion >= 150 &&
> - screen->get_param(screen, PIPE_CAP_TGSI_VS_LAYER)) {
> + screen->get_param(screen, PIPE_CAP_TGSI_VS_LAYER_VIEWPORT)) {
> ctx->Extensions.AMD_vertex_shader_layer = GL_TRUE;
> }
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
