Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3534] branches/opengles/LWJGL
|
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/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: branches/opengles/LWJGL/platform_build/build-generator.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/build-generator.xml 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/platform_build/build-generator.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -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: branches/opengles/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/linux_ant/build.xml 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/platform_build/linux_ant/build.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -73,12 +73,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_flags32}"/>
@@ -99,12 +103,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}"/>
Added: branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml (rev 0)
+++ branches/opengles/LWJGL/platform_build/linux_ant/build_es.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -0,0 +1,125 @@
+<?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>
+ <condition property="xf86vm_lib" value="-lXxf86vm" else="-Wl,-static,-lXxf86vm,-call_shared">
+ <os name="SunOS" />
+ </condition>
+ <condition property="cflags_pthread" value="-pthreads" else="-pthread">
+ <os name="SunOS" />
+ </condition>
+ <condition property="version_script_flags32" value="" else="-Wl,--version-script='${native}/linux/lwjgl.map'">
+ <os name="SunOS" />
+ </condition>
+ <condition property="version_script_flags64" value="-m64" else="-Wl,--version-script='${native}/linux/lwjgl.map'">
+ <and>
+ <os name="SunOS" />
+ </and>
+ </condition>
+ <condition property="cflags64" value="-O2 -m64 -Wall -c -fPIC -std=c99 -Wunused" else="-O2 -Wall -c -fPIC -std=c99 -Wunused">
+ <os name="SunOS" />
+ </condition>
+
+ <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
+ <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
+
+ <condition property="build.32bit.only">
+ <not>
+ <or>
+ <equals arg1="${hwplatform}" arg2="x86_64"/>
+ <equals arg1="${hwplatform}" arg2="i86pc"/>
+ </or>
+ </not>
+ </condition>
+
+ <!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
+ <condition property="build.64bit.only">
+ <and>
+ <os name="Linux"/>
+ <equals arg1="${hwplatform}" arg2="x86_64"/>
+ </and>
+ </condition>
+
+ <antcall target="compile32"/>
+ <antcall target="compile64"/>
+ </target>
+
+ <target name="compile32" unless="build.64bit.only">
+ <mkdir dir="x32"/>
+ <apply dir="x32" executable="gcc" skipemptyfilesets="true" failonerror="true">
+ <arg line="${cflags32} ${cflags_pthread}"/>
+ <arg value="-I${java.home}/include"/>
+ <arg value="-I${java.home}/include/linux"/>
+ <arg value="-I${java.home}/../include"/>
+ <arg value="-I${java.home}/../include/linux"/>
+ <arg value="-I${java.home}/../include/solaris"/>
+ <arg value="-I${native}/common"/>
+ <arg value="-I${native}/common/opengles"/>
+ <arg value="-I${native}/linux"/>
+ <arg value="-I${native}/linux/opengles"/>
+ <mapper type="glob" from="*.c" to="*.o"/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengles" includes="*.c"/>
+ <fileset dir="${native}/generated/opengles" includes="*.c"/>
+ <fileset dir="${native}/linux" includes="*.c"/>
+ <fileset dir="${native}/linux/opengles" includes="*.c"/>
+ </apply>
+ <apply dir="." parallel="true" executable="gcc" failonerror="true">
+ <srcfile/>
+ <arg line="${linker_flags32}"/>
+ <fileset dir="x32" includes="*.o"/>
+ </apply>
+ <apply dir="." parallel="true" executable="strip" failonerror="true">
+ <fileset file="${libname32}"/>
+ </apply>
+ </target>
+
+ <target name="compile64" unless="build.32bit.only">
+ <mkdir dir="x64"/>
+ <apply dir="x64" executable="gcc" skipemptyfilesets="true" failonerror="true">
+ <arg line="${cflags64} ${cflags_pthread}"/>
+ <arg value="-I${java.home}/include"/>
+ <arg value="-I${java.home}/include/linux"/>
+ <arg value="-I${java.home}/../include"/>
+ <arg value="-I${java.home}/../include/linux"/>
+ <arg value="-I${java.home}/../include/solaris"/>
+ <arg value="-I${native}/common"/>
+ <arg value="-I${native}/common/opengles"/>
+ <arg value="-I${native}/linux"/>
+ <arg value="-I${native}/linux/opengles"/>
+ <mapper type="glob" from="*.c" to="*.o"/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengles" includes="*.c"/>
+ <fileset dir="${native}/generated/opengles" includes="*.c"/>
+ <fileset dir="${native}/linux" includes="*.c"/>
+ <fileset dir="${native}/linux/opengles" includes="*.c"/>
+ </apply>
+ <apply dir="." parallel="true" executable="gcc" failonerror="true">
+ <srcfile/>
+ <arg line="${linker_flags64}"/>
+ <fileset dir="x64" includes="*.o"/>
+ </apply>
+ <apply dir="." parallel="true" executable="strip" failonerror="true">
+ <fileset file="${libname64}"/>
+ </apply>
+ </target>
+</project>
Modified: branches/opengles/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/windows_ant/build.xml 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/platform_build/windows_ant/build.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -12,11 +12,15 @@
<arg value="/I${java.home}\..\include"/>
<arg value="/I${java.home}\..\include\win32"/>
<arg value="/I${native}\common"/>
+ <arg value="/I${native}\common\opengl"/>
<arg value="/I${native}\windows"/>
+ <arg value="/I${native}\windows\opengl"/>
<srcfile/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
<fileset dir="${native}/windows" includes="*.c"/>
- <fileset dir="${native}/common" includes="*.c"/>
- <fileset dir="${native}/generated" includes="*.c"/>
+ <fileset dir="${native}/windows/opengl" includes="*.c"/>
<mapper type="glob" from="*.c" to="*.obj"/>
</apply>
</target>
@@ -43,7 +47,7 @@
<fileset dir="." includes="*.lib"/>
</delete>
</target>
-
+
<target name="compile">
<condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
<equals arg1="${os.arch}" arg2="x86"/>
Added: branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml
===================================================================
--- branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml (rev 0)
+++ branches/opengles/LWJGL/platform_build/windows_ant/build_es.xml 2011-05-17 16:53:57 UTC (rev 3534)
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="lwjgl native code, native code" basedir="../../bin/lwjgles" default="compile">
+ <property name="native" location="../../src/native"/>
+ <property environment="env"/>
+ <property name="sdkhome" location="${env.MSSDK}"/>
+
+ <target name="compile_dir">
+ <apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+ <arg line="/Ox /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
+ <arg value="/I${sdkhome}\include"/>
+ <arg value="/I${java.home}\..\include"/>
+ <arg value="/I${java.home}\..\include\win32"/>
+ <arg value="/I${native}\common"/>
+ <arg value="/I${native}\common\opengles"/>
+ <arg value="/I${native}\windows"/>
+ <arg value="/I${native}\windows\opengles"/>
+ <srcfile/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengles" includes="*.c"/>
+ <fileset dir="${native}/generated/opengles" includes="*.c"/>
+ <fileset dir="${native}/windows" includes="*.c"/>
+ <fileset dir="${native}/windows/opengles" includes="*.c"/>
+ <mapper type="glob" from="*.c" to="*.obj"/>
+ </apply>
+ </target>
+
+ <target name="link">
+ <apply dir="." parallel="true" executable="cl" failonerror="true">
+ <arg line="/LD /nologo"/>
+ <srcfile/>
+ <arg line="/Fe${dllname} /link"/>
+ <arg value="/LIBPATH:${java.home}\..\lib"/>
+ <arg value="/LIBPATH:${sdkhomelib}"/>
+ <arg value="/LIBPATH:..\..\libs\windows"/>
+ <arg value="/OPT:REF"/>
+ <arg value="/OPT:ICF"/>
+ <arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
+ <fileset dir="." includes="*.obj"/>
+ </apply>
+ </target>
+
+ <target name="clean">
+ <delete>
+ <fileset dir="." includes="*.obj"/>
+ <fileset dir="." includes="*.dll"/>
+ <fileset dir="." includes="*.exp"/>
+ <fileset dir="." includes="*.lib"/>
+ </delete>
+ </target>
+
+ <target name="compile">
+ <condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
+ <equals arg1="${os.arch}" arg2="x86"/>
+ </condition>
+ <condition property="dllname" value="lwjgl.dll" else="lwjgl64.dll">
+ <equals arg1="${os.arch}" arg2="x86"/>
+ </condition>
+ <echo message="${sdkhomelib}"/>
+ <property name="libs" value="Kernel32.lib ole32.lib libEGL.lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib Comctl32.lib"/>
+ <antcall target="compile_dir"/>
+ <antcall target="link"/>
+ </target>
+</project>
+
Modified: branches/opengles/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- branches/opengles/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2011-05-14 15:14:23 UTC (rev 3533)
+++ branches/opengles/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2011-05-17 16:53:57 UTC (rev 3534)
@@ -42,6 +42,8 @@
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
+import static org.lwjgl.opengl.GL11.*;
+
/**
* <p/>
* An AWT rendering context.
@@ -56,7 +58,7 @@
private static final long serialVersionUID = 1L;
private static final AWTCanvasImplementation implementation;
- private boolean update_context;
+ private boolean update_context;
private Object SYNC_LOCK = new Object();
/** The requested pixel format */
@@ -69,8 +71,8 @@
private final ContextAttribs attribs;
/** Context handle */
- private PeerInfo peer_info;
- private Context context;
+ private PeerInfo peer_info;
+ private ContextGL context;
/**
* re-entry counter for support for re-entrant
@@ -105,20 +107,39 @@
}
}
+ public void setPixelFormat(final PixelFormatLWJGL pf) throws LWJGLException {
+ throw new UnsupportedOperationException();
+ }
+
+ public PixelFormatLWJGL getPixelFormat() {
+ return pixel_format;
+ }
+
/** This method should only be called internally. */
- public Context getContext() {
+ public ContextGL getContext() {
return context;
}
/** This method should only be called internally. */
- public Context createSharedContext() throws LWJGLException {
+ public ContextGL createSharedContext() throws LWJGLException {
synchronized ( SYNC_LOCK ) {
if ( context == null ) throw new IllegalStateException("Canvas not yet displayable");
- return new Context(peer_info, context.getContextAttribs(), context);
+ return new ContextGL(peer_info, context.getContextAttribs(), context);
}
}
+ public void checkGLError() {
+ Util.checkGLError();
+ }
+
+ public void initContext(final float r, final float g, final float b) {
+ // set background clear color
+ glClearColor(r, g, b, 0.0f);
+ // Clear window to avoid the desktop "showing through"
+ glClear(GL_COLOR_BUFFER_BIT);
+ }
+
/** Constructor using the default PixelFormat. */
public AWTGLCanvas() throws LWJGLException {
this(new PixelFormat());
@@ -195,7 +216,7 @@
synchronized ( SYNC_LOCK ) {
if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
- Context.setSwapInterval(swap_interval);
+ ContextGL.setSwapInterval(swap_interval);
}
}
@@ -209,7 +230,7 @@
synchronized ( SYNC_LOCK ) {
if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
- Context.swapBuffers();
+ ContextGL.swapBuffers();
}
}
@@ -238,7 +259,7 @@
if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
if ( context.isCurrent() )
- Context.releaseCurrentContext();
+ context.releaseCurrent();
}
}
@@ -295,7 +316,7 @@
peer_info.lockAndGetHandle();
try {
if ( context == null ) {
- this.context = new Context(peer_info, attribs, drawable != null ? ((DrawableLWJGL)drawable).getContext() : null);
+ this.context = new ContextGL(peer_info, attribs, drawable != null ? (ContextGL)((DrawableLWJGL)drawable).getContext() : null);
first_run = true;
}
@@ -315,7 +336,7 @@
} finally {
reentry_count--;
if ( reentry_count == 0 )
- Context.releaseCurrentContext();
+ context.releaseCurrent();
}
...
[truncated message content] |
