Mesa (master): gallium/tgsi_exec: Remove unused MaxGeometryShaderOutputs.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 30 15:33:45 2020 -0800

gallium/tgsi_exec: Remove unused MaxGeometryShaderOutputs.

Just an indirection from the value you should be grepping for (the one
that controls the allocation of the output buffer).

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8283>

---

 src/gallium/auxiliary/tgsi/tgsi_exec.c | 3 +--
 src/gallium/auxiliary/tgsi/tgsi_exec.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index 893b2ac17d6..c1f6ad1dd2d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -1258,7 +1258,6 @@ tgsi_exec_machine_create(enum pipe_shader_type shader_type)
    memset(mach, 0, sizeof(*mach));
 
    mach->ShaderType = shader_type;
-   mach->MaxGeometryShaderOutputs = TGSI_MAX_TOTAL_VERTICES;
 
    if (shader_type != PIPE_SHADER_COMPUTE) {
       mach->Inputs = align_malloc(sizeof(struct tgsi_exec_vector) * PIPE_MAX_SHADER_INPUTS, 16);
@@ -2060,7 +2059,7 @@ emit_primitive(struct tgsi_exec_machine *mach,
    prim_count = &mach->OutputPrimCount[stream_id];
    if (mach->ExecMask) {
       ++(*prim_count);
-      debug_assert((*prim_count * mach->NumOutputs) < mach->MaxGeometryShaderOutputs);
+      debug_assert((*prim_count * mach->NumOutputs) < TGSI_MAX_TOTAL_VERTICES);
       mach->Primitives[stream_id][*prim_count] = 0;
    }
 }
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
index c1e65021cb8..d064d805a12 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
@@ -323,7 +323,6 @@ struct tgsi_exec_machine
    /* Offsets in ->Outputs of the primitives' vertex output data */
    unsigned                      *PrimitiveOffsets[TGSI_MAX_VERTEX_STREAMS];
    unsigned                       NumOutputs;
-   unsigned                       MaxGeometryShaderOutputs;
    unsigned                       MaxOutputVertices;
    /* Offset in ->Outputs for the current vertex to be emitted. */
    unsigned                       OutputVertexOffset;