diff options
| author | Alan Coopersmith <[email protected]> | 2015-02-15 16:20:25 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-02-24 12:28:39 +0000 |
| commit | 3e513ea65c72ee08416ac8b82c6403b4c0c4096f (patch) | |
| tree | 040b27029549fdb7a1b572db0b3cd82526739973 | |
| parent | 2f8e96f71d038c9bde49549a3cb812d63cad9384 (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 <[email protected]>
Cc: "10.5" <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
(cherry picked from commit b7ce7c00e35ceb3518d932359ed52cacd6679acb)
| -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 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, |