From: Alan Coopersmith Date: Mon, 16 Feb 2015 00:20:25 +0000 (-0800) Subject: Make _mesa_swizzle_and_convert argument types in .c match those in .h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7ce7c00e35ceb3518d932359ed52cacd6679acb;p=mesa.git Make _mesa_swizzle_and_convert argument types in .c match those in .h Caused Solaris Studio compilers to fail to build with errors about incompatible function redefinitions. Signed-off-by: Alan Coopersmith Cc: "10.5" Reviewed-by: Emil Velikov Reviewed-by: Brian Paul --- diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index 00061dedbfd..810bb163400 100644 --- a/src/mesa/main/format_utils.c +++ b/src/mesa/main/format_utils.c @@ -1423,8 +1423,8 @@ convert_int(void *void_dst, int num_dst_channels, * \param[in] count the number of pixels to convert */ void -_mesa_swizzle_and_convert(void *void_dst, GLenum dst_type, int num_dst_channels, - const void *void_src, GLenum src_type, int num_src_channels, +_mesa_swizzle_and_convert(void *void_dst, enum mesa_array_format_datatype dst_type, int num_dst_channels, + const void *void_src, enum mesa_array_format_datatype src_type, int num_src_channels, const uint8_t swizzle[4], bool normalized, int count) { if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels,