Mesa (main): virgl: Enable higher compatibility profiles if host supports it

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1b80e1716e2ae1e306e799c9822b1c86de6e4d4c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b80e1716e2ae1e306e799c9822b1c86de6e4d4c

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Wed Aug 25 16:02:31 2021 +0200

virgl: Enable higher compatibility profiles if host supports it

v2: Update CI expectations

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Italo Nicola <italonicola at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12542>

---

 src/gallium/drivers/virgl/ci/virgl-gl-fails.txt   | 1 -
 src/gallium/drivers/virgl/ci/virgl-gles-fails.txt | 3 +--
 src/gallium/drivers/virgl/virgl_screen.c          | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt
index 9f27f03fb41..d342cd77865 100644
--- a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt
+++ b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt
@@ -46,7 +46,6 @@ KHR-GL30.transform_feedback.capture_vertex_separate_test,Fail
 KHR-GL30.transform_feedback.discard_vertex_test,Fail
 KHR-GL30.transform_feedback.draw_xfb_instanced_test,Crash
 KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Crash
-KHR-GL30.transform_feedback.get_xfb_varying,Fail
 KHR-GL30.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL30.transform_feedback.query_vertex_separate_test,Fail
 KHR-GL31.transform_feedback.capture_special_interleaved_test,Crash
diff --git a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
index 9e92815ae63..d4669c16e0e 100644
--- a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
+++ b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
@@ -48,7 +48,6 @@ KHR-GL30.transform_feedback.capture_vertex_separate_test,Fail
 KHR-GL30.transform_feedback.discard_vertex_test,Fail
 KHR-GL30.transform_feedback.draw_xfb_instanced_test,Crash
 KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Crash
-KHR-GL30.transform_feedback.get_xfb_varying,Fail
 KHR-GL30.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL30.transform_feedback.query_vertex_separate_test,Fail
 KHR-GL31.CommonBugs.CommonBug_ParenthesisInLayoutQualifierIntegerValue,Fail
@@ -75,4 +74,4 @@ KHR-GL32.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers
 KHR-GL32.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream,Fail
 KHR-GL32.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL32.transform_feedback.query_vertex_separate_test,Fail
-KHR-GL32.glsl_noperspective.functionaltest,Fail
\ No newline at end of file
+KHR-GL32.glsl_noperspective.functionaltest,Fail
diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index 57aca63ab12..e0857651d73 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -167,10 +167,12 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
       return (vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_FBO_MIXED_COLOR_FORMATS) ||
             (vscreen->caps.caps.v2.host_feature_check_version < 1);
+   case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
+       if (vscreen->caps.caps.v2.host_feature_check_version < 6)
+           return MIN2(vscreen->caps.caps.v1.glsl_level, 140);
+       FALLTHROUGH;
    case PIPE_CAP_GLSL_FEATURE_LEVEL:
       return vscreen->caps.caps.v1.glsl_level;
-   case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
-      return MIN2(vscreen->caps.caps.v1.glsl_level, 140);
    case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
       return 1;
    case PIPE_CAP_DEPTH_CLIP_DISABLE_SEPARATE: