Menu
▾
▴
java-game-lib-cvs
|
From: <sp...@us...> - 2011-05-17 16:54:09
|
Revision: 3534
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3534&view=rev
Author: spasi
Date: 2011-05-17 16:53:57 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Added support for OpenGL ES.
Modified Paths:
--------------
branches/opengles/LWJGL/build.xml
branches/opengles/LWJGL/platform_build/build-definitions.xml
branches/opengles/LWJGL/platform_build/build-generator.xml
branches/opengles/LWJGL/platform_build/linux_ant/build.xml
branches/opengles/LWJGL/platform_build/windows_ant/build.xml
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/Display.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/SharedDrawable.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java
branches/opengles/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java
Added Paths:
-----------
branches/opengles/LWJGL/libs/linux/x64/
branches/opengles/LWJGL/libs/windows/libEGL.dll
branches/opengles/LWJGL/libs/windows/libEGL.lib
branches/opengles/LWJGL/libs/windows/libGLESv2.dll
branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml
branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/ContextGL.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/ContextGLES.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/PixelFormatLWJGL.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGL.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLConfig.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLContext.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLImageOES.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLKHRFenceSync.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLKHRReusableSync.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLNVSync.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLSurface.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLSyncKHR.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/EGLSyncNV.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/GLContext.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/PeerInfo.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/PixelFormat.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/PowerManagementEventException.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengles/Util.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/Gears.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/QuadRenderer.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObject.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectArray.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectElement.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/GLLight.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/GLMatrix.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/GLObject.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/Geometry.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/ImmediateModeBuffer.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengles/util/Sphere.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLint64NV.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLuint64NV.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESCapabilitiesGenerator.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java
branches/opengles/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java
branches/opengles/LWJGL/src/native/common/EGL/
branches/opengles/LWJGL/src/native/common/EGL/egl.h
branches/opengles/LWJGL/src/native/common/EGL/eglext.h
branches/opengles/LWJGL/src/native/common/EGL/eglplatform.h
branches/opengles/LWJGL/src/native/common/GLES2/
branches/opengles/LWJGL/src/native/common/GLES2/gl2.h
branches/opengles/LWJGL/src/native/common/GLES2/gl2ext.h
branches/opengles/LWJGL/src/native/common/GLES2/gl2extimg.h
branches/opengles/LWJGL/src/native/common/GLES2/gl2platform.h
branches/opengles/LWJGL/src/native/common/KHR/
branches/opengles/LWJGL/src/native/common/KHR/khrplatform.h
branches/opengles/LWJGL/src/native/common/opengl/
branches/opengles/LWJGL/src/native/common/opengl/extgl.c
branches/opengles/LWJGL/src/native/common/opengl/extgl.h
branches/opengles/LWJGL/src/native/common/opengl/extgl_types.h
branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c
branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_GLContext.c
branches/opengles/LWJGL/src/native/common/opengles/
branches/opengles/LWJGL/src/native/common/opengles/extgl.c
branches/opengles/LWJGL/src/native/common/opengles/extgl.h
branches/opengles/LWJGL/src/native/common/opengles/extgl_egl.c
branches/opengles/LWJGL/src/native/common/opengles/extgl_egl.h
branches/opengles/LWJGL/src/native/common/opengles/extgl_types.h
branches/opengles/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGL.c
branches/opengles/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRFenceSync.c
branches/opengles/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRReusableSync.c
branches/opengles/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLNVSync.c
branches/opengles/LWJGL/src/native/common/opengles/org_lwjgl_opengles_GLContext.c
branches/opengles/LWJGL/src/native/linux/opengl/
branches/opengles/LWJGL/src/native/linux/opengl/context.c
branches/opengles/LWJGL/src/native/linux/opengl/context.h
branches/opengles/LWJGL/src/native/linux/opengl/display.c
branches/opengles/LWJGL/src/native/linux/opengl/extgl_glx.c
branches/opengles/LWJGL/src/native/linux/opengl/extgl_glx.h
branches/opengles/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c
branches/opengles/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
branches/opengles/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxCanvasImplementation.c
branches/opengles/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c
branches/opengles/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c
branches/opengles/LWJGL/src/native/linux/opengles/
branches/opengles/LWJGL/src/native/linux/opengles/context.c
branches/opengles/LWJGL/src/native/linux/opengles/context.h
branches/opengles/LWJGL/src/native/linux/opengles/display.c
branches/opengles/LWJGL/src/native/linux/opengles/extgl_glx.c
branches/opengles/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c
branches/opengles/LWJGL/src/native/windows/opengl/
branches/opengles/LWJGL/src/native/windows/opengl/context.c
branches/opengles/LWJGL/src/native/windows/opengl/context.h
branches/opengles/LWJGL/src/native/windows/opengl/extgl_wgl.c
branches/opengles/LWJGL/src/native/windows/opengl/extgl_wgl.h
branches/opengles/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c
branches/opengles/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c
branches/opengles/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsPeerInfo.c
branches/opengles/LWJGL/src/native/windows/opengles/
branches/opengles/LWJGL/src/native/windows/opengles/context.c
branches/opengles/LWJGL/src/native/windows/opengles/context.h
branches/opengles/LWJGL/src/native/windows/opengles/extgl_wgl.c
branches/opengles/LWJGL/src/native/windows/opengles/org_lwjgl_opengl_WindowsPeerInfo.c
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_3DC_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_ATC_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/AMD_program_binary_Z400.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_blit.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_multisample.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/APPLE_framebuffer_multisample.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/APPLE_rgb_422.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_format_BGRA8888.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_max_level.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ARB_draw_buffers.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ARB_half_float_pixel.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ARB_texture_rectangle.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ARM_mali_shader_binary.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/ARM_rgba8.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/DMP_shader_binary.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_Cg_shader.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_bgra.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_blend_minmax.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_discard_framebuffer.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_frag_depth.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_multi_draw_arrays.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_packed_float.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_read_format_bgra.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_texture_lod.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_array.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_dxt1.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_latc.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_s3tc.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_filter_anisotropic.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_format_BGRA8888.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_lod_bias.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_type_2_10_10_10_REV.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/IMG_program_binary.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/IMG_shader_binary.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/IMG_texture_compression_pvrtc.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_coverage_sample.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_depth_nonlinear.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_path.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_fbo_color_attachments.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_fence.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_framebuffer_vertex_attrib_array.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_read_buffer.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_shader_framebuffer_fetch.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/NV_system_time.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image_external.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_equation_separate.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_func_separate.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_subtract.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_ETC1_RGB8_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_paletted_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_depth24.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_depth32.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_depth_texture.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_element_index_uint.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_fbo_render_mipmap.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_get_program_binary.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_packed_depth_stencil.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_rgb8_rgba8.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_standard_derivatives.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil1.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil4.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil8.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_3D.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float_linear.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float_linear.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_npot.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_array_object.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_half_float.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_type_10_10_10_2.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_driver_control.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get2.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_performance_monitor_global_mode.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_tiled_rendering.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/QCOM_writeonly_rendering.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengles/VIV_shader_binary.java
Removed Paths:
-------------
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/AbstractDrawable.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/Context.java
branches/opengles/LWJGL/src/native/common/extgl.c
branches/opengles/LWJGL/src/native/common/extgl.h
branches/opengles/LWJGL/src/native/common/extgl_types.h
branches/opengles/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.c
branches/opengles/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.c
branches/opengles/LWJGL/src/native/linux/context.c
branches/opengles/LWJGL/src/native/linux/context.h
branches/opengles/LWJGL/src/native/linux/display.c
branches/opengles/LWJGL/src/native/linux/extgl_glx.c
branches/opengles/LWJGL/src/native/linux/extgl_glx.h
branches/opengles/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
branches/opengles/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
branches/opengles/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxCanvasImplementation.c
branches/opengles/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
branches/opengles/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.c
branches/opengles/LWJGL/src/native/windows/context.c
branches/opengles/LWJGL/src/native/windows/context.h
branches/opengles/LWJGL/src/native/windows/extgl_wgl.c
branches/opengles/LWJGL/src/native/windows/extgl_wgl.h
branches/opengles/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
branches/opengles/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
branches/opengles/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c
Property Changed:
----------------
branches/opengles/LWJGL/
branches/opengles/LWJGL/libs/
branches/opengles/LWJGL/libs/windows/
branches/opengles/LWJGL/src/native/common/
branches/opengles/LWJGL/src/native/linux/
Property changes on: branches/opengles/LWJGL
___________________________________________________________________
Modified: svn:ignore
- .classpath
*.class
*.class~
*.java~
.nbattrs
.project
dist
libs
temp
+ *.class
*.class~
*.java~
.classpath
.nbattrs
.project
bin
dist
libs
temp
Modified: branches/opengles/LWJGL/build.xml
===================================================================
--- branches/opengles/LWJGL/build.xml 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/build.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -9,16 +9,17 @@
<import file="platform_build/build-maven.xml"/>
<!-- ================================================================== -->
- <!-- Everything below this line is targets. -->
- <!-- Do not modify, unless you know what you're doing -->
+ <!-- Everything below this line is targets. -->
+ <!-- Do not modify, unless you know what you're doing -->
<!-- ================================================================== -->
<!-- ================================================================== -->
- <!-- Initialize build -->
+ <!-- Initialize build -->
<!-- ================================================================== -->
<target name="-initialize">
<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
<mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing native bin folder" />
+ <mkdir dir="${lwjgl.bin}/lwjgles" taskname="initialiazing native OpenGL ES bin folder"/>
<mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder" />
<mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder" />
<mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" />
@@ -111,6 +112,12 @@
<antcall target="-jars_NoDEP" />
</target>
+ <!-- Create ONLY the jar archives for the ES build -->
+ <target name="jars_es" description="Creates the Java archives ONLY for the ES build and places them in libs/"
+ depends="-initialize, generate-all, compile, -createjars_es">
+ <antcall target="-jars_NoDEP"/>
+ </target>
+
<target name="-jars_NoDEP">
<move todir="libs/">
<fileset dir="${lwjgl.temp}/jar">
@@ -161,6 +168,22 @@
</jar>
</target>
+ <!-- Packages the java files for the ES build -->
+ <target name="-createjars_es">
+ <!-- Create lwjgl.jar -->
+ <jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
+ <fileset refid="lwjgl_es.fileset"/>
+ <manifest>
+ <attribute name="Sealed" value="true"/>
+ </manifest>
+ </jar>
+
+ <!-- Create lwjgl_test.jar -->
+ <jar destfile="${lwjgl.temp}/jar/lwjgl_test.jar" taskname="lwjgl_test.jar">
+ <fileset refid="lwjgl_test_es.fileset"/>
+ </jar>
+ </target>
+
<!-- Distributes files -->
<target name="-distribute">
<delete>
@@ -227,25 +250,35 @@
<class name="org.lwjgl.opengl.LinuxKeyboard" />
<class name="org.lwjgl.opengl.LinuxDisplay" />
<class name="org.lwjgl.opengl.LinuxPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxPbufferPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxDisplayPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxAWTGLCanvasPeerInfo" />
- <class name="org.lwjgl.opengl.LinuxContextImplementation" />
- <class name="org.lwjgl.opengl.LinuxCanvasImplementation" />
</javah>
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/linux/opengl" force="yes">
+ <class name="org.lwjgl.opengl.LinuxPbufferPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxDisplayPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxAWTGLCanvasPeerInfo"/>
+ <class name="org.lwjgl.opengl.LinuxContextImplementation"/>
+ <class name="org.lwjgl.opengl.LinuxCanvasImplementation"/>
+ </javah>
+
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows" force="yes">
+ <class name="org.lwjgl.WindowsSysImplementation"/>
<class name="org.lwjgl.opengl.WindowsKeyboard" />
- <class name="org.lwjgl.opengl.WindowsPbufferPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsDisplay" />
<class name="org.lwjgl.opengl.WindowsRegistry" />
- <class name="org.lwjgl.WindowsSysImplementation" />
- <class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsDisplayPeerInfo" />
- <class name="org.lwjgl.opengl.WindowsContextImplementation" />
+ <class name="org.lwjgl.opengl.WindowsDisplay"/>
+ <class name="org.lwjgl.opengl.WindowsDisplayPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo"/>
</javah>
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows/opengl" force="yes">
+ <class name="org.lwjgl.opengl.WindowsPbufferPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsPeerInfo"/>
+ <class name="org.lwjgl.opengl.WindowsContextImplementation"/>
+ </javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows/opengles" force="yes">
+ <class name="org.lwjgl.opengl.WindowsPeerInfo"/>
+ </javah>
+
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
<class name="org.lwjgl.MacOSXSysImplementation" />
<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
@@ -263,13 +296,24 @@
<class name="org.lwjgl.input.Keyboard" />
<class name="org.lwjgl.input.Mouse" />
<class name="org.lwjgl.openal.AL" />
- <class name="org.lwjgl.opengl.GLContext" />
- <class name="org.lwjgl.opengl.Pbuffer" />
- <class name="org.lwjgl.opengl.CallbackUtil" />
- <class name="org.lwjgl.opencl.CL" />
+ <class name="org.lwjgl.opencl.CL" />
<class name="org.lwjgl.opencl.CallbackUtil" />
- <class name="org.lwjgl.BufferUtils" />
+ <class name="org.lwjgl.BufferUtils" />
</javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/opengl" force="yes">
+ <class name="org.lwjgl.opengl.GLContext"/>
+ <class name="org.lwjgl.opengl.Pbuffer"/>
+ <class name="org.lwjgl.opengl.CallbackUtil"/>
+ </javah>
+
+ <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/opengles" force="yes">
+ <class name="org.lwjgl.opengles.EGL"/>
+ <class name="org.lwjgl.opengles.EGLKHRFenceSync"/>
+ <class name="org.lwjgl.opengles.EGLKHRReusableSync"/>
+ <class name="org.lwjgl.opengles.EGLNVSync"/>
+ <class name="org.lwjgl.opengles.GLContext"/>
+ </javah>
</target>
<target name="touch-version">
@@ -364,6 +408,7 @@
<include name="org/lwjgl/*.java"/>
<include name="org/lwjgl/input/**"/>
<include name="org/lwjgl/opengl/**"/>
+ <include name="org/lwjgl/opengles/**"/>
<include name="org/lwjgl/openal/**"/>
<include name="org/lwjgl/opencl/**"/>
<include name="org/lwjgl/util/**"/>
@@ -430,6 +475,34 @@
<version-check platform="macosx"/>
</target>
+ <target name="compile_native_es" depends="-initialize, headers, touch-version, version-mismatch" description="Compiles the native files">
+ <condition property="lwjgl.platform.windows">
+ <os family="windows"/>
+ </condition>
+ <antcall target="-compile_native_win32_es"/>
+
+ <condition property="lwjgl.platform.linux">
+ <os name="Linux"/>
+ </condition>
+ <antcall target="-compile_native_linux_es"/>
+ </target>
+
+ <!-- Compiles LWJGL ES on Win32 platforms -->
+ <target name="-compile_native_win32_es" if="lwjgl.platform.windows">
+ <ant antfile="platform_build/windows_ant/build_es.xml" inheritAll="false"/>
+ <copy todir="${lwjgl.lib}/windows">
+ <fileset dir="${lwjgl.bin}/lwjgles" includes="lwjgl*.dll"/>
+ </copy>
+ </target>
+
+ <!-- Compiles LWJGL ES on Linux platforms -->
+ <target name="-compile_native_linux_es" if="lwjgl.platform.linux">
+ <ant antfile="platform_build/linux_ant/build_es.xml" inheritAll="false"/>
+ <copy todir="${lwjgl.lib}/linux">
+ <fileset dir="${lwjgl.bin}/lwjgles" includes="liblwjgl*.so"/>
+ </copy>
+ </target>
+
<target name="repack200" description="Pack200-repack a jar file">
<pack200 src="${input}" destfile="${output}" repack="true"/>
</target>
Property changes on: branches/opengles/LWJGL/libs
___________________________________________________________________
Added: svn:ignore
+ lwjgl-debug.jar
lwjgl.jar
lwjgl_test.jar
lwjgl_util.jar
lwjgl_util_applet.jar
Property changes on: branches/opengles/LWJGL/libs/windows
___________________________________________________________________
Added: svn:ignore
+ lwjgl.dll
Added: branches/opengles/LWJGL/libs/windows/libEGL.dll
===================================================================
(Binary files differ)
Property changes on: branches/opengles/LWJGL/libs/windows/libEGL.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/opengles/LWJGL/libs/windows/libEGL.lib
===================================================================
(Binary files differ)
Property changes on: branches/opengles/LWJGL/libs/windows/libEGL.lib
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/opengles/LWJGL/libs/windows/libGLESv2.dll
===================================================================
(Binary files differ)
Property changes on: branches/opengles/LWJGL/libs/windows/libGLESv2.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/opengles/LWJGL/platform_build/build-definitions.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/build-definitions.xml 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/platform_build/build-definitions.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -16,6 +16,7 @@
<property name="lwjgl.web" location="www" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
+ <property name="opengles-template-pattern" value="org/lwjg...
[truncated message content] |
|
From: <sp...@us...> - 2011-05-21 10:48:14
|
Revision: 3537
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3537&view=rev
Author: spasi
Date: 2011-05-21 10:48:05 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Added support for NV_present_video and NV_video_capture.
Re-designed WindowsPeerInfo so that we can more easily use WGL extensions in the future.
Modified Paths:
--------------
branches/opengles/LWJGL/build.xml
branches/opengles/LWJGL/src/native/common/opengl/extgl.h
branches/opengles/LWJGL/src/native/linux/opengl/extgl_glx.c
branches/opengles/LWJGL/src/native/linux/opengl/extgl_glx.h
branches/opengles/LWJGL/src/native/windows/opengl/context.h
branches/opengles/LWJGL/src/native/windows/opengl/extgl_wgl.c
branches/opengles/LWJGL/src/native/windows/opengl/extgl_wgl.h
branches/opengles/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c
branches/opengles/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c
branches/opengles/LWJGL/src/native/windows/opengles/context.h
Added Paths:
-----------
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java
branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java
branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c
branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c
branches/opengles/LWJGL/src/native/linux/opengl/GLX.c
branches/opengles/LWJGL/src/native/linux/opengl/GLX.h
branches/opengles/LWJGL/src/native/windows/opengl/WGL.c
branches/opengles/LWJGL/src/native/windows/opengl/WGL.h
branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java
Modified: branches/opengles/LWJGL/build.xml
===================================================================
--- branches/opengles/LWJGL/build.xml 2011-05-17 17:26:33 UTC (rev 3536)
+++ branches/opengles/LWJGL/build.xml 2011-05-21 10:48:05 UTC (rev 3537)
@@ -49,6 +49,7 @@
<!-- Useful when we need to force native recompilation -->
<target name="clean-native" description="Cleans native files generated by this ant script" depends="clean-generated-native">
<delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
+ <delete dir="${lwjgl.bin}/lwjgles" quiet="true" failonerror="false" taskname="cleaning native OpenGL ES bin folder"/>
</target>
<!-- Creates a distribution of LWJGL -->
@@ -305,6 +306,8 @@
<class name="org.lwjgl.opengl.GLContext"/>
<class name="org.lwjgl.opengl.Pbuffer"/>
<class name="org.lwjgl.opengl.CallbackUtil"/>
+ <class name="org.lwjgl.opengl.NVPresentVideoUtil"/>
+ <class name="org.lwjgl.opengl.NVVideoCaptureUtil"/>
</javah>
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/opengles" force="yes">
Added: branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java (rev 0)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.BufferChecks;
+import org.lwjgl.LWJGLUtil;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+
+/**
+ * This class exposes the platform specific functionality present in the
+ * NV_present_video extension.
+ *
+ * @author Spasi
+ * @since 20/5/2011
+ */
+public final class NVPresentVideoUtil {
+
+ private NVPresentVideoUtil() {}
+
+ private static void checkExtension() {
+ if ( LWJGLUtil.CHECKS && !GLContext.getCapabilities().GL_NV_present_video )
+ throw new IllegalStateException("NV_present_video is not supported");
+ }
+
+ private static ByteBuffer getPeerInfo() {
+ return ContextGL.getCurrentContext().getPeerInfo().getHandle();
+ }
+
+ /**
+ * Enumerate the available video output devices. This method is the cross-platform
+ * equivalent of glXEnumerateVideoDevicesNV and wglEnumerateVideoDevicesNV. Since they are
+ * not really compatible, this method works like the WGL version. That is, you first
+ * call it with a null devices buffer, get the number of devices, then call it again
+ * with an appropriately sized buffer.
+ *
+ * @param devices the buffer to store devices in
+ *
+ * @return the number of available video output devices
+ */
+ public static int glEnumerateVideoDevicesNV(LongBuffer devices) {
+ checkExtension();
+
+ if ( devices != null )
+ BufferChecks.checkBuffer(devices, 1);
+ return nglEnumerateVideoDevicesNV(getPeerInfo(), devices, devices == null ? 0 : devices.position());
+ }
+
+ private static native int nglEnumerateVideoDevicesNV(ByteBuffer peer_info, LongBuffer devices, int devices_position);
+
+ /**
+ * Binds the video output device specified to one of the context's available video output slots.
+ * This method is the cross-platform equivalent of glXBindVideoDeviceNV and wglBindVideoDeviceNV.
+ * To release a video device without binding another device to the same slot, call it with
+ * video_device set to 0 (will use INVALID_HANDLE_VALUE on WGL).
+ *
+ * @param video_slot the video slot
+ * @param video_device the video device
+ * @param attrib_list the attributes to use
+ *
+ * @return true if the binding was successful
+ */
+ public static boolean glBindVideoDeviceNV(int video_slot, long video_device, IntBuffer attrib_list) {
+ checkExtension();
+
+ if ( attrib_list != null )
+ BufferChecks.checkNullTerminated(attrib_list);
+ return nglBindVideoDeviceNV(getPeerInfo(), video_slot, video_device, attrib_list, attrib_list == null ? 0 : attrib_list.position());
+ }
+
+ private static native boolean nglBindVideoDeviceNV(ByteBuffer peer_info, int video_slot, long video_device, IntBuffer attrib_list, int attrib_list_position);
+
+ /**
+ * Queries an attribute associated with the current context. This method is the cross-platform
+ * equivalent of glXQueryContext and wglQueryCurrentContextNV.
+ *
+ * @param attrib the attribute to query
+ * @param value the buffer to store the value in
+ */
+ public static boolean glQueryContextNV(int attrib, IntBuffer value) {
+ checkExtension();
+
+ BufferChecks.checkBuffer(value, 1);
+ ContextGL ctx = ContextGL.getCurrentContext();
+ return nglQueryContextNV(ctx.getPeerInfo().getHandle(), ctx.getHandle(), attrib, value, value.position());
+ }
+
+ private static native boolean nglQueryContextNV(ByteBuffer peer_info, ByteBuffer context_handle, int attrib, IntBuffer value, int value_position);
+
+}
Added: branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java (rev 0)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.BufferChecks;
+import org.lwjgl.LWJGLUtil;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+
+/**
+ * This class exposes the platform specific functionality present in the
+ * NV_video_capture extension.
+ *
+ * @author Spasi
+ * @since 20/5/2011
+ */
+public final class NVVideoCaptureUtil {
+
+ private NVVideoCaptureUtil() {}
+
+ private static void checkExtension() {
+ if ( LWJGLUtil.CHECKS && !GLContext.getCapabilities().GL_NV_video_capture )
+ throw new IllegalStateException("NV_video_capture is not supported");
+ }
+
+ private static ByteBuffer getPeerInfo() {
+ return ContextGL.getCurrentContext().getPeerInfo().getHandle();
+ }
+
+ /**
+ * After successfully locking a video capture device, use this method to bind it
+ * to the capture slot specified in the current context. This method is the cross-
+ * platform equivalent of glXBindVideoCaptureDeviceNV and wglBindVideoCaptureDeviceNV.
+ *
+ * @param video_slot the video slot
+ * @param device the video capture device
+ *
+ * @return true if the binding was successful
+ */
+ public static boolean glBindVideoCaptureDeviceNV(int video_slot, long device) {
+ checkExtension();
+ return nglBindVideoCaptureDeviceNV(getPeerInfo(), video_slot, device);
+ }
+
+ private static native boolean nglBindVideoCaptureDeviceNV(ByteBuffer peer_info, int video_slot, long device);
+
+ /**
+ * Enumerate the available video capture devices. This method is the cross-platform
+ * equivalent of glXEnumerateVideoCaptureDevicesNV and wglEnumerateVideoCaptureDevicesNV.
+ * Since they are not really compatible, this method works like the WGL version. That is,
+ * you first call it with a null devices buffer, get the number of devices, then call it
+ * again with an appropriately sized buffer.
+ *
+ * @param devices the buffer to store devices in
+ *
+ * @return the number of available video capture devices
+ */
+ public static int glEnumerateVideoCaptureDevicesNV(LongBuffer devices) {
+ checkExtension();
+
+ if ( devices != null )
+ BufferChecks.checkBuffer(devices, 1);
+ return nglEnumerateVideoCaptureDevicesNV(getPeerInfo(), devices, devices == null ? 0 : devices.position());
+ }
+
+ private static native int nglEnumerateVideoCaptureDevicesNV(ByteBuffer peer_info, LongBuffer devices, int devices_position);
+
+ /**
+ * To lock a video capture device to a display connection, use this method.
+ * Before using a video capture device, it must be locked. Once a
+ * video capture device is locked by a process, no other process can
+ * lock a video capture device with the same unique ID until the lock
+ * is released or the process ends.
+ *
+ * @param device the device to lock
+ *
+ * @return true if the lock was successful
+ */
+ public static boolean glLockVideoCaptureDeviceNV(long device) {
+ checkExtension();
+ return nglLockVideoCaptureDeviceNV(getPeerInfo(), device);
+ }
+
+ private static native boolean nglLockVideoCaptureDeviceNV(ByteBuffer peer_info, long device);
+
+ /**
+ * Use this method to query the unique ID of the physical device backing a
+ * video capture device handle.
+ *
+ * @param device the device
+ * @param attribute the attribute to query
+ * @param value the buffer to store the value in
+ *
+ * @return true if the query was successful
+ */
+ public static boolean glQueryVideoCaptureDeviceNV(long device, int attribute, IntBuffer value) {
+ checkExtension();
+
+ BufferChecks.checkBuffer(value, 1);
+ return nglQueryVideoCaptureDeviceNV(getPeerInfo(), device, attribute, value, value.position());
+ }
+
+ private static native boolean nglQueryVideoCaptureDeviceNV(ByteBuffer peer_info, long device, int attribute, IntBuffer value, int value_position);
+
+ /**
+ * Use this method when finished capturing data on a locked video capture device
+ * to unlock it.
+ *
+ * @param device the device
+ *
+ * @return true if the device was unlocked successfully
+ */
+ public static boolean glReleaseVideoCaptureDeviceNV(long device) {
+ checkExtension();
+ return nglReleaseVideoCaptureDeviceNV(getPeerInfo(), device);
+ }
+
+ private static native boolean nglReleaseVideoCaptureDeviceNV(ByteBuffer peer_info, long device);
+
+}
+
Modified: branches/opengles/LWJGL/src/native/common/opengl/extgl.h
===================================================================
--- branches/opengles/LWJGL/src/native/common/opengl/extgl.h 2011-05-17 17:26:33 UTC (rev 3536)
+++ branches/opengles/LWJGL/src/native/common/opengl/extgl.h 2011-05-21 10:48:05 UTC (rev 3537)
@@ -103,4 +103,19 @@
extern bool extgl_QueryExtension(const GLubyte*extensions, const char *name);
extern void *extgl_GetProcAddress(const char *name);
+
+#ifndef __APPLE__
+ /* NV_present_video functions (GLX & WGL only) */
+ extern jint extgl_EnumerateVideoDevicesNV(JNIEnv *env, jobject peer_info_handle, jobject devices, jint devices_position);
+ extern jboolean extgl_BindVideoDeviceNV(JNIEnv *env, jobject peer_info_handle, jint video_slot, jlong video_device, jobject attrib_list, jint attrib_list_position);
+ extern jboolean extgl_QueryContextNV(JNIEnv *env, jobject peer_info_handle, jobject context_handle, jint attrib, jobject value, jint value_position);
+
+ /* NV_video_capture functions (GLX & WGL only) */
+ extern jboolean extgl_BindVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jint video_slot, jlong device);
+ extern jint extgl_EnumerateVideoCaptureDevicesNV(JNIEnv *env, jobject peer_info_handle, jobject devices, jint devices_position);
+ extern jboolean extgl_LockVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device);
+ extern jboolean extgl_QueryVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device, jint attribute, jobject value, jint value_position);
+ extern jboolean extgl_ReleaseVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device);
+#endif
+
#endif /* __EXTGL_H__ */
Added: branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c
===================================================================
--- branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c (rev 0)
+++ branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * JNI implementation of the NVPresentVideoUtil class (GLX & WGL only).
+ *
+ * @author Spasi
+ */
+
+#include <jni.h>
+#include "common_tools.h"
+#include "extgl.h"
+#include "org_lwjgl_opengl_NVPresentVideoUtil.h"
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVPresentVideoUtil_nglEnumerateVideoDevicesNV(
+ JNIEnv *env, jclass clazz, jobject peer_info, jobject devices, jint devices_position
+) {
+ #ifdef __APPLE__
+ return 0;
+ #else
+ return extgl_EnumerateVideoDevicesNV(env, peer_info, devices, devices_position);
+ #endif
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVPresentVideoUtil_nglBindVideoDeviceNV(
+ JNIEnv *env, jclass clazz, jobject peer_info, jint video_slot, jlong video_device, jobject attrib_list, jint attrib_list_position
+) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_BindVideoDeviceNV(env, peer_info, video_slot, video_device, attrib_list, attrib_list_position);
+ #endif
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVPresentVideoUtil_nglQueryContextNV(JNIEnv *env, jclass clazz, jobject peer_info, jobject context_handle, jint attrib, jobject value, jint value_position) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_QueryContextNV(env, peer_info, context_handle, attrib, value, value_position);
+ #endif
+}
Added: branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c
===================================================================
--- branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c (rev 0)
+++ branches/opengles/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * JNI implementation of the NVVideoCaptureUtil class (GLX & WGL only).
+ *
+ * @author Spasi
+ */
+
+#include <jni.h>
+#include "common_tools.h"
+#include "extgl.h"
+#include "org_lwjgl_opengl_NVVideoCaptureUtil.h"
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVVideoCaptureUtil_nglBindVideoCaptureDeviceNV(JNIEnv *env, jclass clazz, jobject peer_info, jint video_slot, jlong device) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_BindVideoCaptureDeviceNV(env, peer_info, video_slot, device);
+ #endif
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVVideoCaptureUtil_nglEnumerateVideoCaptureDevicesNV(JNIEnv *env, jclass clazz, jobject peer_info, jobject devices, jint devices_position) {
+ #ifdef __APPLE__
+ return 0;
+ #else
+ return extgl_EnumerateVideoCaptureDevicesNV(env, peer_info, devices, devices_position);
+ #endif
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVVideoCaptureUtil_nglLockVideoCaptureDeviceNV(JNIEnv *env, jclass clazz, jobject peer_info, jlong device) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_LockVideoCaptureDeviceNV(env, peer_info, device);
+ #endif
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVVideoCaptureUtil_nglQueryVideoCaptureDeviceNV(JNIEnv *env, jclass clazz, jobject peer_info, jlong device, jint attribute, jobject value, jint value_position) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_QueryVideoCaptureDeviceNV(env, peer_info, device, attribute, value, value_position);
+ #endif
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVVideoCaptureUtil_nglReleaseVideoCaptureDeviceNV(JNIEnv *env, jclass clazz, jobject peer_info, jlong device) {
+ #ifdef __APPLE__
+ return false;
+ #else
+ return extgl_ReleaseVideoCaptureDeviceNV(env, peer_info, device);
+ #endif
+}
\ No newline at end of file
Added: branches/opengles/LWJGL/src/native/linux/opengl/GLX.c
===================================================================
--- branches/opengles/LWJGL/src/native/linux/opengl/GLX.c (rev 0)
+++ branches/opengles/LWJGL/src/native/linux/opengl/GLX.c 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * GLX extension implementations.
+ *
+ * @author Spasi
+ */
+#include "GLX.h"
+
+/* NV_present_video functions */
+
+typedef struct {
+ GLXExtensions extension_flags;
+ GLXContext context;
+} X11Context;
+
+jint extgl_EnumerateVideoDevicesNV(JNIEnv *env, jobject peer_info_handle, jobject devices, jint devices_position) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+ jlong *devices_address = ((jlong *)safeGetBufferAddress(env, devices)) + devices_position;
+ unsigned int *result;
+ int i, elements;
+
+ result = lwjgl_glXEnumerateVideoDevicesNV(peer_info->display, peer_info->screen, &elements);
+ if ( devices_address != NULL ) {
+ for ( i = 0; i < elements; i++ )
+ devices_address[i] = (jlong)result[i];
+ }
+ XFree(result);
+
+ return elements;
+}
+
+jboolean extgl_BindVideoDeviceNV(JNIEnv *env, jobject peer_info_handle, jint video_slot, jlong video_device, jobject attrib_list, jint attrib_list_position) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+ const int *attrib_list_address = ((const int *)safeGetBufferAddress(env, attrib_list)) + attrib_list_position;
+
+ return lwjgl_glXBindVideoDeviceNV(peer_info->display, video_slot, (unsigned int)video_device, attrib_list_address);
+}
+
+jboolean extgl_QueryContextNV(JNIEnv *env, jobject peer_info_handle, jobject context_handle, jint attrib, jobject value, jint value_position) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+ X11Context *context_info = (*env)->GetDirectBufferAddress(env, context_handle);
+ int *value_address = ((int *)(*env)->GetDirectBufferAddress(env, value)) + value_position;
+
+ return lwjgl_glXQueryContext(peer_info->display, context_info->context, attrib, value_address) == GLX_BAD_ATTRIBUTE ? 0 : 1;
+}
+
+/* NV_video_capture functions */
+
+jboolean extgl_BindVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jint video_slot, jlong device) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+
+ return lwjgl_glXBindVideoCaptureDeviceNV(peer_info->display, video_slot, (GLXVideoCaptureDeviceNV)device);
+}
+
+jint extgl_EnumerateVideoCaptureDevicesNV(JNIEnv *env, jobject peer_info_handle, jobject devices, jint devices_position) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+ jlong *devices_address = ((jlong *)safeGetBufferAddress(env, devices)) + devices_position;
+ GLXVideoCaptureDeviceNV *result;
+ int i, elements;
+
+ result = lwjgl_glXEnumerateVideoCaptureDevicesNV(peer_info->display, peer_info->screen, &elements);
+ if ( devices_address != NULL ) {
+ for ( i = 0; i < elements; i++ )
+ devices_address[i] = (jlong)result[i];
+ }
+ XFree(devices);
+
+ return elements;
+}
+
+jboolean extgl_LockVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+
+ lwjgl_glXLockVideoCaptureDeviceNV(peer_info->display, (GLXVideoCaptureDeviceNV)device);
+ return true;
+}
+
+jboolean extgl_QueryVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device, jint attribute, jobject value, jint value_position) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+ int *value_address = ((int *)(*env)->GetDirectBufferAddress(env, value)) + value_position;
+
+ return lwjgl_glXQueryVideoCaptureDeviceNV(peer_info->display, (GLXVideoCaptureDeviceNV)device, attribute, value_address);
+}
+
+jboolean extgl_ReleaseVideoCaptureDeviceNV(JNIEnv *env, jobject peer_info_handle, jlong device) {
+ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
+
+ lwjgl_glXReleaseVideoCaptureDeviceNV(peer_info->display, (GLXVideoCaptureDeviceNV)device);
+ return true;
+}
Added: branches/opengles/LWJGL/src/native/linux/opengl/GLX.h
===================================================================
--- branches/opengles/LWJGL/src/native/linux/opengl/GLX.h (rev 0)
+++ branches/opengles/LWJGL/src/native/linux/opengl/GLX.h 2011-05-21 10:48:05 UTC (rev 3537)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2002-2011 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may...
[truncated message content] |
|
From: <sp...@us...> - 2011-06-04 00:53:11
|
Revision: 3540
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3540&view=rev
Author: spasi
Date: 2011-06-04 00:53:04 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Added OpenAL & OpenCL generated native paths.
Added support for AMD_device_memory_flags, AMD_offline_devices, AMD_popcnt [OpenCL]
Minor bugs fixed in high-level OpenCL API.
Modified Paths:
--------------
branches/opengles/LWJGL/platform_build/linux_ant/build.xml
branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml
branches/opengles/LWJGL/platform_build/macosx_ant/build.xml
branches/opengles/LWJGL/platform_build/mingw_ant/build.xml
branches/opengles/LWJGL/platform_build/windows_ant/build.xml
branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml
branches/opengles/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
branches/opengles/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
Added Paths:
-----------
branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java
branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java
Modified: branches/opengles/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/linux_ant/build.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/linux_ant/build.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -79,6 +79,8 @@
<mapper type="glob" from="*.c" to="*.o"/>
<fileset dir="${native}/common" includes="*.c"/>
<fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
<fileset dir="${native}/generated/opengl" includes="*.c"/>
<fileset dir="${native}/linux" includes="*.c"/>
<fileset dir="${native}/linux/opengl" includes="*.c"/>
Modified: branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -79,6 +79,8 @@
<mapper type="glob" from="*.c" to="*.o"/>
<fileset dir="${native}/common" includes="*.c"/>
<fileset dir="${native}/common/opengles" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
<fileset dir="${native}/generated/opengles" includes="*.c"/>
<fileset dir="${native}/linux" includes="*.c"/>
<fileset dir="${native}/linux/opengles" includes="*.c"/>
Modified: branches/opengles/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/macosx_ant/build.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/macosx_ant/build.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -7,7 +7,7 @@
<mkdir dir="i386"/>
<mkdir dir="x86_64"/>
</target>
-
+
<target name="clean">
<delete failonerror="false">
<fileset dir="i386"/>
@@ -26,10 +26,12 @@
<fileset dir="${native}/macosx" includes="*.m"/>
<fileset dir="${native}/macosx" includes="*.c"/>
<fileset dir="${native}/common" includes="*.c"/>
- <fileset dir="${native}/generated" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
</apply>
</target>
-
+
<target name="link">
<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
@@ -40,7 +42,7 @@
<fileset dir="." file="${libname}"/>
</apply>
</target>
-
+
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
<property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
Modified: branches/opengles/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/mingw_ant/build.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/mingw_ant/build.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -22,7 +22,9 @@
<srcfile/>
<fileset dir="${native}/windows" includes="*.c"/>
<fileset dir="${native}/common" includes="*.c"/>
- <fileset dir="${native}/generated" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
<mapper type="glob" from="*.c" to="*.o"/>
</apply>
</target>
@@ -53,7 +55,7 @@
<fileset dir="." includes="*.dll"/>
</delete>
</target>
-
+
<target name="compile">
<property name="libs" value="-lkernel32 -lole32 -lopengl32 -lversion -luser32 -lgdi32 -ladvapi32 -lwinmm"/>
<antcall target="compile_dir"/>
Modified: branches/opengles/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/windows_ant/build.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/windows_ant/build.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -18,6 +18,8 @@
<srcfile/>
<fileset dir="${native}/common" includes="*.c"/>
<fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
<fileset dir="${native}/generated/opengl" includes="*.c"/>
<fileset dir="${native}/windows" includes="*.c"/>
<fileset dir="${native}/windows/opengl" includes="*.c"/>
Modified: branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml 2011-06-04 00:53:04 UTC (rev 3540)
@@ -18,6 +18,8 @@
<srcfile/>
<fileset dir="${native}/common" includes="*.c"/>
<fileset dir="${native}/common/opengles" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
<fileset dir="${native}/generated/opengles" includes="*.c"/>
<fileset dir="${native}/windows" includes="*.c"/>
<fileset dir="${native}/windows/opengles" includes="*.c"/>
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -453,7 +453,7 @@
*/
static void releaseObjects(final CLDevice device) {
// Release objects only if we're about to hit 0.
- if ( device.getReferenceCount() > 1 )
+ if ( !device.isValid() || device.getReferenceCount() > 1 )
return;
releaseObjects(device.getSubCLDeviceRegistry(), DESTRUCTOR_CLSubDevice);
@@ -466,7 +466,7 @@
*/
static void releaseObjects(final CLContext context) {
// Release objects only if we're about to hit 0.
- if ( context.getReferenceCount() > 1 )
+ if ( !context.isValid() || context.getReferenceCount() > 1 )
return;
releaseObjects(context.getCLEventRegistry(), DESTRUCTOR_CLEvent);
@@ -483,7 +483,7 @@
*/
static void releaseObjects(final CLProgram program) {
// Release objects only if we're about to hit 0.
- if ( program.getReferenceCount() > 1 )
+ if ( !program.isValid() || program.getReferenceCount() > 1 )
return;
releaseObjects(program.getCLKernelRegistry(), DESTRUCTOR_CLKernel);
@@ -496,7 +496,7 @@
*/
static void releaseObjects(final CLCommandQueue queue) {
// Release objects only if we're about to hit 0.
- if ( queue.getReferenceCount() > 1 )
+ if ( !queue.isValid() || queue.getReferenceCount() > 1 )
return;
releaseObjects(queue.getCLEventRegistry(), DESTRUCTOR_CLEvent);
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -118,7 +118,7 @@
final long user_data = pfn_notify == null || pfn_notify.isCustom() ? 0 : CallbackUtil.createGlobalRef(pfn_notify);
CLContext __result = null;
try {
- __result = new CLContext(nclCreateContext(properties.getBuffer(), 0, devices.size(), properties.getBuffer(), propertyCount * PointerBuffer.getPointerSize(), pfn_notify == null ? 0 : pfn_notify.getPointer(), user_data, errcode_ret, errcode_ret != null ? errcode_ret.position() : 0, function_pointer), platform);
+ __result = new CLContext(nclCreateContext(properties.getBuffer(), 0, devices.size(), properties.getBuffer(), propertyCount, pfn_notify == null ? 0 : pfn_notify.getPointer(), user_data, errcode_ret, errcode_ret != null ? errcode_ret.position() : 0, function_pointer), platform);
if ( LWJGLUtil.DEBUG )
Util.checkCLError(errcode_ret.get(0));
return __result;
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java 2011-05-31 14:40:47 UTC (rev 3539)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -395,7 +395,8 @@
}
private void destroy() {
- clReleaseContext(clContext);
+ if ( clContext != null )
+ clReleaseContext(clContext);
Display.destroy();
System.exit(0);
}
@@ -422,7 +423,6 @@
kernel.setArg(0, SCREEN_WIDTH);
kernel.setArg(1, SCREEN_HEIGHT);
- kernel.setArg(2, ballSize * 0.5f);
}
protected void createProgram(final int vshID) {
Added: branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java
===================================================================
--- branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java (rev 0)
+++ branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface AMD_device_memory_flags {
+
+ /** Alloc from GPU's CPU visible heap. */
+ int CL_MEM_USE_PERSISTENT_MEM_AMD = (1 << 6);
+
+}
\ No newline at end of file
Added: branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java
===================================================================
--- branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java (rev 0)
+++ branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface AMD_offline_devices {
+
+ int CL_CONTEXT_OFFLINE_DEVICES_AMD = 0x403F;
+
+}
\ No newline at end of file
Added: branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java
===================================================================
--- branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java (rev 0)
+++ branches/opengles/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java 2011-06-04 00:53:04 UTC (rev 3540)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface AMD_popcnt {
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
