Skip to content

Commit a3cf1d5

Browse files
MarkCallowMarkCallow
authored
Align naming (#938)
Follow Python interface precedent for ASTC block dimension names. Use same name as native for ASTC quality levels enum.
1 parent 33813d7 commit a3cf1d5

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎interface/js_binding/ktx_wrapper.cpp

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -762,41 +762,41 @@ enum VkFormat = {
762762
// purpose of this IDL. Any VkFormat valid for KTX can be used. As shown
763763
// here, omit the VK_FORMAT_ prefix and enclose in quotes.
764764
765-
enum astc_quality_levels = { // **
765+
enum pack_astc_quality_levels = { // **
766766
"FASTEST",
767767
"FAST",
768768
"MEDIUM",
769769
"THOROUGH",
770770
"EXHAUSTIVE",
771771
};
772772
773-
enum astc_block_dimension = { // **
773+
enum pack_astc_block_dimension = { // **
774774
// 2D formats
775-
"d4x4",
776-
"d5x4",
777-
"d5x5",
778-
"d6x5",
779-
"d6x6",
780-
"d8x5",
781-
"d8x6",
782-
"d10x5",
783-
"d10x6",
784-
"d8x8",
785-
"d10x8",
786-
"d10x10",
787-
"d12x10",
788-
"d12x12",
775+
"D4x4",
776+
"D5x4",
777+
"D5x5",
778+
"D6x5",
779+
"D6x6",
780+
"D8x5",
781+
"D8x6",
782+
"D10x5",
783+
"D10x6",
784+
"D8x8",
785+
"D10x8",
786+
"D10x10",
787+
"D12x10",
788+
"D12x12",
789789
// 3D formats
790-
"d3x3x3",
791-
"d4x3x3",
792-
"d4x4x3",
793-
"d4x4x4",
794-
"d5x4x4",
795-
"d5x5x4",
796-
"d5x5x5",
797-
"d6x5x5",
798-
"d6x6x5",
799-
"d6x6x6"
790+
"D3x3x3",
791+
"D4x3x3",
792+
"D4x4x3",
793+
"D4x4x4",
794+
"D5x4x4",
795+
"D5x5x4",
796+
"D5x5x5",
797+
"D6x5x5",
798+
"D6x6x5",
799+
"D6x6x6"
800800
};
801801
802802
enum pack_astc_encoder_mode = { // **
@@ -1337,41 +1337,41 @@ EMSCRIPTEN_BINDINGS(ktx)
13371337
.property("generateMipmaps", &ktxTextureCreateInfo::generateMipmaps)
13381338
;
13391339

1340-
enum_<ktx_pack_astc_quality_levels_e>("astc_quality_levels")
1340+
enum_<ktx_pack_astc_quality_levels_e>("pack_astc_quality_levels")
13411341
.value("FASTEST", KTX_PACK_ASTC_QUALITY_LEVEL_FASTEST)
13421342
.value("FAST", KTX_PACK_ASTC_QUALITY_LEVEL_FAST)
13431343
.value("MEDIUM", KTX_PACK_ASTC_QUALITY_LEVEL_MEDIUM)
13441344
.value("THOROUGH", KTX_PACK_ASTC_QUALITY_LEVEL_THOROUGH)
13451345
.value("EXHAUSTIVE", KTX_PACK_ASTC_QUALITY_LEVEL_EXHAUSTIVE)
13461346
;
13471347

1348-
enum_<ktx_pack_astc_block_dimension_e>("astc_block_dimension")
1348+
enum_<ktx_pack_astc_block_dimension_e>("pack_astc_block_dimension")
13491349
// 2D formats
1350-
.value("d4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4) //: 8.00 bpp
1351-
.value("d5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4) //: 6.40 bpp
1352-
.value("d5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5) //: 5.12 bpp
1353-
.value("d6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5) //: 4.27 bpp
1354-
.value("d6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6) //: 3.56 bpp
1355-
.value("d8x5", KTX_PACK_ASTC_BLOCK_DIMENSION_8x5) //: 3.20 bpp
1356-
.value("d8x6", KTX_PACK_ASTC_BLOCK_DIMENSION_8x6) //: 2.67 bpp
1357-
.value("d10x5", KTX_PACK_ASTC_BLOCK_DIMENSION_10x5) //: 2.56 bpp
1358-
.value("d10x6", KTX_PACK_ASTC_BLOCK_DIMENSION_10x6) //: 2.13 bpp
1359-
.value("d8x8", KTX_PACK_ASTC_BLOCK_DIMENSION_8x8) //: 2.00 bpp
1360-
.value("d10x8", KTX_PACK_ASTC_BLOCK_DIMENSION_10x8) //: 1.60 bpp
1361-
.value("d10x10", KTX_PACK_ASTC_BLOCK_DIMENSION_10x10) //: 1.28 bpp
1362-
.value("d12x10", KTX_PACK_ASTC_BLOCK_DIMENSION_12x10) //: 1.07 bpp
1363-
.value("d12x12", KTX_PACK_ASTC_BLOCK_DIMENSION_12x12) //: 0.89 bpp
1350+
.value("D4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4) //: 8.00 bpp
1351+
.value("D5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4) //: 6.40 bpp
1352+
.value("D5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5) //: 5.12 bpp
1353+
.value("D6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5) //: 4.27 bpp
1354+
.value("D6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6) //: 3.56 bpp
1355+
.value("D8x5", KTX_PACK_ASTC_BLOCK_DIMENSION_8x5) //: 3.20 bpp
1356+
.value("D8x6", KTX_PACK_ASTC_BLOCK_DIMENSION_8x6) //: 2.67 bpp
1357+
.value("D10x5", KTX_PACK_ASTC_BLOCK_DIMENSION_10x5) //: 2.56 bpp
1358+
.value("D10x6", KTX_PACK_ASTC_BLOCK_DIMENSION_10x6) //: 2.13 bpp
1359+
.value("D8x8", KTX_PACK_ASTC_BLOCK_DIMENSION_8x8) //: 2.00 bpp
1360+
.value("D10x8", KTX_PACK_ASTC_BLOCK_DIMENSION_10x8) //: 1.60 bpp
1361+
.value("D10x10", KTX_PACK_ASTC_BLOCK_DIMENSION_10x10) //: 1.28 bpp
1362+
.value("D12x10", KTX_PACK_ASTC_BLOCK_DIMENSION_12x10) //: 1.07 bpp
1363+
.value("D12x12", KTX_PACK_ASTC_BLOCK_DIMENSION_12x12) //: 0.89 bpp
13641364
// 3D formats
1365-
.value("d3x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_3x3x3) //: 4.74 bpp
1366-
.value("d4x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x3x3) //: 3.56 bpp
1367-
.value("d4x4x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x3) //: 2.67 bpp
1368-
.value("d4x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x4) //: 2.00 bpp
1369-
.value("d5x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4x4) //: 1.60 bpp
1370-
.value("d5x5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x4) //: 1.28 bpp
1371-
.value("d5x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x5) //: 1.02 bpp
1372-
.value("d6x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5x5) //: 0.85 bpp
1373-
.value("d6x6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x5) //: 0.71 bpp
1374-
.value("d6x6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x6) //: 0.59 bpp
1365+
.value("D3x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_3x3x3) //: 4.74 bpp
1366+
.value("D4x3x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x3x3) //: 3.56 bpp
1367+
.value("D4x4x3", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x3) //: 2.67 bpp
1368+
.value("D4x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_4x4x4) //: 2.00 bpp
1369+
.value("D5x4x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x4x4) //: 1.60 bpp
1370+
.value("D5x5x4", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x4) //: 1.28 bpp
1371+
.value("D5x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_5x5x5) //: 1.02 bpp
1372+
.value("D6x5x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x5x5) //: 0.85 bpp
1373+
.value("D6x6x5", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x5) //: 0.71 bpp
1374+
.value("D6x6x6", KTX_PACK_ASTC_BLOCK_DIMENSION_6x6x6) //: 0.59 bpp
13751375
;
13761376

13771377
enum_<ktx_pack_astc_encoder_mode_e>("pack_astc_encoder_mode")

‎tests/webgl/libktx-webgl/libktx-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,9 +886,9 @@ async function testEncodeBasis(ktexture) {
886886
async function testEncodeAstc(ktexture) {
887887
const params = new ktx.astcParams();
888888

889-
params.blockDimension = ktx.astc_block_dimension.d8x8;
889+
params.blockDimension = ktx.pack_astc_block_dimension.D8x8;
890890
params.mode = ktx.pack_astc_encoder_mode.DEFAULT;
891-
params.qualityLevel = ktx.astc_quality_levels.FAST;
891+
params.qualityLevel = ktx.pack_astc_quality_levels.FAST;
892892
params.normalMap = false;
893893

894894
// Before we compress, test inputSwizzle setting

0 commit comments

Comments
 (0)