summaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* Restructured generation of MethodBindings and emitters to more closely Kenneth Russel2005-08-296-51/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match desired new code generation style of mapping void* to Buffer and to support non-direct Buffers. Removed expansion of void* to multiple primitive array types. Primitive-type C pointers (such as int*) are now exposed as IntBuffer and (optionally) int[], if NioDirectOnly has not been specified. The int[] variant is a simple wrapper around the indirect buffer implementation. If desired, expansion of void* to other array types could be layered on this new support. Rewrote and simplified expandMethodBinding and split up creation of emitters into generatePublicEmitters and generatePrivateEmitters. Deleted JavaMethodBindingImplEmitter and CMethodBindingImplEmitter and folded their functionality into their superclasses, controlled under flags, which makes it more straightforward to tweak a given emitter to produce correct glue code. Restructured OpenGL-specific JavaGLPAWrapperEmitter and CGLPAWrapperEmitter and how they are created by the GLEmitter; these classes are now much simpler than before. Changed how data types are passed from MethodBindings to Emitters. Generally only two MethodBindings will be created, one which maps types like int* to IntBuffer and one which maps it to int[]. The version taking Buffers will be the only one for which glue code will be generated; the one taking int[] will call the native code for the indirect buffer case for the one taking Buffers. Compound types (representing C structs) and compound type arrays (represending arrays of C structs) are no longer mapped to NIO ByteBuffers and arrays of NIO ByteBuffers by the MethodBinding; erasure and lowering of types is now handled by the Emitters, to preserve more type information during the code generation process. It is unclear whether this is in the end a simplification or just pushing code around, but it does help reduce confusion over the number of MethodBindings floating around in the system and what purpose they served. Restructured cure JOGL code and demos to work with new APIs, in particular new glTexImage*D, glDrawElements, and glReadPixels Buffer arguments. Fixed performance problem in new Animator which occurred with VertexArrayRange demo. Added new gluPickMatrix entry point to be able to implement NIO variant in generated signatures. Some further simplifications of the new code may be possible (i.e., some new flags in JavaMethodBindingEmitter and MethodBinding removed) and it is possible more unused code remains to be deleted. As it stands the new GL.java is significantly smaller than before, as all of the expansions of void* to primitive arrays are gone, several areas of GlueGen are easier to understand, and while some functionality has been lost, the autogenerated APIs are basically in the final form specified by JSR-231. Tested with the JOGL demos on Windows and Linux. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@353 232f8b59-042b-4e1e-8c03-345bb8c30851
* Cleaned up build process slightly; GL interface and implementing classKenneth Russel2005-07-2811-143/+100
| | | | | | | are now generated at the same time. Deleted gl-impl-[platform].cfg files. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@339 232f8b59-042b-4e1e-8c03-345bb8c30851
* Upgraded Cg headers to 1.4 including initial CgFX extensions. Much new Kenneth Russel2005-07-276-150/+429
| | | | | | | | functionality needed to be ignored; unclear whether the resulting binding is very useful at the momemnt. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@338 232f8b59-042b-4e1e-8c03-345bb8c30851
* Refactored platform extensions out of the GL interface and Kenneth Russel2005-07-2720-272/+256
| | | | | | | | | | | | | | implementation and into their own objects according to the JSR-231 expert group's resolutions. Moved the interfaces declaring these extensions into the platform-specific implementation directories and added a loosely-specified GL.getPlatformGLExtensions(). This will shrink the size of the platform-independent jar file considerably as the implementing class for the public GL interface is now no longer replicated for each platform. The build process is also simplified a fair bit; more simplifications are possible. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@337 232f8b59-042b-4e1e-8c03-345bb8c30851
* Added new IgnoreExtension directive to the GLEmitter which allows a Kenneth Russel2005-07-222-2/+7
| | | | | | | | block of functions and #defines associated with a particular extension to be ignored in one shot. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@335 232f8b59-042b-4e1e-8c03-345bb8c30851
* Documentation updates and minor cleanupsKenneth Russel2005-07-192-2/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@333 232f8b59-042b-4e1e-8c03-345bb8c30851
* Rewrote and refactored creation of dummy window and OpenGL context on Kenneth Russel2005-07-173-71/+41
| | | | | | | | | | Windows to be encapsulated in WindowsDummyGLDrawable class. This is a prerequisite for implementing top-level pbuffer support in the GLDrawableFactory (i.e., not associated with a GLCanvas). Refactored context implementations further on all platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@325 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Windows port after changes to GlueGen to include array offsets. Kenneth Russel2005-07-082-3/+410
| | | | | | | | | | | Ported all demos to new API. Temporarily added back in GLU entry points taking primitive arrays as the underlying APIs (in particular, glTexImage2D) do not yet support non-direct Buffers. Changed C code generation to only add in array offset if array is non-null. Fixed bug in GLU tesselator demo's vertex callback. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@318 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with main trunk (tag JOGL_PRE_1_1_1)Kenneth Russel2005-07-079-179/+637
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@317 232f8b59-042b-4e1e-8c03-345bb8c30851
* This putback adds array offsets to the public JOGL API. The offsets areTravis Bryson2005-06-243-845/+55
| | | | | | | | | | | | | | | | | | | | | | | | respected and used properly in all of the public and private functions. The changes are in gluegen, so that the code is generated properly. And also throughout the parts of the jogl code that are not gluegen-generated. For the internally generated implementation methods, a "1" is added to the method names. So as to not overload the public API. This is similar to what is already done with Buffer APIs, which have a "0" added internally. I used a "1" instead of a "0" to avoid any collisions of the signatures, which could happen if a null object was sent down for the Array (e.g., the wrong method would get called). This should be a suitable foundation for the implementation to add the ability to wrap arrays in Buffers, which we plan to add to the implementation soon. These changes will cause all existing JOGL programs to break, although adapting them is pretty easy. We will later be putting back changed examples and utilities that incorporate these new APIs. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@313 232f8b59-042b-4e1e-8c03-345bb8c30851
* This commit was manufactured by cvs2svn to create branch 'JSR-231'.First Last2005-06-241-0/+44
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@312 232f8b59-042b-4e1e-8c03-345bb8c30851
* Modified Files:Travis Bryson2005-05-251-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jogl/make/gl-common.cfg jogl/make/gl-glx-common.cfg jogl/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java jogl/src/net/java/games/gluegen/runtime/BufferFactory.java jogl/src/net/java/games/gluegen/JavaEmitter.java jogl/src/net/java/games/gluegen/JavaConfiguration.java jogl/src/net/java/games/gluegen/CMethodBindingEmitter.java jogl/src/net/java/games/gluegen/JavaMethodBindingEmitter.java jogl/src/net/java/games/gluegen/CMethodBindingImplEmitter.java jogl/src/net/java/games/gluegen/JavaMethodBindingImplEmitter.java jogl/src/net/java/games/jogl/util/BufferUtils.java Changes: * Add NIODirectOnly grammar for description of methods that should have only NIO Direct Buffer option (no expansion into other types, and also will not be expanded to include indirect Buffer when we add that functionality) * Make changes to respect Direct Buffer position value. This allows a setting of an internal Buffer object parameter and JOGL will start reading data at the point in the buffer to which this position is set * The code is now generated to always respect this offset option. This has the affect of changing the internal signatures of all methods that use Buffers. But it does not affect the external API at all. * Old JOGL programs will continue working the same as long as they had the Buffer position set to zero before (the default value) git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@281 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with current JOGL trunk (by using -r HEAD)Kenneth Russel2005-04-247-1/+55
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@262 232f8b59-042b-4e1e-8c03-345bb8c30851
* Add PrimitiveArrayExpansion mode option to grammar, Implement ↵Travis Bryson2005-02-281-1/+12
| | | | | | PrimitiveArrayExpansion mode in gluegen, Add VoidPointerExpansion mode option to grammar, Implement VoidPointerExpansion mode in gluegen, change grammar file appropriately, Add a couple of Apple NIOOnly options, omission was previously a bug git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@250 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with current JOGL trunk (tag JOGL_1_1_PRE_B10)Kenneth Russel2005-02-2622-17/+2437
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@245 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed bug pointed out by fazekaim on the JOGL forums where the Kenneth Russel2004-11-211-0/+43
| | | | | | | | prototypes for the manually-implemented GLU projection routines were not in the GLU interface. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@177 232f8b59-042b-4e1e-8c03-345bb8c30851
* Partial fix for Issue 42: Problems invoking GLU functions Kenneth Russel2004-11-183-6/+151
| | | | | | | | | | | Incorporated the LWJGL team's port of the GLU quadric and projection routines to be able to eliminate calls to the native GLU library for these cases, which was problematic on certain Linux distributions. Still need to port at least some of the mipmap routines and the NURBS tesselator. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@172 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed MinGW build option after conversion to cpptasksKenneth Russel2004-11-081-4/+12
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@169 232f8b59-042b-4e1e-8c03-345bb8c30851
* libjogl_cg.jnilib was missing in jogl-natives-macosx.jar in dist targetKenneth Russel2004-11-061-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@167 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 117: Adding glGetUniformLocationARB to gl-common.cfg Kenneth Russel2004-10-291-2/+5
| | | | | | | | | ArgumentIsString directives have been added for the ARB_shader_objects and ARB_vertex_shader routines glGetUniformLocationARB, glBindAttribLocationARB, and glGetAttribLocationARB. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@164 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed build problem on Linux after upgrade to Cg 1.3 beta 2 headersKenneth Russel2004-10-291-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@162 232f8b59-042b-4e1e-8c03-345bb8c30851
* Added build support for Cg library on Mac OS XKenneth Russel2004-10-262-2/+11
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@159 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed hacks from cg.h and cgGL.h that are no longer necessary now Kenneth Russel2004-10-222-179/+175
| | | | | | | | that GlueGen understands typedefs more completely. Upgraded cgGL.h to Cg 1.3 beta 2 header; missed in last checkin. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@158 232f8b59-042b-4e1e-8c03-345bb8c30851
* Updated Cg definitions to Cg 1.3 beta 2 headersKenneth Russel2004-10-228-333/+625
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@157 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed missing linker type of suncc in Solaris buildKenneth Russel2004-10-041-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@155 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 71: glMultiDrawElements() is missing Kenneth Russel2004-10-041-18/+1
| | | | | | | | | | | | | | | Added support to GlueGen to handle pointer-to-pointer types for primitive types, like void** and int**. These are exposed as arrays of appropriately-typed direct java.nio Buffers for simplicity. Checks for whether the buffers are direct are performed and null checks for the individual Buffer objects are done as well. Fixed an existing bug in the conversion of outgoing char** arguments in C to String[] in Java where null checks were missing; this showed up as crashes in glShaderSourceARB. Exposed glMultiDrawElements and several other less-common entry points taking void** arguments. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@154 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed debug info from native libraries after CPPTask cutoverKenneth Russel2004-08-051-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@149 232f8b59-042b-4e1e-8c03-345bb8c30851
* Added acknowledgment of Alex Radeski to build.xmlKenneth Russel2004-08-041-1/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@147 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Solaris portion of cpptasks port; needed to add a new sunccKenneth Russel2004-08-042-2/+3
| | | | | | | | | compiler/linker type to cpptasks. Updated cpptasks jar file. Filed patch request in ant-contrib project on sourceforge.net; bug ID 1003528. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@146 232f8b59-042b-4e1e-8c03-345bb8c30851
* Incorporated changes by Alex Radeski <[email protected]> from the Kenneth Russel2004-08-042-338/+259
| | | | | | | | | | | JSR-231 expert group to use the Ant CPPTask instead of manual exec'ing of the C compiler from within the build.xml. Substantially simplifies the build.xml; further simplifications (i.e., unused variables) are probably possible. Ported the CPPTask support to Mac OS X and validated it and fixed minor bugs on the supported platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@145 232f8b59-042b-4e1e-8c03-345bb8c30851
* Bug fix from user GKW on the JOGL forums for problems reported by Kenneth Russel2004-08-034-2/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users in JOGL 1.1 betas where the code path for wglChoosePixelFormatARB (supporting full-scene antialiasing) was failing on older cards. The old drivers expect an OpenGL context to be current while the wglChoosePixelFormatARB and associated calls are being made, even though the documentation explicitly states that this is not necessary. GKW's fix creates a native window synchronously (independent of the AWT) and associates an OpenGL context with it which is used to choose pixel formats for other windows on the same GraphicsDevice. Upon VM shutdown, a native message pump is started which causes proper disposal of the native window and its OpenGL contexts. There is currently no bug ID associated with this fix, although it may be a component of completely addressing several open bugs. Also includes a bug fix from GKW and kbr for: Issue 98: Just 1st frame rendering on ATI Radeon This was a race condition between JOGL's automatic discovery that the ATI_WORKAROUND was needed and the creation of the first GLCanvas and associated Animator. The need for disabling the setRenderingThread optimization was computed too late, incorrectly locking out other threads (in particular, the AWT event queue thread) from performing rendering of the component. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@144 232f8b59-042b-4e1e-8c03-345bb8c30851
* Upgraded to current glext.h / wglext.h / glxext.hKenneth Russel2004-08-024-42/+221
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@143 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed cygwin / mingw compilation issues pointed out by user cylab on Kenneth Russel2004-07-281-1/+1
| | | | | | | JOGL forums git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@142 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 85: Weekly builds / sourceKenneth Russel2004-07-161-0/+7
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@140 232f8b59-042b-4e1e-8c03-345bb8c30851
* add VOB for Mac OS XGerard Ziemski2004-06-201-0/+32
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@134 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 79: PBuffers on macintosh fail to glCopyTexSubImage2DKenneth Russel2004-04-292-6/+6
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@128 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed breakage of vertex_array_range extension during last update of Kenneth Russel2004-04-293-4/+10
| | | | | | | OpenGL headers git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@127 232f8b59-042b-4e1e-8c03-345bb8c30851
* Applied patches from Yuri Vl. Gushchin on JOGL forums: Kenneth Russel2004-04-262-1/+29
| | | | | | | | - Added KTX_buffer_region to glext.h - Used Dialog instead of Frame for dummy window on Windows git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@124 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed build problems on Linux after addition of OpenGL 1.5 support.Kenneth Russel2004-04-223-3/+9
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@116 232f8b59-042b-4e1e-8c03-345bb8c30851
* Added OpenGL 1.5 support. Updated glext.h, wglext.h, and glxext.h from Kenneth Russel2004-04-2210-1417/+1991
| | | | | | | | | | extension registry; these now include only very few changes relative to the master version. Fixed bugs in GlueGen and PCPP to make it parse the verbatim headers and to emit correct glue code for some newly-exercised constructs like char**. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@115 232f8b59-042b-4e1e-8c03-345bb8c30851
* Updated context creation code to unpack GLCapabilities object in JavaKenneth Russel2004-04-212-3/+26
| | | | | | | 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
* Fixed Issue 28: All functions that take arrays as parameters should also ↵Kenneth Russel2004-04-211-1/+8
| | | | | | | | | take buffers Fixed Issue 36: glSelectBuffer/glFeedbackBuffer need direct buffers git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@112 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 73: build.xml needs "-L/usr/X11R6/lib" for Linux.Kenneth Russel2004-04-191-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@110 232f8b59-042b-4e1e-8c03-345bb8c30851
* Initial support for multisample / full-scene antialiasing (FSAA); Kenneth Russel2004-04-131-2/+1
| | | | | | | currently on Windows, X11 and other ports to follow git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@108 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Javadoc problemsKenneth Russel2004-04-121-2/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@107 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Javadoc problemsKenneth Russel2004-04-121-2/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@104 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed debugging code from declare.macosx ruleKenneth Russel2004-04-121-6/+0
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@103 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 70: JOGL build broken with Ant 1.6Kenneth Russel2004-04-072-33/+49
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@91 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 68: Window system-specific JAWT classes must implement ↵Kenneth Russel2004-03-153-0/+6
| | | | | | JAWT_PlatformInfo git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@90 232f8b59-042b-4e1e-8c03-345bb8c30851
* Minor cleanups to build.xmlKenneth Russel2004-03-151-4/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@88 232f8b59-042b-4e1e-8c03-345bb8c30851
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 06:31:35 +0000