From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 10 Dec 2021 04:12:19 +0000 (-0600)
Subject: spirv,radv: Fix some GL enum comments
X-Git-Tag: upstream/22.3.5~13996
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b3d947267f69bacc1948eef28444e8435cec682;p=platform%2Fupstream%2Fmesa.git

spirv,radv: Fix some GL enum comments

GL_LINE_STRIP_ADJACENCY is 0xB.  0xA is GL_LINES_ADJACENCY.  While we're
here, drop the ARB prefixes.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14157>
---

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 30c0e7b..4c622e0 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1291,7 +1291,7 @@ si_conv_gl_prim_to_gs_out(unsigned gl_prim)
       return V_028A6C_POINTLIST;
    case 1:      /* GL_LINES */
    case 3:      /* GL_LINE_STRIP */
-   case 0xA:    /* GL_LINE_STRIP_ADJACENCY_ARB */
+   case 0xA:    /* GL_LINES_ADJACENCY */
    case 0x8E7A: /* GL_ISOLINES */
       return V_028A6C_LINESTRIP;
 
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index c9484a4..53f42ed 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -2681,9 +2681,9 @@ si_conv_gl_prim_to_vertices(unsigned gl_prim)
    case 4: /* GL_TRIANGLES */
    case 5: /* GL_TRIANGLE_STRIP */
       return 3;
-   case 0xA: /* GL_LINE_STRIP_ADJACENCY_ARB */
+   case 0xA: /* GL_LINES_ADJACENCY */
       return 4;
-   case 0xc: /* GL_TRIANGLES_ADJACENCY_ARB */
+   case 0xc: /* GL_TRIANGLES_ADJACENCY */
       return 6;
    case 7: /* GL_QUADS */
       return V_028A6C_TRISTRIP;
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 15b2675..033db65 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -4277,12 +4277,12 @@ gl_primitive_from_spv_execution_mode(struct vtn_builder *b,
    case SpvExecutionModeOutputLinesNV:
       return 1; /* GL_LINES */
    case SpvExecutionModeInputLinesAdjacency:
-      return 0x000A; /* GL_LINE_STRIP_ADJACENCY_ARB */
+      return 0x000A; /* GL_LINES_ADJACENCY */
    case SpvExecutionModeTriangles:
    case SpvExecutionModeOutputTrianglesNV:
       return 4; /* GL_TRIANGLES */
    case SpvExecutionModeInputTrianglesAdjacency:
-      return 0x000C; /* GL_TRIANGLES_ADJACENCY_ARB */
+      return 0x000C; /* GL_TRIANGLES_ADJACENCY */
    case SpvExecutionModeQuads:
       return 7; /* GL_QUADS */
    case SpvExecutionModeIsolines: