diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-15 16:20:25 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-17 18:16:33 -0800 |
| commit | b7ce7c00e35ceb3518d932359ed52cacd6679acb (patch) | |
| tree | 22d00ed718aa114ad692e289fe307d32a76332f9 | |
| parent | 4671dca0eecf7dbf3e0d0a13111813756722d57d (diff) | |
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 <alan.coopersmith@oracle.com>
Cc: "10.5" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/mesa/main/format_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index 00061dedbf..810bb16340 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, |