Mesa (master): panfrost: Expose GLES3 features on Bifrost when PAN_MESA_DEBUG=deqp

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1692088d05386cf4ce22c557abe425dc95cbc16c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1692088d05386cf4ce22c557abe425dc95cbc16c

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Wed Nov  4 18:48:04 2020 +0100

panfrost: Expose GLES3 features on Bifrost when PAN_MESA_DEBUG=deqp

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

---

 src/gallium/drivers/panfrost/pan_screen.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 1ac77c18ea2..54ab84cdfd5 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -103,7 +103,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
 
         /* Bifrost is WIP. No MRT support yet. */
         bool is_bifrost = (dev->quirks & IS_BIFROST);
-        has_mrt &= !is_bifrost;
+        has_mrt &= !is_bifrost || is_deqp;
 
         switch (param) {
         case PIPE_CAP_NPOT_TEXTURES:
@@ -139,7 +139,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         case PIPE_CAP_TGSI_INSTANCEID:
         case PIPE_CAP_TEXTURE_MULTISAMPLE:
         case PIPE_CAP_SURFACE_SAMPLE_COUNT:
-                return !is_bifrost;
+                return !is_bifrost || is_deqp;
 
         case PIPE_CAP_SAMPLER_VIEW_TARGET:
         case PIPE_CAP_TEXTURE_SWIZZLE:
@@ -159,22 +159,22 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
                 return 1;
 
         case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
-                return is_bifrost ? 0 : 4;
+                return (is_bifrost && !is_deqp) ? 0 : 4;
         case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
         case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
-                return is_bifrost ? 0 : 64;
+                return (is_bifrost && !is_deqp) ? 0 : 64;
         case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
         case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
-                return is_bifrost ? 0 : 1;
+                return (is_bifrost && !is_deqp) ? 0 : 1;
 
         case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
-                return is_bifrost ? 0 : 256;
+                return (is_bifrost && !is_deqp) ? 0 : 256;
 
         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 : (is_bifrost && !is_deqp) ? 120 : 140;
         case PIPE_CAP_ESSL_FEATURE_LEVEL:
-                return is_bifrost ? 120 : 300;
+                return (is_bifrost && !is_deqp) ? 120 : 300;
 
         case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
                 return 16;
@@ -199,7 +199,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         case PIPE_CAP_MAX_TEXTURE_2D_SIZE:
                 return 4096;
         case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
-                return is_bifrost ? 0 : 13;
+                return (is_bifrost && !is_deqp) ? 0 : 13;
         case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
                 return 13;
 
@@ -221,7 +221,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
 
         case PIPE_CAP_SEAMLESS_CUBE_MAP:
         case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
-                return !is_bifrost;
+                return !is_bifrost || is_deqp;
 
         case PIPE_CAP_MAX_VERTEX_ELEMENT_SRC_OFFSET:
                 return 0xffff;
@@ -251,7 +251,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         }
 
         case PIPE_CAP_SHADER_STENCIL_EXPORT:
-                return !is_bifrost;
+                return !is_bifrost || is_deqp;
 
         case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
                 return 4;
@@ -323,7 +323,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
                 return 0;
 
         case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
-                return is_bifrost ? 0 : 1;
+                return (is_bifrost && !is_deqp) ? 0 : 1;
         case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
                 return 0;
 
@@ -331,7 +331,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
                 return 0;
 
         case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
-                return is_bifrost ? 0 : 1;
+                return (is_bifrost && !is_deqp) ? 0 : 1;
 
         case PIPE_SHADER_CAP_SUBROUTINES:
                 return 0;
@@ -344,7 +344,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
 
         case PIPE_SHADER_CAP_FP16:
         case PIPE_SHADER_CAP_GLSL_16BIT_CONSTS:
-                return (!is_nofp16 && !is_bifrost) || is_fp16;
+                return (!is_nofp16 && (!is_bifrost || is_deqp)) || is_fp16;
 
         case PIPE_SHADER_CAP_FP16_DERIVATIVES:
         case PIPE_SHADER_CAP_INT16: