diff options
| author | Kenneth Russel <[email protected]> | 2004-04-21 10:02:51 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-04-21 10:02:51 +0000 |
| commit | c8440fcccaa8b306c8b52acf384fa14daec95f5c (patch) | |
| tree | 494753a9aaeec60c9994b1390b3cc643514750f8 /make | |
| parent | 0f2fa98495ce75434fc011e7ba2976c78edd38d0 (diff) | |
Updated context creation code to unpack GLCapabilities object in Java
rather than in C using JNI. Added full-scene antialiasing (FSAA) support.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@113 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/cgl-macosx.cfg | 14 | ||||
| -rw-r--r-- | make/stub_includes/macosx/window-system.c | 15 |
2 files changed, 26 insertions, 3 deletions
diff --git a/make/cgl-macosx.cfg b/make/cgl-macosx.cfg index 6592f98dd..a933b36d9 100644 --- a/make/cgl-macosx.cfg +++ b/make/cgl-macosx.cfg @@ -13,7 +13,19 @@ Opaque long void * # this was the easiest way of sharing the prototypes between these files CustomCCode typedef int Bool; -CustomCCode extern void* createContext(JNIEnv * env, jobject glCapabilities, void* shareContext, void* nsView); +CustomCCode extern void* createContext(void* shareContext, void* nsView, +CustomCCode int redBits, +CustomCCode int greenBits, +CustomCCode int blueBits, +CustomCCode int alphaBits, +CustomCCode int depthBits, +CustomCCode int stencilBits, +CustomCCode int accumRedBits, +CustomCCode int accumGreenBits, +CustomCCode int accumBlueBits, +CustomCCode int accumAlphaBits, +CustomCCode int sampleBuffers, +CustomCCode int numSamples); CustomCCode extern Bool makeCurrentContext(void* nsContext, void* nsView); CustomCCode extern Bool clearCurrentContext(void* nsContext, void* nsView); CustomCCode extern Bool deleteContext(void* nsContext, void* nsView); diff --git a/make/stub_includes/macosx/window-system.c b/make/stub_includes/macosx/window-system.c index 5b1381792..2908b07be 100644 --- a/make/stub_includes/macosx/window-system.c +++ b/make/stub_includes/macosx/window-system.c @@ -1,10 +1,21 @@ /* C routines encapsulating small amounts of Objective C code to allow nsContext creation and manipulation to occur from Java */ -#include <jni.h> typedef int Bool; -void* createContext(JNIEnv* env, jobject glCapabilities, void* shareContext, void* nsView); +void* createContext(void* shareContext, void* nsView, + int redBits, + int greenBits, + int blueBits, + int alphaBits, + int depthBits, + int stencilBits, + int accumRedBits, + int accumGreenBits, + int accumBlueBits, + int accumAlphaBits, + int sampleBuffers, + int numSamples); Bool makeCurrentContext(void* nsContext, void* nsView); Bool clearCurrentContext(void* nsContext, void* nsView); Bool deleteContext(void* nsContext, void* nsView); |