Skip to content

Commit

Permalink
fix(GL): ListDrawCommandsStatesClientNV parameter type
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spasi
Spasi committed Mar 21, 2021
1 parent 2b0d10a commit cda6831
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions modules/lwjgl/core/src/generated/c/org_lwjgl_system_JNI.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6516,13 +6516,15 @@ JNIEXPORT void JNICALL Java_org_lwjgl_system_JNI_callPPPPV__III_3I_3I_3IJJ(JNIEn
if (param4 != NULL) { (*__env)->ReleaseIntArrayElements(__env, param4, paramArray4, 0); }
if (param3 != NULL) { (*__env)->ReleaseIntArrayElements(__env, param3, paramArray3, 0); }
}
JNIEXPORT void JNICALL Java_org_lwjgl_system_JNI_callPPPPV__IIJJ_3I_3IIJ(JNIEnv *__env, jclass clazz, jint param0, jint param1, jlong param2, jlong param3, jintArray param4, jintArray param5, jint param6, jlong __functionAddress) {
JNIEXPORT void JNICALL Java_org_lwjgl_system_JNI_callPPPPV__IIJ_3I_3I_3IIJ(JNIEnv *__env, jclass clazz, jint param0, jint param1, jlong param2, jintArray param3, jintArray param4, jintArray param5, jint param6, jlong __functionAddress) {
UNUSED_PARAMS(__env, clazz)
void *paramArray3 = param3 == NULL ? NULL : (*__env)->GetIntArrayElements(__env, param3, NULL);
void *paramArray4 = param4 == NULL ? NULL : (*__env)->GetIntArrayElements(__env, param4, NULL);
void *paramArray5 = param5 == NULL ? NULL : (*__env)->GetIntArrayElements(__env, param5, NULL);
((void (APIENTRY *) (jint, jint, intptr_t, intptr_t, intptr_t, intptr_t, jint))(intptr_t)__functionAddress)(param0, param1, (intptr_t)param2, (intptr_t)param3, (intptr_t)paramArray4, (intptr_t)paramArray5, param6);
((void (APIENTRY *) (jint, jint, intptr_t, intptr_t, intptr_t, intptr_t, jint))(intptr_t)__functionAddress)(param0, param1, (intptr_t)param2, (intptr_t)paramArray3, (intptr_t)paramArray4, (intptr_t)paramArray5, param6);
if (param5 != NULL) { (*__env)->ReleaseIntArrayElements(__env, param5, paramArray5, 0); }
if (param4 != NULL) { (*__env)->ReleaseIntArrayElements(__env, param4, paramArray4, 0); }
if (param3 != NULL) { (*__env)->ReleaseIntArrayElements(__env, param3, paramArray3, 0); }
}
JNIEXPORT void JNICALL Java_org_lwjgl_system_JNI_callPJPPV__JIJII_3JI_3IJ(JNIEnv *__env, jclass clazz, jlong param0, jint param1, jlong param2, jint param3, jint param4, jlongArray param5, jint param6, jintArray param7, jlong __functionAddress) {
UNUSED_PARAMS(__env, clazz)
Expand Down
2 changes: 1 addition & 1 deletion modules/lwjgl/core/src/generated/java/org/lwjgl/system/JNI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ private JNI() {}
public static native void callPPPPV(int param0, long param1, @Nullable int[] param2, @Nullable int[] param3, @Nullable int[] param4, int param5, long __functionAddress);
public static native void callPPPPV(long param0, int param1, int param2, @Nullable long[] param3, @Nullable long[] param4, @Nullable long[] param5, long __functionAddress);
public static native void callPPPPV(int param0, int param1, int param2, @Nullable int[] param3, @Nullable int[] param4, @Nullable int[] param5, long param6, long __functionAddress);
public static native void callPPPPV(int param0, int param1, long param2, long param3, @Nullable int[] param4, @Nullable int[] param5, int param6, long __functionAddress);
public static native void callPPPPV(int param0, int param1, long param2, @Nullable int[] param3, @Nullable int[] param4, @Nullable int[] param5, int param6, long __functionAddress);
public static native void callPJPPV(long param0, int param1, long param2, int param3, int param4, @Nullable long[] param5, int param6, @Nullable int[] param7, long __functionAddress);
public static native void callPJJJPV(long param0, long param1, long param2, long param3, @Nullable double[] param4, long __functionAddress);
public static native void callPJJJPV(long param0, long param1, long param2, long param3, @Nullable float[] param4, long __functionAddress);
Expand Down
6 changes: 3 additions & 3 deletions modules/lwjgl/opengl/src/generated/java/org/lwjgl/opengl/NVCommandList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ public static void glDeleteCommandListsNV(@NativeType("GLuint const *") int list
* @param states the array of state object names
* @param fbos the array of framebuffer object names
*/
public static void glListDrawCommandsStatesClientNV(@NativeType("GLuint") int list, @NativeType("GLuint") int segment, @NativeType("void const **") PointerBuffer indirects, @NativeType("size_t const *") PointerBuffer sizes, @NativeType("GLuint const *") IntBuffer states, @NativeType("GLuint const *") IntBuffer fbos) {
public static void glListDrawCommandsStatesClientNV(@NativeType("GLuint") int list, @NativeType("GLuint") int segment, @NativeType("void const **") PointerBuffer indirects, @NativeType("GLsizei const *") IntBuffer sizes, @NativeType("GLuint const *") IntBuffer states, @NativeType("GLuint const *") IntBuffer fbos) {
if (CHECKS) {
check(sizes, indirects.remaining());
check(states, indirects.remaining());
Expand Down Expand Up @@ -645,15 +645,15 @@ public static void glDeleteCommandListsNV(@NativeType("GLuint const *") int[] li
}

/** Array version of: {@link #glListDrawCommandsStatesClientNV ListDrawCommandsStatesClientNV} */
public static void glListDrawCommandsStatesClientNV(@NativeType("GLuint") int list, @NativeType("GLuint") int segment, @NativeType("void const **") PointerBuffer indirects, @NativeType("size_t const *") PointerBuffer sizes, @NativeType("GLuint const *") int[] states, @NativeType("GLuint const *") int[] fbos) {
public static void glListDrawCommandsStatesClientNV(@NativeType("GLuint") int list, @NativeType("GLuint") int segment, @NativeType("void const **") PointerBuffer indirects, @NativeType("GLsizei const *") int[] sizes, @NativeType("GLuint const *") int[] states, @NativeType("GLuint const *") int[] fbos) {
long __functionAddress = GL.getICD().glListDrawCommandsStatesClientNV;
if (CHECKS) {
check(__functionAddress);
check(sizes, indirects.remaining());
check(states, indirects.remaining());
check(fbos, indirects.remaining());
}
callPPPPV(list, segment, memAddress(indirects), memAddress(sizes), states, fbos, indirects.remaining(), __functionAddress);
callPPPPV(list, segment, memAddress(indirects), sizes, states, fbos, indirects.remaining(), __functionAddress);
}

}
2 changes: 1 addition & 1 deletion modules/lwjgl/opengl/src/templates/kotlin/opengl/templates/NV_command_list.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ typedef struct {
GLuint("list", "the command list"),
GLuint("segment", "the segment"),
void.const.p.p("indirects", "the array of GPU addresses"),
size_t.const.p("sizes", "the array of command lengths"),
GLsizei.const.p("sizes", "the array of command lengths"),
GLuint.const.p("states", "the array of state object names"),
GLuint.const.p("fbos", "the array of framebuffer object names"),
AutoSize("indirects", "sizes", "states", "fbos")..GLuint("count", "the number of commands")
Expand Down

0 comments on commit cda6831

Please sign in to comment.