[Mesa-dev] [PATCH 5/5] gallium/util: fix two MSVC compiler warnings

[Roland Scheidegger]

For the series:
Reviewed-by: Roland Scheidegger <sroland at vmware.com>


Am 04.05.19 um 18:07 schrieb Brian Paul:
> Remove stray const qualifier.
> s/unsigned/enum tgsi_semantic/
> ---
>  src/gallium/auxiliary/util/u_format_zs.h      | 2 +-
>  src/gallium/auxiliary/util/u_simple_shaders.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/util/u_format_zs.h b/src/gallium/auxiliary/util/u_format_zs.h
> index 160919d..bed3c51 100644
> --- a/src/gallium/auxiliary/util/u_format_zs.h
> +++ b/src/gallium/auxiliary/util/u_format_zs.h
> @@ -113,7 +113,7 @@ void
>  util_format_z24_unorm_s8_uint_pack_s_8uint(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height);
>  
>  void
> -util_format_z24_unorm_s8_uint_pack_separate(uint8_t *dst_row, unsigned dst_stride, const uint32_t *z_src_row, unsigned z_src_stride, const uint8_t *s_src_row, unsigned s_src_stride, const unsigned width, unsigned height);
> +util_format_z24_unorm_s8_uint_pack_separate(uint8_t *dst_row, unsigned dst_stride, const uint32_t *z_src_row, unsigned z_src_stride, const uint8_t *s_src_row, unsigned s_src_stride, unsigned width, unsigned height);
>  
>  void
>  util_format_s8_uint_z24_unorm_unpack_z_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height);
> diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
> index 4046ab1..d62a655 100644
> --- a/src/gallium/auxiliary/util/u_simple_shaders.c
> +++ b/src/gallium/auxiliary/util/u_simple_shaders.c
> @@ -117,8 +117,8 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe,
>  
>  void *util_make_layered_clear_vertex_shader(struct pipe_context *pipe)
>  {
> -   const unsigned semantic_names[] = {TGSI_SEMANTIC_POSITION,
> -                                      TGSI_SEMANTIC_GENERIC};
> +   const enum tgsi_semantic semantic_names[] = {TGSI_SEMANTIC_POSITION,
> +                                                TGSI_SEMANTIC_GENERIC};
>     const unsigned semantic_indices[] = {0, 0};
>  
>     return util_make_vertex_passthrough_shader_with_so(pipe, 2, semantic_names,
>