From: <sp...@us...> - 2011-07-10 16:58:31
|
Revision: 3561 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3561&view=rev Author: spasi Date: 2011-07-10 16:58:16 +0000 (Sun, 10 Jul 2011) Log Message: ----------- Merged OpenGL ES branch. Modified Paths: -------------- trunk/LWJGL/build.xml trunk/LWJGL/platform_build/build-definitions.xml trunk/LWJGL/platform_build/build-generator.xml trunk/LWJGL/platform_build/linux_ant/build.xml trunk/LWJGL/platform_build/macosx_ant/build.xml trunk/LWJGL/platform_build/mingw_ant/build.xml trunk/LWJGL/platform_build/windows_ant/build.xml trunk/LWJGL/src/java/org/lwjgl/opencl/APIUtil.java trunk/LWJGL/src/java/org/lwjgl/opencl/CallbackUtil.java trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java trunk/LWJGL/src/java/org/lwjgl/opengl/SharedDrawable.java trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java Added Paths: ----------- trunk/LWJGL/libs/linux/libEGL.so trunk/LWJGL/libs/linux/libGLESv2.so trunk/LWJGL/libs/linux/x64/ trunk/LWJGL/libs/linux/x64/libEGL.so trunk/LWJGL/libs/linux/x64/libGLESv2.so trunk/LWJGL/libs/windows/libEGL.dll trunk/LWJGL/libs/windows/libEGL.lib trunk/LWJGL/libs/windows/libGLESv2.dll trunk/LWJGL/platform_build/linux_ant/build_es.xml trunk/LWJGL/platform_build/windows_ant/build_es.xml trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java trunk/LWJGL/src/java/org/lwjgl/opengl/ContextGL.java trunk/LWJGL/src/java/org/lwjgl/opengl/ContextGLES.java trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGLES.java trunk/LWJGL/src/java/org/lwjgl/opengl/NVPresentVideoUtil.java trunk/LWJGL/src/java/org/lwjgl/opengl/NVVideoCaptureUtil.java trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormatLWJGL.java trunk/LWJGL/src/java/org/lwjgl/opengles/ trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGL.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLConfig.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLContext.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLImageOES.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRFenceSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRReusableSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLNVSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSurface.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncKHR.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncNV.java trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java trunk/LWJGL/src/java/org/lwjgl/opengles/PeerInfo.java trunk/LWJGL/src/java/org/lwjgl/opengles/PixelFormat.java trunk/LWJGL/src/java/org/lwjgl/opengles/PowerManagementEventException.java trunk/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java trunk/LWJGL/src/java/org/lwjgl/opengles/Util.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/ trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/Gears.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/QuadRenderer.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObject.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectArray.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectElement.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLLight.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLMatrix.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLObject.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Geometry.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ImmediateModeBuffer.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Sphere.java trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLint64NV.java trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/EGLuint64NV.java trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESCapabilitiesGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java trunk/LWJGL/src/native/common/EGL/ trunk/LWJGL/src/native/common/EGL/egl.h trunk/LWJGL/src/native/common/EGL/eglext.h trunk/LWJGL/src/native/common/EGL/eglplatform.h trunk/LWJGL/src/native/common/GLES2/ trunk/LWJGL/src/native/common/GLES2/gl2.h trunk/LWJGL/src/native/common/GLES2/gl2ext.h trunk/LWJGL/src/native/common/GLES2/gl2extimg.h trunk/LWJGL/src/native/common/GLES2/gl2platform.h trunk/LWJGL/src/native/common/KHR/ trunk/LWJGL/src/native/common/KHR/khrplatform.h trunk/LWJGL/src/native/common/opengl/ trunk/LWJGL/src/native/common/opengl/extgl.c trunk/LWJGL/src/native/common/opengl/extgl.h trunk/LWJGL/src/native/common/opengl/extgl_types.h trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_GLContext.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c trunk/LWJGL/src/native/common/opengles/ trunk/LWJGL/src/native/common/opengles/extgl.c trunk/LWJGL/src/native/common/opengles/extgl.h trunk/LWJGL/src/native/common/opengles/extgl_egl.c trunk/LWJGL/src/native/common/opengles/extgl_egl.h trunk/LWJGL/src/native/common/opengles/extgl_types.h trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGL.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRFenceSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRReusableSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLNVSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_GLContext.c trunk/LWJGL/src/native/linux/opengl/ trunk/LWJGL/src/native/linux/opengl/GLX.c trunk/LWJGL/src/native/linux/opengl/GLX.h trunk/LWJGL/src/native/linux/opengl/context.c trunk/LWJGL/src/native/linux/opengl/context.h trunk/LWJGL/src/native/linux/opengl/display.c trunk/LWJGL/src/native/linux/opengl/extgl_glx.c trunk/LWJGL/src/native/linux/opengl/extgl_glx.h trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxCanvasImplementation.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/linux/opengles/ trunk/LWJGL/src/native/linux/opengles/context.c trunk/LWJGL/src/native/linux/opengles/context.h trunk/LWJGL/src/native/linux/opengles/display.c trunk/LWJGL/src/native/linux/opengles/extgl_glx.c trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c trunk/LWJGL/src/native/windows/opengl/ trunk/LWJGL/src/native/windows/opengl/WGL.c trunk/LWJGL/src/native/windows/opengl/WGL.h trunk/LWJGL/src/native/windows/opengl/context.c trunk/LWJGL/src/native/windows/opengl/context.h trunk/LWJGL/src/native/windows/opengl/extgl_wgl.c trunk/LWJGL/src/native/windows/opengl/extgl_wgl.h trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsPeerInfo.c trunk/LWJGL/src/native/windows/opengles/ trunk/LWJGL/src/native/windows/opengles/context.c trunk/LWJGL/src/native/windows/opengles/context.h trunk/LWJGL/src/native/windows/opengles/extgl_wgl.c trunk/LWJGL/src/native/windows/opengles/org_lwjgl_opengl_WindowsPeerInfo.c trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_device_memory_flags.java trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_offline_devices.java trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_popcnt.java trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_3DC_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_ATC_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_program_binary_Z400.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_blit.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_multisample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_framebuffer_multisample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_rgb_422.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_format_BGRA8888.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_max_level.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_draw_buffers.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_half_float_pixel.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_texture_rectangle.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_mali_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_rgba8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/DMP_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_Cg_shader.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_bgra.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_blend_minmax.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_discard_framebuffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_frag_depth.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multi_draw_arrays.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_packed_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_read_format_bgra.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_texture_lod.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_array.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_dxt1.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_latc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_s3tc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_filter_anisotropic.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_format_BGRA8888.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_lod_bias.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_type_2_10_10_10_REV.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_program_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_texture_compression_pvrtc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_coverage_sample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_depth_nonlinear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_path.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fbo_color_attachments.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fence.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_framebuffer_vertex_attrib_array.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_get_tex_image.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_read_buffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_shader_framebuffer_fetch.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_system_time.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image_external.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_equation_separate.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_func_separate.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_subtract.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_ETC1_RGB8_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_paletted_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth24.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth32.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_element_index_uint.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_fbo_render_mipmap.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_get_program_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_mapbuffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_packed_depth_stencil.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_rgb8_rgba8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_standard_derivatives.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil1.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil4.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_3D.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float_linear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float_linear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_npot.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_array_object.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_half_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_type_10_10_10_2.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_driver_control.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get2.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_performance_monitor_global_mode.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_tiled_rendering.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_writeonly_rendering.java trunk/LWJGL/src/templates/org/lwjgl/opengles/VIV_shader_binary.java Removed Paths: ------------- trunk/LWJGL/libs/linux/x64/libEGL.so trunk/LWJGL/libs/linux/x64/libGLESv2.so trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractDrawable.java trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGL.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLConfig.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLContext.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLDisplay.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLImageOES.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRFenceSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLKHRReusableSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLNVSync.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSurface.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncKHR.java trunk/LWJGL/src/java/org/lwjgl/opengles/EGLSyncNV.java trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java trunk/LWJGL/src/java/org/lwjgl/opengles/PeerInfo.java trunk/LWJGL/src/java/org/lwjgl/opengles/PixelFormat.java trunk/LWJGL/src/java/org/lwjgl/opengles/PowerManagementEventException.java trunk/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java trunk/LWJGL/src/java/org/lwjgl/opengles/Util.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/FullScreenWindowedTest.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/Gears.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/MappedIndexedVBOTest.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/QuadRenderer.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObject.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectArray.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/BufferObjectElement.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLLight.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLMatrix.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/GLObject.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Geometry.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ImmediateModeBuffer.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Sphere.java trunk/LWJGL/src/native/common/EGL/egl.h trunk/LWJGL/src/native/common/EGL/eglext.h trunk/LWJGL/src/native/common/EGL/eglplatform.h trunk/LWJGL/src/native/common/GLES2/gl2.h trunk/LWJGL/src/native/common/GLES2/gl2ext.h trunk/LWJGL/src/native/common/GLES2/gl2extimg.h trunk/LWJGL/src/native/common/GLES2/gl2platform.h trunk/LWJGL/src/native/common/KHR/khrplatform.h trunk/LWJGL/src/native/common/extgl.c trunk/LWJGL/src/native/common/extgl.h trunk/LWJGL/src/native/common/extgl_types.h trunk/LWJGL/src/native/common/opengl/extgl.c trunk/LWJGL/src/native/common/opengl/extgl.h trunk/LWJGL/src/native/common/opengl/extgl_types.h trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_GLContext.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVPresentVideoUtil.c trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_NVVideoCaptureUtil.c trunk/LWJGL/src/native/common/opengles/extgl.c trunk/LWJGL/src/native/common/opengles/extgl.h trunk/LWJGL/src/native/common/opengles/extgl_egl.c trunk/LWJGL/src/native/common/opengles/extgl_egl.h trunk/LWJGL/src/native/common/opengles/extgl_types.h trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGL.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRFenceSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLKHRReusableSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_EGLNVSync.c trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_GLContext.c trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.c trunk/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.c trunk/LWJGL/src/native/linux/context.c trunk/LWJGL/src/native/linux/context.h trunk/LWJGL/src/native/linux/display.c trunk/LWJGL/src/native/linux/extgl_glx.c trunk/LWJGL/src/native/linux/extgl_glx.h trunk/LWJGL/src/native/linux/opengl/GLX.c trunk/LWJGL/src/native/linux/opengl/GLX.h trunk/LWJGL/src/native/linux/opengl/context.c trunk/LWJGL/src/native/linux/opengl/context.h trunk/LWJGL/src/native/linux/opengl/display.c trunk/LWJGL/src/native/linux/opengl/extgl_glx.c trunk/LWJGL/src/native/linux/opengl/extgl_glx.h trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxCanvasImplementation.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/linux/opengles/context.c trunk/LWJGL/src/native/linux/opengles/context.h trunk/LWJGL/src/native/linux/opengles/display.c trunk/LWJGL/src/native/linux/opengles/extgl_glx.c trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxCanvasImplementation.c trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/windows/context.c trunk/LWJGL/src/native/windows/context.h trunk/LWJGL/src/native/windows/extgl_wgl.c trunk/LWJGL/src/native/windows/extgl_wgl.h trunk/LWJGL/src/native/windows/opengl/WGL.c trunk/LWJGL/src/native/windows/opengl/WGL.h trunk/LWJGL/src/native/windows/opengl/context.c trunk/LWJGL/src/native/windows/opengl/context.h trunk/LWJGL/src/native/windows/opengl/extgl_wgl.c trunk/LWJGL/src/native/windows/opengl/extgl_wgl.h trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsContextImplementation.c trunk/LWJGL/src/native/windows/opengl/org_lwjgl_opengl_WindowsPeerInfo.c trunk/LWJGL/src/native/windows/opengles/context.c trunk/LWJGL/src/native/windows/opengles/context.h trunk/LWJGL/src/native/windows/opengles/extgl_wgl.c trunk/LWJGL/src/native/windows/opengles/org_lwjgl_opengl_WindowsPeerInfo.c trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_3DC_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_compressed_ATC_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_program_binary_Z400.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_blit.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ANGLE_framebuffer_multisample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_framebuffer_multisample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_rgb_422.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_format_BGRA8888.java trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_texture_max_level.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_draw_buffers.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_half_float_pixel.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARB_texture_rectangle.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_mali_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/ARM_rgba8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/DMP_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_Cg_shader.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_bgra.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_blend_minmax.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_discard_framebuffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_frag_depth.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multi_draw_arrays.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_packed_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_read_format_bgra.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_texture_lod.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_array.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_dxt1.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_latc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_compression_s3tc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_filter_anisotropic.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_format_BGRA8888.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_lod_bias.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_type_2_10_10_10_REV.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_multisamples_render_to_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_program_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_shader_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/IMG_texture_compression_pvrtc.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_coverage_sample.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_depth_nonlinear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_path.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fbo_color_attachments.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_fence.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_framebuffer_vertex_attrib_array.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_get_tex_image.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_read_buffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_shader_framebuffer_fetch.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_system_time.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_image_external.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_EGL_sync.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_equation_separate.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_func_separate.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_blend_subtract.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_ETC1_RGB8_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_compressed_paletted_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth24.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth32.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_depth_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_element_index_uint.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_fbo_render_mipmap.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_get_program_binary.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_mapbuffer.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_packed_depth_stencil.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_rgb8_rgba8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_standard_derivatives.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil1.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil4.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_stencil8.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_3D.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float_linear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_half_float_linear.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_npot.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_array_object.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_half_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_vertex_type_10_10_10_2.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_driver_control.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_extended_get2.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_performance_monitor_global_mode.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_tiled_rendering.java trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_writeonly_rendering.java trunk/LWJGL/src/templates/org/lwjgl/opengles/VIV_shader_binary.java Property Changed: ---------------- trunk/LWJGL/ trunk/LWJGL/libs/ trunk/LWJGL/libs/windows/ trunk/LWJGL/src/native/common/ trunk/LWJGL/src/native/linux/ Property changes on: trunk/LWJGL ___________________________________________________________________ Modified: svn:ignore - .classpath *.class *.class~ *.java~ .nbattrs .project dist libs temp + *.class *.class~ *.java~ .classpath .nbattrs .project bin dist libs temp Added: svn:mergeinfo + /branches/opengles/LWJGL:3533-3560 Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2011-07-10 10:26:36 UTC (rev 3560) +++ trunk/LWJGL/build.xml 2011-07-10 16:58:16 UTC (rev 3561) @@ -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" /> @@ -48,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 --> @@ -111,6 +113,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 +169,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 +251,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 +297,26 @@ <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"/> + <class name="org.lwjgl.opengl.NVPresentVideoUtil"/> + <class name="org.lwjgl.opengl.NVVideoCaptureUtil"/> + </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 +411,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 +478,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: trunk/LWJGL/libs ___________________________________________________________________ Added: svn:ignore + lwjgl-debug.jar lwjgl.jar lwjgl_test.jar lwjgl_util.jar lwjgl_util_applet.jar Copied: trunk/LWJGL/libs/linux/libEGL.so (from rev 3560, branches/opengles/LWJGL/libs/linux/libEGL.so) =================================================================== (Binary files differ) Copied: trunk/LWJGL/libs/linux/libGLESv2.so (from rev 3560, branches/opengles/LWJGL/libs/linux/libGLESv2.so) =================================================================== (Binary files differ) Deleted: trunk/LWJGL/libs/linux/x64/libEGL.so =================================================================== (Binary files differ) Copied: trunk/LWJGL/libs/linux/x64/libEGL.so (from rev 3560, branches/opengles/LWJGL/libs/linux/x64/libEGL.so) =================================================================== (Binary files differ) Deleted: trunk/LWJGL/libs/linux/x64/libGLESv2.so =================================================================== (Binary files differ) Copied: trunk/LWJGL/libs/linux/x64/libGLESv2.so (from rev 3560, branches/opengles/LWJGL/libs/linux/x64/libGLESv2.so) =================================================================== (Binary files differ) Property changes on: trunk/LWJGL/libs/windows ___________________________________________________________________ Added: svn:ignore + lwjgl.dll Copied: trunk/LWJGL/libs/windows/libEGL.dll (from rev 3560, branches/opengles/LWJGL/libs/windows/libEGL.dll) =================================================================== (Binary files differ) Copied: trunk/LWJGL/libs/windows/libEGL.lib (from rev 3560, branches/opengles/LWJGL/libs/windows/libEGL.lib) =================================================================== (Binary files differ) Copied: trunk/LWJGL/libs/windows/libGLESv2.dll (from rev 3560, branches/opengles/LWJGL/libs/windows/libGLESv2.dll) =================================================================== (Binary files differ) Modified: trunk/LWJGL/platform_build/build-definitions.xml =================================================================== --- trunk/LWJGL/platform_build/build-definitions.xml 2011-07-10 10:26:36 UTC (rev 3560) +++ trunk/LWJGL/platform_build/build-definitions.xml 2011-07-10 16:58:16 UTC (rev 3561) @@ -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/lwjgl/opengles/GLES*.java,org/lwjgl/opengles/ARB*.java,org/lwjgl/opengles/EXT*.java,org/lwjgl/opengles/AMD*.java,org/lwjgl/opengles/ANGLE*.java,org/lwjgl/opengles/APPLE*.java,org/lwjgl/opengles/ARM*.java,org/lwjgl/opengles/DMP*.java,org/lwjgl/opengles/IMG*.java,org/lwjgl/opengles/NV*.java,org/lwjgl/opengles/OES*.java,org/lwjgl/opengles/QCOM*.java,org/lwjgl/opengles/VIV*.java"/> <property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/NV*.java"/> <property name="opencl-template-pattern" value="org/lwjgl/opencl/CL*.java,${opencl-template-pattern-extensions}"/> @@ -27,13 +28,25 @@ <fileset id="lwjgl.fileset" dir="${lwjgl.bin}"> <patternset id="lwjgl.package.pattern"> <include name="org/**/*" /> + <exclude name="org/lwjgl/opengles/**"/> <exclude name="org/lwjgl/d3d/**" /> <exclude name="org/lwjgl/test/**" /> <exclude name="org/lwjgl/util/**" /> <exclude name="org/lwjgl/examples/**" /> </patternset> </fileset> - + + <!-- Files to include in the lwjgl.jar file, for the ES build --> + <fileset id="lwjgl_es.fileset" dir="${lwjgl.bin}"> + <patternset id="lwjgl_es.package.pattern"> + <include name="org/**/*"/> + <exclude name="org/lwjgl/d3d/**"/> + <exclude name="org/lwjgl/test/**"/> + <exclude name="org/lwjgl/util/**"/> + <exclude name="org/lwjgl/examples/**"/> + </patternset> + </fileset> + <!-- Files to include in the lwjgl_util_applet.jar file --> <fileset id="lwjgl_util_applet.fileset" dir="${lwjgl.bin}"> <patternset id="lwjgl_util_applet.package.pattern"> @@ -46,6 +59,7 @@ <fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}"> <exclude name="**.*" /> <include name="org/lwjgl/test/**" /> + <exclude name="org/lwjgl/test/opengles/**"/> <include name="org/lwjgl/examples/**" /> </fileset> @@ -59,6 +73,14 @@ <include name="org/lwjgl/test/opencl/gl/*.cl" /> </fileset> + <!-- Files to include in the lwjgl_test.jar file for the ES build --> + <fileset id="lwjgl_test_es.fileset" dir="${lwjgl.bin}"> + <exclude name="**.*"/> + <include name="org/lwjgl/test/**"/> + <exclude name="org/lwjgl/test/opengl/**"/> + <exclude name="org/lwjgl/test/*.*"/> + </fileset> + <!-- Files to include in the lwjgl_util.jar file --> <fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}"> <patternset id="lwjgl_util.package.pattern"> @@ -68,8 +90,8 @@ <include name="org/lwjgl/util/**" /> </patternset> </fileset> - + <!-- Files to include in the lwjgl_applet.jar file --> <fileset id="lwjgl_applet.fileset" dir="${lwjgl.bin}"> <exclude name="**.*"/> @@ -116,7 +138,7 @@ <include name="liblwjgl*.so" /> <include name="libopenal*.so" /> </patternset> - <patternset id="lwjgl-linux-jinput.fileset"> + <patternset id="lwjgl-linux-jinput.fileset"> <include name="libjinput-linux.so" /> <include name="libjinput-linux64.so" /> </patternset> Modified: trunk/LWJGL/platform_build/build-generator.xml =================================================================== --- trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 10:26:36 UTC (rev 3560) +++ trunk/LWJGL/platform_build/build-generator.xml 2011-07-10 16:58:16 UTC (rev 3561) @@ -18,6 +18,7 @@ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.5" target="1.5" taskname="generator"> <include name="org/lwjgl/util/generator/openal/**.java"/> <include name="org/lwjgl/util/generator/opengl/**.java"/> + <include name="org/lwjgl/util/generator/opengles/**.java"/> <include name="org/lwjgl/util/generator/opencl/**.java"/> <compilerarg value="-Xlint:all"/> </javac> @@ -29,6 +30,8 @@ <include name="org/lwjgl/opengl/GLSync.java"/> <include name="org/lwjgl/opengl/AMDDebugOutputCallback.java"/> <include name="org/lwjgl/opengl/ARBDebugOutputCallback.java"/> + <!-- OpenGL ES --> + <include name="org/lwjgl/opengles/EGLImageOES.java"/> <!-- OpenCL --> <include name="org/lwjgl/opencl/CLPlatform.java"/> <include name="org/lwjgl/opencl/CLDevice.java"/> @@ -45,10 +48,16 @@ </target> <!-- Proxy target to generate it all --> - <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references, generate-opencl, generate-opencl-capabilities" description="Generates java and native source"/> + <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references, generate-opengles, generate-opengles-capabilities, generate-opencl, generate-opencl-capabilities" description="Generates java and native source"/> <target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities-debug, generate-opengl-references, generate-opencl-debug, generate-opencl-capabilities-debug" description="Generates java and native source with debug functionality"/> + <!-- ******************************************************************************** + ********************************************************************************* + OPENAL + ********************************************************************************* + **************************************************************************** --> + <!-- Generate OpenAL --> <target name="generate-openal" depends="generators" description="Generates java and native source for AL"> <apply executable="apt" parallel="true"> @@ -60,7 +69,7 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/openal"/> <arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/> <fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/> </apply> @@ -77,13 +86,19 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/openal"/> <arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/> <arg value="-Ageneratechecks"/> <fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/> </apply> </target> + <!-- ******************************************************************************** + ********************************************************************************* + OPENGL + ********************************************************************************* + **************************************************************************** --> + <!-- Generate OpenGL --> <target name="generate-opengl" depends="generators" description="Generates java and native source for GL"> <apply executable="apt" parallel="true"> @@ -95,7 +110,7 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/opengl"/> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/> <fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/> @@ -103,7 +118,7 @@ </target> <!-- Generate OpenGL [DEBUG] --> - <target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL"> + <target name="generate-opengl-debug" depends="generators" description="Generates debug java and native source for GL"> <apply executable="apt" parallel="true"> <arg value="-nocompile"/> <arg value="-factory"/> @@ -113,7 +128,7 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/opengl"/> <arg value="-Ageneratechecks"/> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/> @@ -151,7 +166,7 @@ </target> <!-- Generate OpenGL context capabilities [DEBUG] --> - <target name="generate-opengl-capabilities-debug" depends="generators" description="Generates java and native source for GL"> + <target name="generate-opengl-capabilities-debug" depends="generators" description="Generates debug java and native source for GL"> <apply executable="apt" parallel="true"> <arg value="-nocompile"/> <arg value="-factory"/> @@ -166,7 +181,87 @@ </apply> </target> - <!-- Generate OpenCL --> + <!-- ******************************************************************************** + ********************************************************************************* + OPENGL ES + ********************************************************************************* + **************************************************************************** --> + + <!-- Generate OpenGL ES --> + <target name="generate-opengles" depends="generators" description="Generates java and native source for GL ES"> + <apply executable="apt" parallel="true"> + <arg value="-nocompile"/> + <arg value="-factory"/> + <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/> + <arg value="-cp"/> + <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/> + <arg value="-s"/> + <arg path="${lwjgl.src}/generated"/> + <arg value="-d"/> + <arg path="${lwjgl.src.native}/generated/opengles"/> + <!--<arg value="-Acontextspecific"/>--> + <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/> + <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/> + </apply> + </target> + + <!-- Generate OpenGL ES [DEBUG] --> + <target name="generate-opengles-debug" depends="generators" description="Generates debug java and native source for GL ES"> + <apply executable="apt" parallel="true"> + <arg value="-nocompile"/> + <arg value="-factory"/> + <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/> + <arg value="-cp"/> + <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/> + <arg value="-s"/> + <arg path="${lwjgl.src}/generated"/> + <arg value="-d"/> + <arg path="${lwjgl.src.native}/generated/opengles"/> + <arg value="-Ageneratechecks"/> + <!--<arg value="-Acontextspecific"/>--> + <arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/> + <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/> + </apply> + </target> + + <!-- Generate OpenGL ES context capabilities --> + <target name="generate-opengles-capabilities" depends="generators" description="Generates java and native source for GL ES"> + <apply executable="apt" parallel="true"> + <arg value="-nocompile"/> + <arg value="-factory"/> + <arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/> + <arg value="-cp"/> + <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/> + <arg value="-s"/> + <arg path="${lwjgl.src}/generated"/> + <!--<arg value="-Acontextspecific"/>--> + <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/> + </apply> + </target> + + <!-- Generate OpenGL ES context capabilities [DEBUG] --> + <target name="generate-opengles-capabilities-debug" depends="generators" description="Generates debug java and native source for GL ES"> + <apply executable="apt" parallel="true"> + <arg value="-nocompile"/> + <arg value="-factory"/> + <arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/> + <arg value="-cp"/> + <arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/> + <arg value="-s"/> + <arg path="${lwjgl.src}/generated"/> + <arg value="-Ageneratechecks"/> + <!--<arg value="-Acontextspecific"/>--> + <fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/> + </apply> + </target> + + <!-- ******************************************************************************** + ********************************************************************************* + OPENCL + ********************************************************************************* + **************************************************************************** --> + + <!-- Generate OpenCL --> <target name="generate-opencl" depends="generators" description="Generates java and native source for CL"> <apply executable="apt" parallel="true"> <arg value="-nocompile"/> @@ -177,7 +272,7 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/opencl"/> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/> <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/> @@ -185,7 +280,7 @@ </target> <!-- Generate OpenCL [DEBUG] --> - <target name="generate-opencl-debug" depends="generators" description="Generates java and native source for CL"> + <target name="generate-opencl-debug" depends="generators" description="Generates debug java and native source for CL"> <apply executable="apt" parallel="true"> <arg value="-nocompile"/> <arg value="-factory"/> @@ -195,7 +290,7 @@ <arg value="-s"/> <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> - <arg path="${lwjgl.src.native}/generated"/> + <arg path="${lwjgl.src.native}/generated/opencl"/> <arg value="-Ageneratechecks"/> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/> @@ -219,7 +314,7 @@ </target> <!-- Generate OpenCL capabilities [DEBUG] --> - <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates capabilities for CL"> + <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates debug capabilities for CL"> <apply executable="apt" parallel="true"> <arg value="-nocompile"/> <arg value="-factory"/> Modified: trunk/LWJGL/platform_build/linux_ant/build.xml =================================================================== --- trunk/LWJGL/platform_build/linux_ant/build.xml 2011-07-10 10:26:36 UTC (rev 3560) +++ trunk/LWJGL/platform_build/linux_ant/build.xml 2011-07-10 16:58:16 UTC (rev 3561) @@ -73,12 +73,18 @@ <arg value="-I${java.home}/../include/linux"/> <arg value="-I${java.home}/../include/solaris"/> <arg value="-I${native}/common"/> + <arg value="-I${native}/common/opengl"/> <arg value="-I${native}/linux"/> + <arg value="-I${native}/linux/opengl"/> <mapper type="glob" from="*.c" to="*.o"/> - <fileset dir="${native}/linux" includes="*.c"/> - <fileset dir="${native}/generated" includes="*.c"/> - <fileset dir="${native}/common" includes="*.c"/> - </apply> + <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"/> + </apply> <apply dir="." parallel="true" executable="gcc" failonerror="true"> <srcfile/> <arg line="${linker_flags32}"/> @@ -99,12 +105,16 @@ <arg value="-I${java.home}/../include/linux"/> <arg value="-I${java.home}/../include/solaris"/> <arg value="-I${native}/common"/> + <arg value="-I${native}/common/opengl"/> <arg value="-I${native}/linux"/> + <arg value="-I${native}/linux/opengl"/> <mapper type="glob" from="*.c" to="*.o"/> - <fileset dir="${native}/linux" includes="*.c"/> - <fileset dir="${native}/generated" includes="*.c"/> - <fileset dir="${native}/common" includes="*.c"/> - </apply> + <fileset dir="${native}/common" includes="*.c"/> + <fileset dir="${native}/common/opengl" includes="*.c"/> + <fileset dir="${native}/generated/opengl" includes="*.c"/> + <fileset dir="${native}/linux" includes="*.c"/> + <fileset dir="${native}/linux/opengl" includes="*.c"/> + </apply> <apply dir="." parallel="true" executable="gcc" failonerror="true"> <srcfile/> <arg line="${linker_flags64}"/> Copied: trunk/LWJGL/platform_build/linux_ant/build_es.xml (from rev 3560, branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml) =================================================================== --- trunk/LWJGL/platform_build/linux_ant/build_es.xml (rev 0) +++ trunk/LWJGL/platform_build/linux_ant/build_es.xml 2011-07-10 16:58:16 UTC (rev 3561) @@ -0,0 +1,127 @@ +<?xml version="1.0"?> + +<project name="lwjgl native code, linux" basedir="../../bin/lwjgles" default="compile"> + <property name="native" location="../../src/native"/> + <property name="libname32" value="liblwjgl.so"/> + <property name="libname64" value="liblwjgl64.so"/> + <property name="libs32" value="-L/home/spasi/lwjgl/libs/linux -lEGL -L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> + <property name="libs64" value="-L${lib_folder}/x64 -lEGL -L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> + <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> + + <target name="clean"> + <delete> + <fileset dir="x32"/> + <fileset dir="x64"/> + <fileset dir="." includes="*.o"/> + <fileset dir="." includes="*.so"/> + </delete> + </target> + + <target name="compile"> + <exec executable="uname" outputproperty="hwplatform"> + <arg value="-m"/> + </exec> + <cond... [truncated message content] |