Mesa (main): nv50: expose GL ES 3.1 for nva3+ hardware

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat May  1 19:02:27 2021 -0400

nv50: expose GL ES 3.1 for nva3+ hardware

This hardware supports all of the points of ES 3.1 with the minor
exception of non-red gather operations.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Pierre Moreau <dev at pmoreau.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10569>

---

 docs/relnotes/new_features.txt                 | 1 +
 src/gallium/drivers/nouveau/nv50/nv50_screen.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index 2cf81e1fee8..851cf9a689b 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -2,3 +2,4 @@ zink supports GL_ARB_texture_filter_minmax, GL_ARB_shader_clock
 VK_EXT_provoking_vertex on RADV.
 VK_EXT_extended_dynamic_state2 on RADV.
 32-bit x86 builds now default disable x87 math and use sse2.
+GL ES 3.1 on GT21x hardware.
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 9e632327cef..a8ad5526d82 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -129,6 +129,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return 330;
    case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
       return 330;
+   case PIPE_CAP_ESSL_FEATURE_LEVEL:
+      return class_3d >= NVA3_3D_CLASS ? 310 : 300;
    case PIPE_CAP_MAX_RENDER_TARGETS:
       return 8;
    case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
@@ -413,7 +415,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       FALLTHROUGH;
    /* caps where we want the default value */
    case PIPE_CAP_DMABUF:
-   case PIPE_CAP_ESSL_FEATURE_LEVEL:
    case PIPE_CAP_THROTTLE:
       return u_pipe_screen_get_param_defaults(pscreen, param);
    }