Skip to content

Commit b1a115f

Browse files
MarkCallowMarkCallow
authored
Remove long ago deprecated items. (#926)
Were to have been removed prior to v4 release. * Fix use of one of these names in ktx_js. * Fix unrelated regression that inclusion of ktx_js{,_read} legacy name mappings in msc_basis_transcoder broke the JS.
1 parent 19c2f75 commit b1a115f

File tree

6 files changed

+35
-53
lines changed

6 files changed

+35
-53
lines changed

‎CMakeLists.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -926,15 +926,20 @@ get_source_file_property(zstd_options external/basisu/zstd/zstd.c COMPILE_OPTION
926926

927927
if(EMSCRIPTEN)
928928
set(
929-
KTX_EMC_LINK_FLAGS
929+
KTX_EM_COMMON_LINK_FLAGS
930930
--bind
931-
--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/interface/js_binding/class_compat.js
932-
--extern-post-js ${CMAKE_CURRENT_SOURCE_DIR}/interface/js_binding/module_create_compat.js
933931
"SHELL:-s MODULARIZE=1"
934932
"SHELL:-s EXPORTED_RUNTIME_METHODS=[\'GL\']"
935933
"SHELL:-s GL_PREINITIALIZED_CONTEXT=1"
936934
)
937935

936+
set(
937+
KTX_EM_COMMON_KTX_LINK_FLAGS
938+
--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/interface/js_binding/class_compat.js
939+
--extern-post-js ${CMAKE_CURRENT_SOURCE_DIR}/interface/js_binding/module_create_compat.js
940+
${KTX_EM_COMMON_LINK_FLAGS}
941+
)
942+
938943
set(
939944
KTX_JS_COMMON_SOURCE
940945
interface/js_binding/ktx_wrapper.cpp
@@ -958,7 +963,7 @@ if(EMSCRIPTEN)
958963
target_link_options(
959964
ktx_js
960965
PUBLIC
961-
${KTX_EMC_LINK_FLAGS}
966+
${KTX_EM_COMMON_KTX_LINK_FLAGS}
962967
"SHELL:-s EXPORT_NAME=createKtxModule"
963968
)
964969
set_target_properties( ktx_js PROPERTIES OUTPUT_NAME "libktx")
@@ -995,7 +1000,7 @@ if(EMSCRIPTEN)
9951000
target_link_options(
9961001
ktx_js_read
9971002
PUBLIC
998-
${KTX_EMC_LINK_FLAGS}
1003+
${KTX_EM_COMMON_KTX_LINK_FLAGS}
9991004
"SHELL:-s EXPORT_NAME=createKtxReadModule"
10001005
)
10011006
set_target_properties( ktx_js_read PROPERTIES OUTPUT_NAME "libktx_read")
@@ -1036,7 +1041,7 @@ if(EMSCRIPTEN)
10361041
target_link_options(
10371042
msc_basis_transcoder_js
10381043
PUBLIC
1039-
${KTX_EMC_LINK_FLAGS}
1044+
${KTX_EM_COMMON_LINK_FLAGS}
10401045
"SHELL:-s EXPORT_NAME=MSC_TRANSCODER"
10411046
# Re-use ktx's link options
10421047
$<TARGET_PROPERTY:ktx_read,INTERFACE_LINK_OPTIONS>

‎include/ktx.h

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -692,11 +692,7 @@ typedef enum ktxSupercmpScheme {
692692
KTX_SS_END_RANGE = KTX_SS_ZLIB,
693693
KTX_SS_BEGIN_VENDOR_RANGE = 0x10000,
694694
KTX_SS_END_VENDOR_RANGE = 0x1ffff,
695-
KTX_SS_BEGIN_RESERVED = 0x20000,
696-
KTX_SUPERCOMPRESSION_BASIS = KTX_SS_BASIS_LZ,
697-
/*!< @deprecated Will be removed before v4 release. Use KTX_SS_BASIS_LZ instead. */
698-
KTX_SUPERCOMPRESSION_ZSTD = KTX_SS_ZSTD
699-
/*!< @deprecated Will be removed before v4 release. Use KTX_SS_ZSTD instead. */
695+
KTX_SS_BEGIN_RESERVED = 0x20000
700696
} ktxSupercmpScheme;
701697

702698
/**
@@ -1771,25 +1767,6 @@ KTX_API KTX_error_code KTX_APIENTRY ktxPrintKTX2InfoJSONForStream(ktxStream* str
17711767
}
17721768
#endif
17731769

1774-
/*========================================================================*
1775-
* For backward compatibilty with the V3 & early versions of the V4 APIs. *
1776-
*========================================================================*/
1777-
1778-
/**
1779-
* @deprecated Will be dropped before V4 release.
1780-
*/
1781-
#define ktx_texture_transcode_fmt_e ktx_transcode_fmt_e
1782-
1783-
/**
1784-
* @deprecated Will be dropped before V4 release.
1785-
*/
1786-
#define ktx_texture_decode_flags ktx_transcode_flag_bits
1787-
1788-
/**
1789-
* @deprecated Will be dropped before V4 release.
1790-
*/
1791-
#define ktxTexture_GetSize ktxTexture_GetDatasize
1792-
17931770
/**
17941771
@~English
17951772
@page libktx_history Revision History

‎interface/js_binding/class_compat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Module.onRuntimeInitialized = function() {
1212
Module['ktxTexture'] = Module.texture;
1313
Module['ErrorCode'] = Module.error_code;
14-
Module['TranscodeTarget'] = Module.texture_transcode_fmt;
14+
Module['TranscodeTarget'] = Module.transcode_fmt;
1515
Module['TranscodeFlags'] = Module.transcode_flag_bits;
1616
}
1717

‎interface/js_binding/ktx_wrapper.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ namespace ktx
246246

247247
KTX_error_code result = ktxTexture2_TranscodeBasis(
248248
*this,
249-
targetFormat.as<ktx_texture_transcode_fmt_e>(),
249+
targetFormat.as<ktx_transcode_fmt_e>(),
250250
decodeFlags.as<ktx_transcode_flags>());
251251

252252
if (result != KTX_SUCCESS)
@@ -641,7 +641,7 @@ interface texture {
641641
UploadResult glUpload();
642642
error_code setImageFromMemory(long level, long layer, long faceSlice,
643643
ArrayBufferView imageData); // **
644-
error_code transcodeBasis(texture_transcode_fmt? target, transcode_flag_bits
644+
error_code transcodeBasis(transcode_fmt? target, transcode_flag_bits
645645
decodeFlags);
646646
ArrayBufferView writeToMemory(); // **
647647
error_code addKVPairString(DOMString key, DOMString value); // **
@@ -692,7 +692,7 @@ enum CreateStorageEnum = {
692692
693693
// Some targets may not be available depending on options used when compiling
694694
// the web assembly. ktxTexture.transcodeBasis will report this.
695-
enum texture_transcode_fmt = {
695+
enum transcode_fmt = {
696696
"ETC1_RGB",
697697
"BC1_RGB",
698698
"BC4_R",
@@ -956,26 +956,26 @@ returns the created WebGL texture object and matching texture target.
956956
957957
@code{.js}
958958
function uploadTextureToGl(gl, ktexture) {
959-
const { texture_transcode_fmt } = ktx;
959+
const { transcode_fmt } = ktx;
960960
var formatString;
961961
962962
if (ktexture.needsTranscoding) {
963963
var format;
964964
if (astcSupported) {
965965
formatString = 'ASTC';
966-
format = texture_transcode_fmt.ASTC_4x4_RGBA;
966+
format = transcode_fmt.ASTC_4x4_RGBA;
967967
} else if (dxtSupported) {
968968
formatString = ktexture.numComponents == 4 ? 'BC3' : 'BC1';
969-
format = texture_transcode_fmt.BC1_OR_3;
969+
format = transcode_fmt.BC1_OR_3;
970970
} else if (pvrtcSupported) {
971971
formatString = 'PVRTC1';
972-
format = texture_transcode_fmt.PVRTC1_4_RGBA;
972+
format = transcode_fmt.PVRTC1_4_RGBA;
973973
} else if (etcSupported) {
974974
formatString = 'ETC';
975-
format = texture_transcode_fmt.ETC;
975+
format = transcode_fmt.ETC;
976976
} else {
977977
formatString = 'RGBA4444';
978-
format = texture_transcode_fmt.RGBA4444;
978+
format = transcode_fmt.RGBA4444;
979979
}
980980
if (ktexture.transcodeBasis(format, 0) != ktx.error_code.SUCCESS) {
981981
alert('Texture transcode failed. See console for details.');
@@ -1182,7 +1182,7 @@ EMSCRIPTEN_BINDINGS(ktx)
11821182
.value("DECOMPRESS_CHECKSUM_ERROR", KTX_DECOMPRESS_CHECKSUM_ERROR)
11831183
;
11841184

1185-
enum_<ktx_texture_transcode_fmt_e>("texture_transcode_fmt")
1185+
enum_<ktx_transcode_fmt_e>("transcode_fmt")
11861186
.value("ETC1_RGB", KTX_TTF_ETC1_RGB)
11871187
.value("BC1_RGB", KTX_TTF_BC1_RGB)
11881188
.value("BC4_R", KTX_TTF_BC4_R)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,26 +348,26 @@ function elem(id) {
348348
//
349349
// needs Emscripten's OpenGL ES emulation.
350350
function uploadTextureToGl(gl, ktexture) {
351-
const { texture_transcode_fmt } = ktx;
351+
const { transcode_fmt } = ktx;
352352
var formatString;
353353

354354
if (ktexture.needsTranscoding) {
355355
var format;
356356
if (astcSupported) {
357357
formatString = 'ASTC';
358-
format = texture_transcode_fmt.ASTC_4x4_RGBA;
358+
format = transcode_fmt.ASTC_4x4_RGBA;
359359
} else if (dxtSupported) {
360360
formatString = ktexture.numComponents == 4 ? 'BC3' : 'BC1';
361-
format = texture_transcode_fmt.BC1_OR_3;
361+
format = transcode_fmt.BC1_OR_3;
362362
} else if (pvrtcSupported) {
363363
formatString = 'PVRTC1';
364-
format = texture_transcode_fmt.PVRTC1_4_RGBA;
364+
format = transcode_fmt.PVRTC1_4_RGBA;
365365
} else if (etcSupported) {
366366
formatString = 'ETC';
367-
format = texture_transcode_fmt.ETC;
367+
format = transcode_fmt.ETC;
368368
} else {
369369
formatString = 'RGBA4444';
370-
format = texture_transcode_fmt.RGBA4444;
370+
format = transcode_fmt.RGBA4444;
371371
}
372372
if (ktexture.transcodeBasis(format, 0) != ktx.error_code.SUCCESS) {
373373
alert('Texture transcode failed. See console for details.');

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,26 +428,26 @@ function elem(id) {
428428
//
429429
// Returns the created WebGL texture object and texture target.
430430
function uploadTextureToGl(gl, ktexture) {
431-
const { texture_transcode_fmt } = ktx;
431+
const { transcode_fmt } = ktx;
432432
var formatString;
433433

434434
if (ktexture.needsTranscoding) {
435435
var format;
436436
if (astcSupported) {
437437
formatString = 'ASTC';
438-
format = texture_transcode_fmt.ASTC_4x4_RGBA;
438+
format = transcode_fmt.ASTC_4x4_RGBA;
439439
} else if (dxtSupported) {
440440
formatString = ktexture.numComponents == 4 ? 'BC3' : 'BC1';
441-
format = texture_transcode_fmt.BC1_OR_3;
441+
format = transcode_fmt.BC1_OR_3;
442442
} else if (pvrtcSupported) {
443443
formatString = 'PVRTC1';
444-
format = texture_transcode_fmt.PVRTC1_4_RGBA;
444+
format = transcode_fmt.PVRTC1_4_RGBA;
445445
} else if (etcSupported) {
446446
formatString = 'ETC';
447-
format = texture_transcode_fmt.ETC;
447+
format = transcode_fmt.ETC;
448448
} else {
449449
formatString = 'RGBA4444';
450-
format = texture_transcode_fmt.RGBA4444;
450+
format = transcode_fmt.RGBA4444;
451451
}
452452
if (ktexture.transcodeBasis(format, 0) != ktx.error_code.SUCCESS) {
453453
alert('Texture transcode failed. See console for details.');

0 commit comments

Comments
 (0)