AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driconf: add disable_protected_content_check option

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5096>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2020-10-06 16:00:55 +02:00
parent 9b0ffa9ecd
commit 18b7cafc70
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
+1
View File
@@ -39,6 +39,7 @@ DRI_CONF_SECTION_DEBUG
DRI_CONF_OVERRIDE_VRAM_SIZE() DRI_CONF_OVERRIDE_VRAM_SIZE()
DRI_CONF_GLX_EXTENSION_OVERRIDE() DRI_CONF_GLX_EXTENSION_OVERRIDE()
DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE() DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE()
DRI_CONF_DISABLE_PROTECTED_CONTENT_CHECK(false)
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_SECTION_MISCELLANEOUS
src/gallium/frontends/dri/dri2.c
+3 -1
View File
@@ -833,7 +833,9 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
/* Reject image creation if there's an inconsistency between /* Reject image creation if there's an inconsistency between
* content protection status of tex and img. * content protection status of tex and img.
*/ */
if ((tex->bind & PIPE_BIND_PROTECTED) != is_protected_content) { const struct driOptionCache *optionCache = &screen->dev->option_cache;
if (!driQueryOptionb(optionCache, "disable_protected_content_check") &&
(tex->bind & PIPE_BIND_PROTECTED) != is_protected_content) {
pipe_resource_reference(&img->texture, NULL); pipe_resource_reference(&img->texture, NULL);
pipe_resource_reference(&tex, NULL); pipe_resource_reference(&tex, NULL);
FREE(img); FREE(img);
src/util/driconf.h
+3
View File
@@ -225,6 +225,9 @@
DRI_CONF_OPT_S(indirect_gl_extension_override, def, \ DRI_CONF_OPT_S(indirect_gl_extension_override, def, \
"Allow enabling/disabling a list of indirect-GL extensions") "Allow enabling/disabling a list of indirect-GL extensions")
#define DRI_CONF_DISABLE_PROTECTED_CONTENT_CHECK(def) \
DRI_CONF_OPT_B(disable_protected_content_check, def, \
"Don't reject image import if protected_content attribute doesn't match")
/** /**
* \brief Image quality-related options * \brief Image quality-related options