AGL updates.

4 files changed, 23 insertions, 8 deletions

diff --git a/bundles/org.eclipse.swt.opengl/carbon/library/agl.c b/bundles/org.eclipse.swt.opengl/carbon/library/agl.c
index ce3bfc6480..2434984c00 100644
--- a/bundles/org.eclipse.swt.opengl/carbon/library/agl.c
+++ b/bundles/org.eclipse.swt.opengl/carbon/library/agl.c
@@ -119,18 +119,30 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetDrawable)
 }
 #endif
 
-#ifndef NO_aglSetInteger
-JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetInteger)
+#ifndef NO_aglSetInteger__III
+JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetInteger__III)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jboolean rc = 0;
+	AGL_NATIVE_ENTER(env, that, aglSetInteger__III_FUNC);
+	rc = (jboolean)aglSetInteger(arg0, arg1, arg2);
+	AGL_NATIVE_EXIT(env, that, aglSetInteger__III_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_aglSetInteger__II_3I
+JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetInteger__II_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jboolean rc = 0;
-	AGL_NATIVE_ENTER(env, that, aglSetInteger_FUNC);
+	AGL_NATIVE_ENTER(env, that, aglSetInteger__II_3I_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jboolean)aglSetInteger(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	AGL_NATIVE_EXIT(env, that, aglSetInteger_FUNC);
+	AGL_NATIVE_EXIT(env, that, aglSetInteger__II_3I_FUNC);
 	return rc;
 }
 #endif
diff --git a/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.c b/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.c
index 2178ccbd78..2d26396cb6 100644
--- a/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.c
+++ b/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int AGL_nativeFunctionCount = 11;
-int AGL_nativeFunctionCallCount[11];
+int AGL_nativeFunctionCount = 12;
+int AGL_nativeFunctionCallCount[12];
 char * AGL_nativeFunctionNames[] = {
 	"aglChoosePixelFormat",
 	"aglCreateContext",
@@ -25,7 +25,8 @@ char * AGL_nativeFunctionNames[] = {
 	"aglGetCurrentContext",
 	"aglSetCurrentContext",
 	"aglSetDrawable",
-	"aglSetInteger",
+	"aglSetInteger__III",
+	"aglSetInteger__II_3I",
 	"aglSwapBuffers",
 	"aglUpdateContext",
 };
diff --git a/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.h b/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.h
index 28d1639d03..00ded539fc 100644
--- a/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.h
+++ b/bundles/org.eclipse.swt.opengl/carbon/library/agl_stats.h
@@ -29,7 +29,8 @@ typedef enum {
 	aglGetCurrentContext_FUNC,
 	aglSetCurrentContext_FUNC,
 	aglSetDrawable_FUNC,
-	aglSetInteger_FUNC,
+	aglSetInteger__III_FUNC,
+	aglSetInteger__II_3I_FUNC,
 	aglSwapBuffers_FUNC,
 	aglUpdateContext_FUNC,
 } AGL_FUNCS;
diff --git a/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/internal/opengl/carbon/AGL.java b/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/internal/opengl/carbon/AGL.java
index 2aa8e29257..7e453a913a 100644
--- a/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/internal/opengl/carbon/AGL.java
+++ b/bundles/org.eclipse.swt.opengl/carbon/org/eclipse/swt/internal/opengl/carbon/AGL.java
@@ -51,6 +51,7 @@ public static final native int aglGetCurrentContext();
 public static final native boolean aglSetCurrentContext(int ctx);
 public static final native boolean aglSetDrawable(int ctx, int draw);
 public static final native boolean aglSetInteger(int ctx, int pname, int[] params);
+public static final native boolean aglSetInteger(int ctx, int pname, int param);
 public static final native void aglSwapBuffers(int ctx);
 public static final native boolean aglUpdateContext(int ctx);
 }
\ No newline at end of file