diff options
author | Ilia Mirkin <[email protected]> | 2014-07-03 11:15:18 -0400 |
---|---|---|
committer | Ilia Mirkin <[email protected]> | 2014-07-03 19:39:25 -0400 |
commit | 32b71246e7e9524c81d545e22bf4dc210cd56f2e (patch) | |
tree | b40ac835fb5ac4beb823c569b6a5829e4e13dd5b /src/mesa | |
parent | 0fb6f1bf1d0729486443996c620ea1b766489e15 (diff) |
gallium: rename PIPE_CAP_TGSI_VS_LAYER to also have _VIEWPORT
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 <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/state_tracker/st_cb_clear.c | 2 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index 371f7fcdae7..4bfa8d75aa9 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 b8b3d504a76..4207cb64a3a 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; } |