From 88d46ac18461f18be0a801ad57bd8b0288057dc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 30 Apr 2017 15:49:21 +0200 Subject: [PATCH] st/mesa: remove unused outputSlotToAttr MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Tested-by: Edmondo Tommasina Reviewed-by: Brian Paul Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 - src/mesa/state_tracker/st_glsl_to_tgsi.h | 1 - src/mesa/state_tracker/st_program.c | 9 --------- 3 files changed, 11 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 970e7e0f64f..ba56286b88c 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6244,7 +6244,6 @@ st_translate_program( const GLuint interpMode[], GLuint numOutputs, const ubyte outputMapping[], - const GLuint outputSlotToAttr[], const ubyte outputSemanticName[], const ubyte outputSemanticIndex[]) { diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h index 6e24a958d9e..7042817d29d 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h @@ -49,7 +49,6 @@ enum pipe_error st_translate_program( const GLuint interpMode[], GLuint numOutputs, const ubyte outputMapping[], - const GLuint outputSlotToAttr[], const ubyte outputSemanticName[], const ubyte outputSemanticIndex[]); diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index f34adcd8b9e..f15709238c1 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -377,7 +377,6 @@ st_translate_vertex_program(struct st_context *st, unsigned num_outputs = 0; unsigned attr; ubyte input_to_index[VERT_ATTRIB_MAX] = {0}; - unsigned output_slot_to_attr[VARYING_SLOT_MAX] = {0}; ubyte output_semantic_name[VARYING_SLOT_MAX] = {0}; ubyte output_semantic_index[VARYING_SLOT_MAX] = {0}; @@ -417,7 +416,6 @@ st_translate_vertex_program(struct st_context *st, unsigned slot = num_outputs++; stvp->result_to_output[attr] = slot; - output_slot_to_attr[slot] = attr; switch (attr) { case VARYING_SLOT_POS: @@ -574,7 +572,6 @@ st_translate_vertex_program(struct st_context *st, /* outputs */ num_outputs, stvp->result_to_output, - output_slot_to_attr, output_semantic_name, output_semantic_index); @@ -1032,7 +1029,6 @@ st_translate_fragment_program(struct st_context *st, /* outputs */ fs_num_outputs, outputMapping, - NULL, fs_output_semantic_name, fs_output_semantic_index); @@ -1350,7 +1346,6 @@ st_translate_program_common(struct st_context *st, { GLuint inputSlotToAttr[VARYING_SLOT_TESS_MAX]; ubyte inputMapping[VARYING_SLOT_TESS_MAX]; - GLuint outputSlotToAttr[VARYING_SLOT_TESS_MAX]; ubyte outputMapping[VARYING_SLOT_TESS_MAX]; GLuint attr; @@ -1366,7 +1361,6 @@ st_translate_program_common(struct st_context *st, memset(inputSlotToAttr, 0, sizeof(inputSlotToAttr)); memset(inputMapping, 0, sizeof(inputMapping)); - memset(outputSlotToAttr, 0, sizeof(outputSlotToAttr)); memset(outputMapping, 0, sizeof(outputMapping)); memset(out_state, 0, sizeof(*out_state)); @@ -1484,7 +1478,6 @@ st_translate_program_common(struct st_context *st, GLuint slot = num_outputs++; outputMapping[attr] = slot; - outputSlotToAttr[slot] = attr; switch (attr) { case VARYING_SLOT_POS: @@ -1587,7 +1580,6 @@ st_translate_program_common(struct st_context *st, GLuint patch_attr = VARYING_SLOT_PATCH0 + attr; outputMapping[patch_attr] = slot; - outputSlotToAttr[slot] = patch_attr; output_semantic_name[slot] = TGSI_SEMANTIC_PATCH; output_semantic_index[slot] = attr; } @@ -1608,7 +1600,6 @@ st_translate_program_common(struct st_context *st, /* outputs */ num_outputs, outputMapping, - outputSlotToAttr, output_semantic_name, output_semantic_index); -- 2.30.2