diff --git a/doc/notes/3.3.4.md b/doc/notes/3.3.4.md
index cb7a4307b1..79b92d6ad8 100644
--- a/doc/notes/3.3.4.md
+++ b/doc/notes/3.3.4.md
@@ -61,6 +61,7 @@ This build includes the following changes:
 
 - Core: Fixed callback wrapper memory leak with the CHM closure registry. (#927)
 - Core: The `SharedLibraryLoader` will now always test if `System::load` works before choosing the extract path. (#987)
+- bgfx: Fixed `bgfx_is_frame_buffer_valid` to accept `BGFXAttachment.Buffer`. (#993)
 - JAWT: Fixed `JAWT_MACOSX_USE_CALAYER` value.
 - LLVM: Fixed `LLVMGetBufferStart` to return `ByteBuffer` instead of `String`. (#934)
 - LLVM: Fixed `LookupIntrinsicID` to return `unsigned` instead of `void`. (#950)
diff --git a/modules/lwjgl/bgfx/src/generated/java/org/lwjgl/bgfx/BGFX.java b/modules/lwjgl/bgfx/src/generated/java/org/lwjgl/bgfx/BGFX.java
index d23f3e817a..d98b14fe4b 100644
--- a/modules/lwjgl/bgfx/src/generated/java/org/lwjgl/bgfx/BGFX.java
+++ b/modules/lwjgl/bgfx/src/generated/java/org/lwjgl/bgfx/BGFX.java
@@ -2985,7 +2985,11 @@ public static boolean bgfx_is_texture_valid(@NativeType("uint16_t") int _depth,
 
     // --- [ bgfx_is_frame_buffer_valid ] ---
 
-    /** Unsafe version of: {@link #bgfx_is_frame_buffer_valid is_frame_buffer_valid} */
+    /**
+     * Unsafe version of: {@link #bgfx_is_frame_buffer_valid is_frame_buffer_valid}
+     *
+     * @param _num number of attachments
+     */
     public static boolean nbgfx_is_frame_buffer_valid(byte _num, long _attachment) {
         long __functionAddress = Functions.is_frame_buffer_valid;
         return invokeUPZ(_num, _attachment, __functionAddress);
@@ -2994,14 +2998,13 @@ public static boolean nbgfx_is_frame_buffer_valid(byte _num, long _attachment) {
     /**
      * Validate frame buffer parameters.
      *
-     * @param _num        number of attachments
      * @param _attachment attachment texture info
      *
      * @return true if a frame buffer with the same parameters can be created
      */
     @NativeType("bool")
-    public static boolean bgfx_is_frame_buffer_valid(@NativeType("uint8_t") int _num, @NativeType("bgfx_attachment_t const *") BGFXAttachment _attachment) {
-        return nbgfx_is_frame_buffer_valid((byte)_num, _attachment.address());
+    public static boolean bgfx_is_frame_buffer_valid(@NativeType("bgfx_attachment_t const *") BGFXAttachment.Buffer _attachment) {
+        return nbgfx_is_frame_buffer_valid((byte)_attachment.remaining(), _attachment.address());
     }
 
     // --- [ bgfx_calc_texture_size ] ---
diff --git a/modules/lwjgl/bgfx/src/templates/kotlin/bgfx/templates/BGFX.kt b/modules/lwjgl/bgfx/src/templates/kotlin/bgfx/templates/BGFX.kt
index 6a2f6a4536..fd8ce3b6c0 100644
--- a/modules/lwjgl/bgfx/src/templates/kotlin/bgfx/templates/BGFX.kt
+++ b/modules/lwjgl/bgfx/src/templates/kotlin/bgfx/templates/BGFX.kt
@@ -1544,7 +1544,7 @@ RGBA16S
         "is_frame_buffer_valid",
         "Validate frame buffer parameters.",
 
-        MapToInt..uint8_t("_num", "number of attachments"),
+        AutoSize("_attachment")..uint8_t("_num", "number of attachments"),
         bgfx_attachment_t.const.p("_attachment", "attachment texture info"),
 
         returnDoc = "true if a frame buffer with the same parameters can be created"