diff options
author | Ilia Mirkin <[email protected]> | 2019-08-17 12:13:34 -0400 |
---|---|---|
committer | Ilia Mirkin <[email protected]> | 2019-08-20 23:51:39 -0400 |
commit | 958390a9bf8904522a50f8e9c26c50c96179c183 (patch) | |
tree | 2b511b7c3e08ff7a4e6c54f8759df01621c4c400 /src/gallium/auxiliary | |
parent | cca442f3ba81e98258fe2ccb1dbc852cd4914d38 (diff) |
gallium/vl: use compute preference for all multimedia, not just blit
The compute paths in vl are a bit AMD-specific. For example, they (on
nouveau), try to use a BGRX8 image format, which is not supported.
Fixing all this is probably possible, but since the compute paths aren't
in any way better, it's difficult to care.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111213
Fixes: 9364d66cb7 (gallium/auxiliary/vl: Add video compositor compute shader render)
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/util/u_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index 0b4bb067d6d..88f4945e755 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -331,7 +331,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_TGSI_ATOMFADD: case PIPE_CAP_TGSI_SKIP_SHRINK_IO_ARRAYS: case PIPE_CAP_IMAGE_LOAD_FORMATTED: - case PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA: + case PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA: case PIPE_CAP_FRAGMENT_SHADER_INTERLOCK: case PIPE_CAP_CS_DERIVED_SYSTEM_VALUES_SUPPORTED: case PIPE_CAP_ATOMIC_FLOAT_MINMAX: diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 04808e80d84..a381af108b3 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -764,7 +764,7 @@ vl_compositor_init(struct vl_compositor *c, struct pipe_context *pipe) memset(c, 0, sizeof(*c)); - c->pipe_cs_composit_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_COMPUTE) && + c->pipe_cs_composit_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA) && pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_TEX_TXF_LZ) && pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_DIV); |