From 7ca8b86cb9d27db2251507d84026e031ae9304f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 30 Apr 2017 15:53:10 +0200 Subject: [PATCH] st/mesa: decrease the size of remaining st_translate_program array params 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_atifs_to_tgsi.c | 2 +- src/mesa/state_tracker/st_atifs_to_tgsi.h | 2 +- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++-- src/mesa/state_tracker/st_glsl_to_tgsi.h | 4 ++-- src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 +- src/mesa/state_tracker/st_mesa_to_tgsi.h | 2 +- src/mesa/state_tracker/st_program.c | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mesa/state_tracker/st_atifs_to_tgsi.c b/src/mesa/state_tracker/st_atifs_to_tgsi.c index 0cba169..8b9c332 100644 --- a/src/mesa/state_tracker/st_atifs_to_tgsi.c +++ b/src/mesa/state_tracker/st_atifs_to_tgsi.c @@ -428,7 +428,7 @@ st_translate_atifs_program( const ubyte inputMapping[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_atifs_to_tgsi.h b/src/mesa/state_tracker/st_atifs_to_tgsi.h index 980555c..ce54791 100644 --- a/src/mesa/state_tracker/st_atifs_to_tgsi.h +++ b/src/mesa/state_tracker/st_atifs_to_tgsi.h @@ -46,7 +46,7 @@ st_translate_atifs_program( const ubyte inputMapping[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index ba56286..f04719b 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6238,10 +6238,10 @@ st_translate_program( const struct gl_program *proginfo, GLuint numInputs, const ubyte inputMapping[], - const GLuint inputSlotToAttr[], + const ubyte inputSlotToAttr[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h index 7042817..37dfdb3 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h @@ -43,10 +43,10 @@ enum pipe_error st_translate_program( const struct gl_program *proginfo, GLuint numInputs, const ubyte inputMapping[], - const GLuint inputSlotToAttr[], + const ubyte inputSlotToAttr[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c index d760962..b3721d8 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -802,7 +802,7 @@ st_translate_mesa_program( const ubyte inputMapping[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h index 42015fc..b4d9af6 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.h +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h @@ -54,7 +54,7 @@ st_translate_mesa_program( const ubyte inputMapping[], const ubyte inputSemanticName[], const ubyte inputSemanticIndex[], - const GLuint interpMode[], + const ubyte interpMode[], GLuint numOutputs, const ubyte outputMapping[], const ubyte outputSemanticName[], diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index f157092..d9b1d12 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -715,8 +715,8 @@ st_translate_fragment_program(struct st_context *st, { ubyte outputMapping[2 * FRAG_RESULT_MAX]; ubyte inputMapping[VARYING_SLOT_MAX]; - GLuint inputSlotToAttr[VARYING_SLOT_MAX]; - GLuint interpMode[PIPE_MAX_SHADER_INPUTS]; /* XXX size? */ + ubyte inputSlotToAttr[VARYING_SLOT_MAX]; + ubyte interpMode[PIPE_MAX_SHADER_INPUTS]; /* XXX size? */ GLuint attr; GLbitfield64 inputsRead; struct ureg_program *ureg; @@ -1344,7 +1344,7 @@ st_translate_program_common(struct st_context *st, unsigned tgsi_processor, struct pipe_shader_state *out_state) { - GLuint inputSlotToAttr[VARYING_SLOT_TESS_MAX]; + ubyte inputSlotToAttr[VARYING_SLOT_TESS_MAX]; ubyte inputMapping[VARYING_SLOT_TESS_MAX]; ubyte outputMapping[VARYING_SLOT_TESS_MAX]; GLuint attr; -- 2.7.4