From b44ba7af8030200bee34d7dfb77edf5617589328 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Wed, 15 Feb 2023 17:46:29 +0200 Subject: [PATCH] fix(zstd) remove deprecated function --- .../org/lwjgl/util/vma/VmaPoolCreateInfo.java | 4 ++++ .../src/generated/c/org_lwjgl_util_zstd_ZstdX.c | 7 ------- .../generated/java/org/lwjgl/util/zstd/ZstdX.java | 15 --------------- .../src/templates/kotlin/zstd/templates/ZstdX.kt | 9 --------- 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/modules/lwjgl/vma/src/generated/java/org/lwjgl/util/vma/VmaPoolCreateInfo.java b/modules/lwjgl/vma/src/generated/java/org/lwjgl/util/vma/VmaPoolCreateInfo.java index 84184aa2c7..00bdabac61 100644 --- a/modules/lwjgl/vma/src/generated/java/org/lwjgl/util/vma/VmaPoolCreateInfo.java +++ b/modules/lwjgl/vma/src/generated/java/org/lwjgl/util/vma/VmaPoolCreateInfo.java @@ -178,6 +178,8 @@ public VmaPoolCreateInfo(ByteBuffer container) { public VmaPoolCreateInfo pMemoryAllocateNext(VkExportMemoryWin32HandleInfoNV value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkExportMetalObjectCreateInfoEXT} value to the {@code pMemoryAllocateNext} chain. */ public VmaPoolCreateInfo pMemoryAllocateNext(VkExportMetalObjectCreateInfoEXT value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } + /** Prepends the specified {@link VkImportAndroidHardwareBufferInfoANDROID} value to the {@code pMemoryAllocateNext} chain. */ + public VmaPoolCreateInfo pMemoryAllocateNext(VkImportAndroidHardwareBufferInfoANDROID value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkImportMemoryFdInfoKHR} value to the {@code pMemoryAllocateNext} chain. */ public VmaPoolCreateInfo pMemoryAllocateNext(VkImportMemoryFdInfoKHR value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkImportMemoryHostPointerInfoEXT} value to the {@code pMemoryAllocateNext} chain. */ @@ -496,6 +498,8 @@ protected VmaPoolCreateInfo getElementFactory() { public VmaPoolCreateInfo.Buffer pMemoryAllocateNext(VkExportMemoryWin32HandleInfoNV value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkExportMetalObjectCreateInfoEXT} value to the {@code pMemoryAllocateNext} chain. */ public VmaPoolCreateInfo.Buffer pMemoryAllocateNext(VkExportMetalObjectCreateInfoEXT value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } + /** Prepends the specified {@link VkImportAndroidHardwareBufferInfoANDROID} value to the {@code pMemoryAllocateNext} chain. */ + public VmaPoolCreateInfo.Buffer pMemoryAllocateNext(VkImportAndroidHardwareBufferInfoANDROID value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkImportMemoryFdInfoKHR} value to the {@code pMemoryAllocateNext} chain. */ public VmaPoolCreateInfo.Buffer pMemoryAllocateNext(VkImportMemoryFdInfoKHR value) { return this.pMemoryAllocateNext(value.pNext(this.pMemoryAllocateNext()).address()); } /** Prepends the specified {@link VkImportMemoryHostPointerInfoEXT} value to the {@code pMemoryAllocateNext} chain. */ diff --git a/modules/lwjgl/zstd/src/generated/c/org_lwjgl_util_zstd_ZstdX.c b/modules/lwjgl/zstd/src/generated/c/org_lwjgl_util_zstd_ZstdX.c index 277aad4f82..e33cb759b9 100644 --- a/modules/lwjgl/zstd/src/generated/c/org_lwjgl_util_zstd_ZstdX.c +++ b/modules/lwjgl/zstd/src/generated/c/org_lwjgl_util_zstd_ZstdX.c @@ -465,13 +465,6 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_util_zstd_ZstdX_nZSTD_1compressBegin_1usi return (jlong)ZSTD_compressBegin_usingCDict(cctx, cdict); } -JNIEXPORT jlong JNICALL Java_org_lwjgl_util_zstd_ZstdX_nZSTD_1copyCCtx(JNIEnv *__env, jclass clazz, jlong cctxAddress, jlong preparedCCtxAddress, jlong pledgedSrcSize) { - ZSTD_CCtx *cctx = (ZSTD_CCtx *)(uintptr_t)cctxAddress; - ZSTD_CCtx const *preparedCCtx = (ZSTD_CCtx const *)(uintptr_t)preparedCCtxAddress; - UNUSED_PARAMS(__env, clazz) - return (jlong)ZSTD_copyCCtx(cctx, preparedCCtx, (unsigned long long)pledgedSrcSize); -} - JNIEXPORT jlong JNICALL Java_org_lwjgl_util_zstd_ZstdX_nZSTD_1compressContinue(JNIEnv *__env, jclass clazz, jlong cctxAddress, jlong dstAddress, jlong dstCapacity, jlong srcAddress, jlong srcSize) { ZSTD_CCtx *cctx = (ZSTD_CCtx *)(uintptr_t)cctxAddress; void *dst = (void *)(uintptr_t)dstAddress; diff --git a/modules/lwjgl/zstd/src/generated/java/org/lwjgl/util/zstd/ZstdX.java b/modules/lwjgl/zstd/src/generated/java/org/lwjgl/util/zstd/ZstdX.java index ccd1564bcc..05032c81df 100644 --- a/modules/lwjgl/zstd/src/generated/java/org/lwjgl/util/zstd/ZstdX.java +++ b/modules/lwjgl/zstd/src/generated/java/org/lwjgl/util/zstd/ZstdX.java @@ -1768,21 +1768,6 @@ public static long ZSTD_compressBegin_usingCDict(@NativeType("ZSTD_CCtx *") long return nZSTD_compressBegin_usingCDict(cctx, cdict); } - // --- [ ZSTD_copyCCtx ] --- - - /** Unsafe version of: {@link #ZSTD_copyCCtx copyCCtx} */ - public static native long nZSTD_copyCCtx(long cctx, long preparedCCtx, long pledgedSrcSize); - - /** @param pledgedSrcSize if not known, use {@link Zstd#ZSTD_CONTENTSIZE_UNKNOWN CONTENTSIZE_UNKNOWN} */ - @NativeType("size_t") - public static long ZSTD_copyCCtx(@NativeType("ZSTD_CCtx *") long cctx, @NativeType("ZSTD_CCtx const *") long preparedCCtx, @NativeType("unsigned long long") long pledgedSrcSize) { - if (CHECKS) { - check(cctx); - check(preparedCCtx); - } - return nZSTD_copyCCtx(cctx, preparedCCtx, pledgedSrcSize); - } - // --- [ ZSTD_compressContinue ] --- public static native long nZSTD_compressContinue(long cctx, long dst, long dstCapacity, long src, long srcSize); diff --git a/modules/lwjgl/zstd/src/templates/kotlin/zstd/templates/ZstdX.kt b/modules/lwjgl/zstd/src/templates/kotlin/zstd/templates/ZstdX.kt index 12e192748c..13a430431d 100644 --- a/modules/lwjgl/zstd/src/templates/kotlin/zstd/templates/ZstdX.kt +++ b/modules/lwjgl/zstd/src/templates/kotlin/zstd/templates/ZstdX.kt @@ -1414,15 +1414,6 @@ v v v ZSTD_CDict.const.p("cdict", "") ) - size_t( - "copyCCtx", - "", - - ZSTD_CCtx.p("cctx", ""), - ZSTD_CCtx.const.p("preparedCCtx", ""), - unsigned_long_long("pledgedSrcSize", "if not known, use #CONTENTSIZE_UNKNOWN") - ) - size_t( "compressContinue", "",