Mesa (master): st/dri: implement __DRIimageExtension:: validateUsage properly
Marek Olšák
mareko at kemper.freedesktop.org
Thu Oct 12 17:05:37 UTC 2017
Module: Mesa
Branch: master
Commit: 255573996cc997cb61be9adad3e8fcaa78db5d1f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=255573996cc997cb61be9adad3e8fcaa78db5d1f
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Oct 9 18:56:22 2017 +0200
st/dri: implement __DRIimageExtension::validateUsage properly
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/gallium/state_trackers/dri/dri2.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 324e357c35..38e68069f4 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -1272,15 +1272,29 @@ dri2_dup_image(__DRIimage *image, void *loaderPrivate)
static GLboolean
dri2_validate_usage(__DRIimage *image, unsigned int use)
{
- /*
- * Gallium drivers are bad at adding usages to the resources
- * once opened again in another process, which is the main use
- * case for this, so we have to lie.
+ if (!image || !image->texture)
+ return false;
+
+ struct pipe_screen *screen = image->texture->screen;
+ if (!screen->check_resource_capability)
+ return true;
+
+ /* We don't want to check these:
+ * __DRI_IMAGE_USE_SHARE (all images are shareable)
+ * __DRI_IMAGE_USE_BACKBUFFER (all images support this)
*/
- if (image != NULL)
- return GL_TRUE;
- else
- return GL_FALSE;
+ unsigned bind = 0;
+ if (use & __DRI_IMAGE_USE_SCANOUT)
+ bind |= PIPE_BIND_SCANOUT;
+ if (use & __DRI_IMAGE_USE_LINEAR)
+ bind |= PIPE_BIND_LINEAR;
+ if (use & __DRI_IMAGE_USE_CURSOR)
+ bind |= PIPE_BIND_CURSOR;
+
+ if (!bind)
+ return true;
+
+ return screen->check_resource_capability(screen, image->texture, bind);
}
static __DRIimage *
More information about the mesa-commit
mailing list