frontend/dri: set PIPE_BIND_PROTECTED later

NV12, YUV, YUYV and UYVY handling checks !tex_usage so set
PIPE_BIND_PROTECTED after.

This fixes encrypted nv12 textures handling.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11107>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2021-06-01 14:00:08 +02:00
committed by Marge Bot
parent 736e24bdce
commit 5e6f92f82c
+3 -2
View File
@@ -811,8 +811,6 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
if (pscreen->is_format_supported(pscreen, map->pipe_format, screen->target, 0, 0,
PIPE_BIND_SAMPLER_VIEW))
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
if (is_protected_content)
tex_usage |= PIPE_BIND_PROTECTED;
/* For NV12, see if we have support for sampling r8_b8g8 */
if (!tex_usage && map->pipe_format == PIPE_FORMAT_NV12 &&
@@ -854,6 +852,9 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
if (!tex_usage)
return NULL;
if (is_protected_content)
tex_usage |= PIPE_BIND_PROTECTED;
img = CALLOC_STRUCT(__DRIimageRec);
if (!img)
return NULL;