Mesa (master): v3d: Disable PIPE_CAP_PRIMITIVE_RESTART

[GitLab Mirror]

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

Author: Neil Roberts <nroberts at igalia.com>
Date:   Thu Jun 18 15:53:03 2020 +0200

v3d: Disable PIPE_CAP_PRIMITIVE_RESTART

The hardware can only support the PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX
subset. This will make it stop advertising the NV_primitive_restart
extension without breaking GLES 3.0 support.

v2: Update features.txt

Reviewed-by: Eric Anholt <eric at anholt.net> (v1)
Reviewed by: Erik Faye-Lund <erik.faye-lund at collabora.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5559>

---

 docs/features.txt                    | 2 +-
 src/gallium/drivers/v3d/v3d_screen.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/features.txt b/docs/features.txt
index 791ebc496e1..42b7463fb58 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -74,7 +74,7 @@ GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
   Forward compatible context support/deprecations       DONE
   GL_ARB_draw_instanced (Instanced drawing)             DONE (v3d, zink)
   GL_ARB_copy_buffer (Buffer copying)                   DONE (v3d, zink)
-  GL_NV_primitive_restart (Primitive restart)           DONE (v3d)
+  GL_NV_primitive_restart (Primitive restart)           DONE ()
   16 vertex texture image units                         DONE (zink)
   GL_ARB_texture_buffer_object (Texture buffer objs)    DONE (zink)
   GL_ARB_texture_rectangle (Rectangular textures)       DONE (v3d, zink)
diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index b9a4fdc5fc8..503573e36bc 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -123,7 +123,6 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
         case PIPE_CAP_FRAGMENT_SHADER_TEXTURE_LOD:
         case PIPE_CAP_FRAGMENT_SHADER_DERIVATIVES:
         case PIPE_CAP_VERTEX_SHADER_SATURATE:
-        case PIPE_CAP_PRIMITIVE_RESTART:
         case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX:
         case PIPE_CAP_OCCLUSION_QUERY:
         case PIPE_CAP_POINT_SPRITE: