From bce834ffbabf1a21d29cb3ba921ec0b3d8343bfa Mon Sep 17 00:00:00 2001 From: Carl Woffenden Date: Wed, 25 Sep 2019 15:27:20 +0200 Subject: [PATCH] Fixes more -Wunused-parameter warnings These unused params occur when disabling various transcode options. --- transcoder/basisu_transcoder.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/transcoder/basisu_transcoder.cpp b/transcoder/basisu_transcoder.cpp index 725f33a..f3c44d0 100644 --- a/transcoder/basisu_transcoder.cpp +++ b/transcoder/basisu_transcoder.cpp @@ -6339,6 +6339,10 @@ namespace basist (void)transcode_alpha; (void)pAlpha_blocks; (void)pvrtc_wrap_addressing; + // 'pDst_blocks' unused when disabling *all* hardware transcode options + // (and 'bc1_allow_threecolor_blocks' when disabling DXT) + BASISU_NOTE_UNUSED(pDst_blocks); + BASISU_NOTE_UNUSED(bc1_allow_threecolor_blocks); if (!pState) pState = &m_def_state; @@ -6641,9 +6645,8 @@ namespace basist } case cBC1: { - void* pDst_block = static_cast(pDst_blocks) + (block_x + block_y * output_row_pitch_in_blocks_or_pixels) * output_block_or_pixel_stride_in_bytes; - #if BASISD_SUPPORT_DXT1 + void* pDst_block = static_cast(pDst_blocks) + (block_x + block_y * output_row_pitch_in_blocks_or_pixels) * output_block_or_pixel_stride_in_bytes; #if BASISD_ENABLE_DEBUG_FLAGS if (g_debug_flags & (cDebugFlagVisBC1Sels | cDebugFlagVisBC1Endpoints)) convert_etc1s_to_dxt1_vis(static_cast(pDst_block), pEndpoints, pSelector, bc1_allow_threecolor_blocks); @@ -7729,6 +7732,11 @@ namespace basist void* pOutput_blocks, uint32_t output_blocks_buf_size_in_blocks_or_pixels, block_format fmt, uint32_t block_stride_in_bytes, uint32_t output_row_pitch_in_blocks_or_pixels) { + // 'num_blocks_y', 'pOutput_blocks' & 'block_stride_in_bytes' unused + // when disabling BASISD_SUPPORT_ETC2_EAC_A8 *and* BASISD_SUPPORT_DXT5A + BASISU_NOTE_UNUSED(num_blocks_y); + BASISU_NOTE_UNUSED(pOutput_blocks); + BASISU_NOTE_UNUSED(block_stride_in_bytes); BASISU_NOTE_UNUSED(output_blocks_buf_size_in_blocks_or_pixels); if (!output_row_pitch_in_blocks_or_pixels)