diff options
author | Kenneth Russel <[email protected]> | 2005-09-03 22:02:17 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2005-09-03 22:02:17 +0000 |
commit | 9e0f6e9e2dd2c7822032b52a4326b308d67b65e7 (patch) | |
tree | 989addaa42622d57500a63c38d8f5bc18948d583 /src/demos/util/TGAImage.java | |
parent | 434fb13fc6570086f095646f6ea5739d9c362d7c (diff) |
Added Vertex Buffer Object and Pixel Buffer Object variants of
routines affected by these extensions. New variants take long as
argument instead of Buffer for void*. For these routines as well as
the original versions, must check whether VBO/PBO is active or
inactive. Added check to affected methods to guarantee they are not
called within glBegin/glEnd pairs (which in most, if not all, cases is
already a requirement) to avoid tracking OpenGL state manually. Added
new JavaPrologue and JavaEpilogue commands to JavaConfiguration with
optional signatures to differentiate overloaded methods. Added
BufferObjectKind command to GLConfiguration which builds on
JavaPrologue support. Deleted BufferUtils.bufferOffset() and
associated native code.
In order to reduce the number of extension routines, added
IgnoreExtension directives for all extensions folded into OpenGL 1.1,
1.2 and 1.3 specifications; this means that if the core OpenGL version
is less than 1.3 then these extensions are effectively unavailable.
Updated demos for both new VBO/PBO API variants as well as extensions
folded into core.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@120 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/util/TGAImage.java')
-rw-r--r-- | src/demos/util/TGAImage.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demos/util/TGAImage.java b/src/demos/util/TGAImage.java index c999c99..a99f4f3 100644 --- a/src/demos/util/TGAImage.java +++ b/src/demos/util/TGAImage.java @@ -272,10 +272,10 @@ public class TGAImage { data = new byte[rawWidth * header.height()]; if (header.pixelDepth() == 24) { - format = GL.GL_BGR_EXT; + format = GL.GL_BGR; } else { assert header.pixelDepth() == 32; - format = GL.GL_BGRA_EXT; + format = GL.GL_BGRA; } for (i = 0; i < header.height(); ++i) { @@ -296,7 +296,7 @@ public class TGAImage { /** Returns the height of the image. */ public int getHeight() { return header.height(); } - /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR_EXT or GL.GL_BGRA_EXT. */ + /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */ public int getGLFormat() { return format; } /** Returns the raw data for this texture in the correct |