diff --git a/platform_build/build-definitions.xml b/platform_build/build-definitions.xml index c59336f8..3a604972 100644 --- a/platform_build/build-definitions.xml +++ b/platform_build/build-definitions.xml @@ -38,7 +38,6 @@ - diff --git a/src/java/org/lwjgl/opengl/ContextType.java b/src/java/org/lwjgl/opengl/ContextType.java deleted file mode 100644 index d719fec9..00000000 --- a/src/java/org/lwjgl/opengl/ContextType.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2002-2011 LWJGL Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.opengl; - -/** - * This enum can be used in the default Display.create method to specify - * the context type that will be created. - * - * @author Spasi - */ -public enum ContextType { - - GL, - GLES, - -} \ No newline at end of file diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java index ca39a554..791fb209 100644 --- a/src/java/org/lwjgl/opengl/Display.java +++ b/src/java/org/lwjgl/opengl/Display.java @@ -749,32 +749,6 @@ public final class Display { }); } - /** - * Create the Display with the specified context type. If isFullscreen() is true or if windowed - * context are not supported on the platform, the display mode will be switched to the mode returned by - * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context - * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be - * created with the given parameters, a LWJGLException will be thrown. - *

- *

The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. - * - * @param type the context type to create - * - * @throws LWJGLException - */ - public static void create(ContextType type) throws LWJGLException { - synchronized ( GlobalLock.lock ) { - switch ( type ) { - case GL: - create(new PixelFormat()); - break; - case GLES: - create(new org.lwjgl.opengles.PixelFormat()); - break; - } - } - } - /** * Create the OpenGL context. If isFullscreen() is true or if windowed * context are not supported on the platform, the display mode will be switched to the mode returned by @@ -787,7 +761,7 @@ public final class Display { * @throws LWJGLException */ public static void create() throws LWJGLException { - create(ContextType.GL); + create(new PixelFormat()); } /** @@ -805,7 +779,7 @@ public final class Display { */ public static void create(PixelFormat pixel_format) throws LWJGLException { synchronized ( GlobalLock.lock ) { - create(pixel_format, null, null); + create(pixel_format, null, (ContextAttribs)null); } } @@ -825,7 +799,7 @@ public final class Display { */ public static void create(PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException { synchronized ( GlobalLock.lock ) { - create(pixel_format, shared_drawable, null); + create(pixel_format, shared_drawable, (ContextAttribs)null); } } @@ -930,19 +904,19 @@ public final class Display { *

*

The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * - * @param pixel_format Describes the minimum specifications the context must fulfill. + * @param pixel_format Describes the minimum specifications the context must fulfill. Must be an instance of org.lwjgl.opengles.PixelFormat. * * @throws LWJGLException */ - public static void create(org.lwjgl.opengles.PixelFormat pixel_format) throws LWJGLException { + public static void create(PixelFormatLWJGL pixel_format) throws LWJGLException { synchronized ( GlobalLock.lock ) { create(pixel_format, null, null); } } /** - * Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed + * Create the OpenGL ES context with the given minimum parameters. If isFullscreen() is true or if windowed * context are not supported on the platform, the display mode will be switched to the mode returned by * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be @@ -950,19 +924,19 @@ public final class Display { *

*

The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * - * @param pixel_format Describes the minimum specifications the context must fulfill. + * @param pixel_format Describes the minimum specifications the context must fulfill. Must be an instance of org.lwjgl.opengles.PixelFormat. * @param shared_drawable The Drawable to share context with. (optional, may be null) * * @throws LWJGLException */ - public static void create(org.lwjgl.opengles.PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException { + public static void create(PixelFormatLWJGL pixel_format, Drawable shared_drawable) throws LWJGLException { synchronized ( GlobalLock.lock ) { create(pixel_format, shared_drawable, null); } } /** - * Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed + * Create the OpenGL ES context with the given minimum parameters. If isFullscreen() is true or if windowed * context are not supported on the platform, the display mode will be switched to the mode returned by * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be @@ -970,12 +944,12 @@ public final class Display { *

*

The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * - * @param pixel_format Describes the minimum specifications the context must fulfill. + * @param pixel_format Describes the minimum specifications the context must fulfill. Must be an instance of org.lwjgl.opengles.PixelFormat. * @param attribs The ContextAttribs to use when creating the context. (optional, may be null) * * @throws LWJGLException */ - public static void create(org.lwjgl.opengles.PixelFormat pixel_format, org.lwjgl.opengles.ContextAttribs attribs) throws LWJGLException { + public static void create(PixelFormatLWJGL pixel_format, org.lwjgl.opengles.ContextAttribs attribs) throws LWJGLException { synchronized ( GlobalLock.lock ) { create(pixel_format, null, attribs); } @@ -990,13 +964,13 @@ public final class Display { *

*

The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * - * @param pixel_format Describes the minimum specifications the context must fulfill. + * @param pixel_format Describes the minimum specifications the context must fulfill. Must be an instance of org.lwjgl.opengles.PixelFormat. * @param shared_drawable The Drawable to share context with. (optional, may be null) * @param attribs The ContextAttribs to use when creating the context. (optional, may be null) * * @throws LWJGLException */ - public static void create(org.lwjgl.opengles.PixelFormat pixel_format, Drawable shared_drawable, org.lwjgl.opengles.ContextAttribs attribs) throws LWJGLException { + public static void create(PixelFormatLWJGL pixel_format, Drawable shared_drawable, org.lwjgl.opengles.ContextAttribs attribs) throws LWJGLException { synchronized ( GlobalLock.lock ) { if ( isCreated() ) throw new IllegalStateException("Only one LWJGL context may be instantiated at any one time.");