From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 2 Oct 2020 20:41:53 +0000 (-0400)
Subject: pan/bi: Expose GL 2.1 on Bifrost
X-Git-Tag: upstream/21.0.0~4402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3796c9f0259d97f1a4917eaf30d92f55c2d8e2b;p=platform%2Fupstream%2Fmesa.git

pan/bi: Expose GL 2.1 on Bifrost

Needed for glamor. These features should work fine.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7081>
---

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 704d129..c0501ee 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -130,14 +130,15 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
                 /* WIP */
                 return is_gl3 ? 1 : 0;
 
+        case PIPE_CAP_OCCLUSION_QUERY:
+        case PIPE_CAP_PRIMITIVE_RESTART:
+        case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX:
+                return true;
 
         /* ES3 features unsupported on Bifrost */
-        case PIPE_CAP_OCCLUSION_QUERY:
         case PIPE_CAP_TGSI_INSTANCEID:
         case PIPE_CAP_TEXTURE_MULTISAMPLE:
         case PIPE_CAP_SURFACE_SAMPLE_COUNT:
-        case PIPE_CAP_PRIMITIVE_RESTART:
-        case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX:
                 return !is_bifrost;
 
         case PIPE_CAP_SAMPLER_VIEW_TARGET:
@@ -171,7 +172,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
 
         case PIPE_CAP_GLSL_FEATURE_LEVEL:
         case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
-                return is_gl3 ? 330 : (is_bifrost ? 120 : 140);
+                return is_gl3 ? 330 : 140;
         case PIPE_CAP_ESSL_FEATURE_LEVEL:
                 return is_bifrost ? 120 : 300;