Merged JSR-231 branch on to the main JOGL trunk. The main trunk now

contains the evolving JSR-231 Reference Implementation and the JSR-231
branch is permanently closed.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@401 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 43 insertions, 8 deletions

diff --git a/make/cg-common.cfg b/make/cg-common.cfg
index 2954538f6..4e42ceb48 100644
--- a/make/cg-common.cfg
+++ b/make/cg-common.cfg
@@ -1,44 +1,67 @@
 # This .cfg file provides common options used among all Cg glue code
 # generated for Jogl on all platforms.
-Package net.java.games.cg
-ImplPackage net.java.games.cg.impl
+Package com.sun.opengl.cg
 JavaClass CgGL
 Style AllStatic
 JavaOutputDir ../build/gensrc/classes
 NativeOutputDir ../build/gensrc/native/jogl_cg
 HierarchicalNativeOutput false
 
-# Generate "flattened" NIO variants for routines taking C primitive
-# pointers that aren't of type void*
-NioMode ALL_POINTERS
-FlattenNIOVariants true
-
 #
 # Map const char* return values to Java strings for these functions
 #
+ReturnsString cgGetAnnotationName
 ReturnsString cgGetEnumString
 ReturnsString cgGetErrorString
 ReturnsString cgGetLastErrorString
 ReturnsString cgGetLastListing
 ReturnsString cgGetParameterName
 ReturnsString cgGetParameterSemantic
+ReturnsString cgGetPassName
 ReturnsString cgGetProfileString
 ReturnsString cgGetProgramString
 ReturnsString cgGetResourceString
+ReturnsString cgGetStateName
 ReturnsString cgGetString
+ReturnsString cgGetStringAnnotationValue
+ReturnsString cgGetStringParameterValue
+ReturnsString cgGetStringStateAssignmentValue
+ReturnsString cgGetTechniqueName
 ReturnsString cgGetTypeString
 
+ArgumentIsString cgAddStateEnumerant 1
+ArgumentIsString cgCreateArrayState 1
+ArgumentIsString cgCreateArraySamplerState 1
+ArgumentIsString cgCreateEffect 1 2
+ArgumentIsString cgCreateEffectFromFile 1 2
 ArgumentIsString cgCreateProgram 2 4 5
 ArgumentIsString cgCreateProgramFromFile 2 4 5
+ArgumentIsString cgCreateProgramFromEffect 2 3
+ArgumentIsString cgCreateSamplerState 1
+ArgumentIsString cgCreateState 1
+ArgumentIsString cgGetEffectParameterBySemantic 1
 ArgumentIsString cgGetEnum 0
+ArgumentIsString cgGetNamedEffectParameter 1
 ArgumentIsString cgGetNamedParameter 1
+ArgumentIsString cgGetNamedPass 1
 ArgumentIsString cgGetNamedProgramParameter 2
+ArgumentIsString cgGetNamedSamplerState 1
+ArgumentIsString cgGetNamedState 1
+ArgumentIsString cgGetNamedSamplerStateAssignment 1
+ArgumentIsString cgGetNamedStateAssignment 1
 ArgumentIsString cgGetNamedStructParameter 1
+ArgumentIsString cgGetNamedTechnique 1
+ArgumentIsString cgGetNamedTechniqueAnnotation 1
+ArgumentIsString cgGetNamedPassAnnotation 1
+ArgumentIsString cgGetNamedParameterAnnotation 1
+ArgumentIsString cgGetNamedProgramAnnotation 1
 ArgumentIsString cgGetNamedUserType 1
 ArgumentIsString cgGetProfile 0
 ArgumentIsString cgGetType 0
 ArgumentIsString cgGetResource 0
+ArgumentIsString cgSetLastListing 1
 ArgumentIsString cgSetParameterSemantic 1
+ArgumentIsString cgSetStringParameterValue 1
 
 # Opaque definitions
 Opaque boolean CGbool
@@ -47,14 +70,26 @@ Opaque boolean CGbool
 # FIXME!!!!  Ignore these functions for now because we can't
 # automatically handle C callbacks
 #
-Ignore cgGetErrorCallback
 Ignore cgSetErrorCallback
+Ignore cgGetErrorCallback
+Ignore cgSetErrorHandler
+Ignore cgGetErrorHandler
+Ignore cgSetStateCallbacks
+Ignore cgGetStateSetCallback
+Ignore cgGetStateResetCallback
+Ignore cgGetStateValidateCallback
 
 #
 # FIXME!!!!  Ignore these functions for now because bugs in the
 # emitter code can't handle them
 #
 Ignore cgGetParameterValues
+Ignore cgGetBooleanAnnotationValues
+Ignore cgGetBoolStateAssignmentValues
+Ignore cgGetFloatAnnotationValues
+Ignore cgGetFloatStateAssignmentValues
+Ignore cgGetIntAnnotationValues
+Ignore cgGetIntStateAssignmentValues
 
 #
 # Need to import New IO for Buffer classes