basis_universal: Update to 1.60

This commit is contained in:
Jakub Marcowski 2025-03-11 10:51:10 +01:00
parent 78c9f8ddd9
commit 246b062bd6
No known key found for this signature in database
GPG key ID: 10D9E07CFFBC0E6F
43 changed files with 29563 additions and 6572 deletions

View file

@ -789,7 +789,7 @@ namespace basisu
struct opencl_context
{
uint32_t m_ocl_total_pixel_blocks;
size_t m_ocl_total_pixel_blocks;
cl_mem m_ocl_pixel_blocks;
cl_command_queue m_command_queue;
@ -907,7 +907,7 @@ namespace basisu
};
#pragma pack(pop)
bool opencl_set_pixel_blocks(opencl_context_ptr pContext, uint32_t total_blocks, const cl_pixel_block* pPixel_blocks)
bool opencl_set_pixel_blocks(opencl_context_ptr pContext, size_t total_blocks, const cl_pixel_block* pPixel_blocks)
{
if (!opencl_is_available())
return false;
@ -938,9 +938,11 @@ namespace basisu
assert(pContext->m_ocl_pixel_blocks);
if (!pContext->m_ocl_pixel_blocks)
return false;
assert(pContext->m_ocl_total_pixel_blocks <= INT_MAX);
cl_encode_etc1s_param_struct ps;
ps.m_total_blocks = pContext->m_ocl_total_pixel_blocks;
ps.m_total_blocks = (int)pContext->m_ocl_total_pixel_blocks;
ps.m_perceptual = perceptual;
ps.m_total_perms = total_perms;
@ -1062,9 +1064,11 @@ exit:
assert(pContext->m_ocl_pixel_blocks);
if (!pContext->m_ocl_pixel_blocks)
return false;
assert(pContext->m_ocl_total_pixel_blocks <= INT_MAX);
cl_rec_param_struct ps;
ps.m_total_blocks = pContext->m_ocl_total_pixel_blocks;
ps.m_total_blocks = (int)pContext->m_ocl_total_pixel_blocks;
ps.m_perceptual = perceptual;
bool status = false;
@ -1118,8 +1122,10 @@ exit:
if (!pContext->m_ocl_pixel_blocks)
return false;
assert(pContext->m_ocl_total_pixel_blocks <= INT_MAX);
fosc_param_struct ps;
ps.m_total_blocks = pContext->m_ocl_total_pixel_blocks;
ps.m_total_blocks = (int)pContext->m_ocl_total_pixel_blocks;
ps.m_perceptual = perceptual;
bool status = false;
@ -1170,8 +1176,10 @@ exit:
if (!pContext->m_ocl_pixel_blocks)
return false;
assert(pContext->m_ocl_total_pixel_blocks <= INT_MAX);
ds_param_struct ps;
ps.m_total_blocks = pContext->m_ocl_total_pixel_blocks;
ps.m_total_blocks = (int)pContext->m_ocl_total_pixel_blocks;
ps.m_perceptual = perceptual;
bool status = false;
@ -1232,7 +1240,7 @@ namespace basisu
BASISU_NOTE_UNUSED(context);
}
bool opencl_set_pixel_blocks(opencl_context_ptr pContext, uint32_t total_blocks, const cl_pixel_block* pPixel_blocks)
bool opencl_set_pixel_blocks(opencl_context_ptr pContext, size_t total_blocks, const cl_pixel_block* pPixel_blocks)
{
BASISU_NOTE_UNUSED(pContext);
BASISU_NOTE_UNUSED(total_blocks);