svga: Fix incorrect advertizing of EGL_KHR_gl_colorspace
authorThomas Hellstrom <thellstrom@vmware.com>
Thu, 12 Apr 2018 12:41:47 +0000 (14:41 +0200)
committerThomas Hellstrom <thellstrom@vmware.com>
Thu, 19 Apr 2018 11:42:51 +0000 (13:42 +0200)
When advertizing this extension, egl_dri2 uses the DRI2_RENDERER_QUERY
extension to query whether an sRGB format is supported. That extension will
query our driver with the BIND flag PIPE_BIND_RENDER_TARGET rather than
PIPE_BIND_DISPLAY_TARGET which is used when building the configs.
We only return the correct value for PIPE_BIND_DISPLAY_TARGET.

The inconsistency causes EGL to crash at surface initialization if sRGB is
not supported. Fix this by supporting both bind flags.

Testing done:
piglit egl_gl_colorspace srgb

Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
src/gallium/drivers/svga/svga_format.c

index 20a6e6b159f3a93a7c810ec87e763bdca0c843a0..c9adee11afb650a077a637de8c52c21d82965d81 100644 (file)
@@ -2107,7 +2107,7 @@ svga_is_format_supported(struct pipe_screen *screen,
 
    if (!ss->sws->have_vgpu10 &&
        util_format_is_srgb(format) &&
-       (bindings & PIPE_BIND_DISPLAY_TARGET)) {
+       (bindings & (PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_RENDER_TARGET))) {
        /* We only support sRGB rendering with vgpu10 */
       return FALSE;
    }