OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make _mesa_swizzle_and_convert argument types in .c match those in .h

Browse Source 
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>
This commit is contained in:
Alan Coopersmith
2015-02-15 16:20:25 -08:00
parent 4671dca0ee
commit b7ce7c00e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/format_utils.c
View File

@@ -1423,8 +1423,8 @@ convert_int(void *void_dst, int num_dst_channels,
* \param[in] count the number of pixels to convert * \param[in] count the number of pixels to convert
*/ */
void void
_mesa_swizzle_and_convert(void *void_dst, GLenum dst_type, int num_dst_channels, _mesa_swizzle_and_convert(void *void_dst, enum mesa_array_format_datatype dst_type, int num_dst_channels,
const void *void_src, GLenum src_type, int num_src_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) const uint8_t swizzle[4], bool normalized, int count)
{ {
if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels, if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels,