From 2377122a0cf24ca5f43b8e104b4510771573c3ce Mon Sep 17 00:00:00 2001 From: Mark Callow Date: Fri, 16 Aug 2024 16:27:55 +0900 Subject: [PATCH 1/2] Align astc_block_dimension names with Python binding. --- interface/js_binding/ktx_wrapper.cpp | 96 ++++++++++++------------- tests/webgl/libktx-webgl/libktx-test.js | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/interface/js_binding/ktx_wrapper.cpp b/interface/js_binding/ktx_wrapper.cpp index 593d37e95a..1235a8f478 100644 --- a/interface/js_binding/ktx_wrapper.cpp +++ b/interface/js_binding/ktx_wrapper.cpp @@ -772,31 +772,31 @@ enum astc_quality_levels = { // ** enum astc_block_dimension = { // ** // 2D formats - "d4x4", - "d5x4", - "d5x5", - "d6x5", - "d6x6", - "d8x5", - "d8x6", - "d10x5", - "d10x6", - "d8x8", - "d10x8", - "d10x10", - "d12x10", - "d12x12", + "D4x4", + "D5x4", + "D5x5", + "D6x5", + "D6x6", + "D8x5", + "D8x6", + "D10x5", + "D10x6", + "D8x8", + "D10x8", + "D10x10", + "D12x10", + "D12x12", // 3D formats - "d3x3x3", - "d4x3x3", - "d4x4x3", - "d4x4x4", - "d5x4x4", - "d5x5x4", - "d5x5x5", - "d6x5x5", - "d6x6x5", - "d6x6x6" + "D3x3x3", + "D4x3x3", + "D4x4x3", + "D4x4x4", + "D5x4x4", + "D5x5x4", + "D5x5x5", + "D6x5x5", + "D6x6x5", + "D6x6x6" }; enum pack_astc_encoder_mode = { // ** @@ -1347,31 +1347,31 @@ EMSCRIPTEN_BINDINGS(ktx) enum_("astc_block_dimension") // 2D formats - .value("d4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4) //: 8.00 bpp - .value("d5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4) //: 6.40 bpp - .value("d5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5) //: 5.12 bpp - .value("d6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5) //: 4.27 bpp - .value("d6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6) //: 3.56 bpp - .value("d8x5", KTX_PACK_ASTC_BLOCK_DIMENSION_8x5) //: 3.20 bpp - .value("d8x6", KTX_PACK_ASTC_BLOCK_DIMENSION_8x6) //: 2.67 bpp - .value("d10x5", KTX_PACK_ASTC_BLOCK_DIMENSION_10x5) //: 2.56 bpp - .value("d10x6", KTX_PACK_ASTC_BLOCK_DIMENSION_10x6) //: 2.13 bpp - .value("d8x8", KTX_PACK_ASTC_BLOCK_DIMENSION_8x8) //: 2.00 bpp - .value("d10x8", KTX_PACK_ASTC_BLOCK_DIMENSION_10x8) //: 1.60 bpp - .value("d10x10", KTX_PACK_ASTC_BLOCK_DIMENSION_10x10) //: 1.28 bpp - .value("d12x10", KTX_PACK_ASTC_BLOCK_DIMENSION_12x10) //: 1.07 bpp - .value("d12x12", KTX_PACK_ASTC_BLOCK_DIMENSION_12x12) //: 0.89 bpp + .value("D4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4) //: 8.00 bpp + .value("D5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4) //: 6.40 bpp + .value("D5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5) //: 5.12 bpp + .value("D6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5) //: 4.27 bpp + .value("D6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6) //: 3.56 bpp + .value("D8x5", KTX_PACK_ASTC_BLOCK_DIMENSION_8x5) //: 3.20 bpp + .value("D8x6", KTX_PACK_ASTC_BLOCK_DIMENSION_8x6) //: 2.67 bpp + .value("D10x5", KTX_PACK_ASTC_BLOCK_DIMENSION_10x5) //: 2.56 bpp + .value("D10x6", KTX_PACK_ASTC_BLOCK_DIMENSION_10x6) //: 2.13 bpp + .value("D8x8", KTX_PACK_ASTC_BLOCK_DIMENSION_8x8) //: 2.00 bpp + .value("D10x8", KTX_PACK_ASTC_BLOCK_DIMENSION_10x8) //: 1.60 bpp + .value("D10x10", KTX_PACK_ASTC_BLOCK_DIMENSION_10x10) //: 1.28 bpp + .value("D12x10", KTX_PACK_ASTC_BLOCK_DIMENSION_12x10) //: 1.07 bpp + .value("D12x12", KTX_PACK_ASTC_BLOCK_DIMENSION_12x12) //: 0.89 bpp // 3D formats - .value("d3x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_3x3x3) //: 4.74 bpp - .value("d4x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x3x3) //: 3.56 bpp - .value("d4x4x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x3) //: 2.67 bpp - .value("d4x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x4) //: 2.00 bpp - .value("d5x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4x4) //: 1.60 bpp - .value("d5x5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x4) //: 1.28 bpp - .value("d5x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x5) //: 1.02 bpp - .value("d6x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5x5) //: 0.85 bpp - .value("d6x6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x5) //: 0.71 bpp - .value("d6x6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x6) //: 0.59 bpp + .value("D3x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_3x3x3) //: 4.74 bpp + .value("D4x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x3x3) //: 3.56 bpp + .value("D4x4x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x3) //: 2.67 bpp + .value("D4x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x4) //: 2.00 bpp + .value("D5x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4x4) //: 1.60 bpp + .value("D5x5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x4) //: 1.28 bpp + .value("D5x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x5) //: 1.02 bpp + .value("D6x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5x5) //: 0.85 bpp + .value("D6x6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x5) //: 0.71 bpp + .value("D6x6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x6) //: 0.59 bpp ; enum_("pack_astc_encoder_mode") diff --git a/tests/webgl/libktx-webgl/libktx-test.js b/tests/webgl/libktx-webgl/libktx-test.js index f676b18e63..f7656d7403 100644 --- a/tests/webgl/libktx-webgl/libktx-test.js +++ b/tests/webgl/libktx-webgl/libktx-test.js @@ -886,7 +886,7 @@ async function testEncodeBasis(ktexture) { async function testEncodeAstc(ktexture) { const params = new ktx.astcParams(); - params.blockDimension = ktx.astc_block_dimension.d8x8; + params.blockDimension = ktx.astc_block_dimension.D8x8; params.mode = ktx.pack_astc_encoder_mode.DEFAULT; params.qualityLevel = ktx.astc_quality_levels.FAST; params.normalMap = false; From 2e793dddf474f43d97d3232874bc7a4cec79a2d9 Mon Sep 17 00:00:00 2001 From: Mark Callow Date: Fri, 16 Aug 2024 16:49:57 +0900 Subject: [PATCH 2/2] Use consistent naming for ASTC constants. --- interface/js_binding/ktx_wrapper.cpp | 8 ++++---- tests/webgl/libktx-webgl/libktx-test.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/js_binding/ktx_wrapper.cpp b/interface/js_binding/ktx_wrapper.cpp index 1235a8f478..5fa9d1b1e5 100644 --- a/interface/js_binding/ktx_wrapper.cpp +++ b/interface/js_binding/ktx_wrapper.cpp @@ -762,7 +762,7 @@ enum VkFormat = { // purpose of this IDL. Any VkFormat valid for KTX can be used. As shown // here, omit the VK_FORMAT_ prefix and enclose in quotes. -enum astc_quality_levels = { // ** +enum pack_astc_quality_levels = { // ** "FASTEST", "FAST", "MEDIUM", @@ -770,7 +770,7 @@ enum astc_quality_levels = { // ** "EXHAUSTIVE", }; -enum astc_block_dimension = { // ** +enum pack_astc_block_dimension = { // ** // 2D formats "D4x4", "D5x4", @@ -1337,7 +1337,7 @@ EMSCRIPTEN_BINDINGS(ktx) .property("generateMipmaps", &ktxTextureCreateInfo::generateMipmaps) ; - enum_("astc_quality_levels") + enum_("pack_astc_quality_levels") .value("FASTEST", KTX_PACK_ASTC_QUALITY_LEVEL_FASTEST) .value("FAST", KTX_PACK_ASTC_QUALITY_LEVEL_FAST) .value("MEDIUM", KTX_PACK_ASTC_QUALITY_LEVEL_MEDIUM) @@ -1345,7 +1345,7 @@ EMSCRIPTEN_BINDINGS(ktx) .value("EXHAUSTIVE", KTX_PACK_ASTC_QUALITY_LEVEL_EXHAUSTIVE) ; - enum_("astc_block_dimension") + enum_("pack_astc_block_dimension") // 2D formats .value("D4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4) //: 8.00 bpp .value("D5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4) //: 6.40 bpp diff --git a/tests/webgl/libktx-webgl/libktx-test.js b/tests/webgl/libktx-webgl/libktx-test.js index f7656d7403..bd6191fde6 100644 --- a/tests/webgl/libktx-webgl/libktx-test.js +++ b/tests/webgl/libktx-webgl/libktx-test.js @@ -886,9 +886,9 @@ async function testEncodeBasis(ktexture) { async function testEncodeAstc(ktexture) { const params = new ktx.astcParams(); - params.blockDimension = ktx.astc_block_dimension.D8x8; + params.blockDimension = ktx.pack_astc_block_dimension.D8x8; params.mode = ktx.pack_astc_encoder_mode.DEFAULT; - params.qualityLevel = ktx.astc_quality_levels.FAST; + params.qualityLevel = ktx.pack_astc_quality_levels.FAST; params.normalMap = false; // Before we compress, test inputSwizzle setting