From 8fe46e02236ce4b813a8dcf8ab8aa93707c65747 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Tue, 30 Mar 2004 17:13:35 +0000 Subject: [PATCH] Restored hierarchies and completed EXT_pixel_buffer_object --- src/java/org/lwjgl/opengl/ARBFragmentProgram.java | 2 +- src/java/org/lwjgl/opengl/ARBProgram.java | 2 +- .../org/lwjgl/opengl/ARBVertexBufferObject.java | 2 +- src/java/org/lwjgl/opengl/ARBVertexProgram.java | 2 +- .../org/lwjgl/opengl/EXTPixelBufferObject.java | 15 +++++++++++++-- src/java/org/lwjgl/opengl/NVFragmentProgram.java | 2 +- src/java/org/lwjgl/opengl/NVProgram.java | 2 +- src/java/org/lwjgl/opengl/NVVertexProgram.java | 2 +- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java index 5899157e..43874e11 100644 --- a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java @@ -32,7 +32,7 @@ package org.lwjgl.opengl; -public final class ARBFragmentProgram { +public final class ARBFragmentProgram extends ARBProgram { /* * Accepted by the parameter of Disable, Enable, and IsEnabled, by the diff --git a/src/java/org/lwjgl/opengl/ARBProgram.java b/src/java/org/lwjgl/opengl/ARBProgram.java index c63fc775..27f37339 100644 --- a/src/java/org/lwjgl/opengl/ARBProgram.java +++ b/src/java/org/lwjgl/opengl/ARBProgram.java @@ -45,7 +45,7 @@ import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -public final class ARBProgram { +public class ARBProgram { /* * Accepted by the parameter of ProgramStringARB: diff --git a/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java b/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java index 6d6d5ef5..8a6ed678 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java +++ b/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java @@ -41,7 +41,7 @@ package org.lwjgl.opengl; -public final class ARBVertexBufferObject { +public final class ARBVertexBufferObject extends ARBProgram { /* * Accepted by the parameters of BindBufferARB, BufferDataARB, diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/java/org/lwjgl/opengl/ARBVertexProgram.java index 1974231f..638005df 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexProgram.java +++ b/src/java/org/lwjgl/opengl/ARBVertexProgram.java @@ -44,7 +44,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -public final class ARBVertexProgram { +public final class ARBVertexProgram extends ARBProgram { /* * Accepted by the parameter of Disable, Enable, and IsEnabled, by the diff --git a/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java b/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java index 31e4d948..8b372a86 100644 --- a/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java +++ b/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java @@ -37,10 +37,21 @@ */ package org.lwjgl.opengl; -public final class EXTPixelBufferObject { +public final class EXTPixelBufferObject extends ARBProgram { + /* + * Accepted by the parameters of BindBuffer, BufferData, + * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, + * GetBufferParameteriv, and GetBufferPointerv: + */ public static final int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB; - public static final int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC; + /* + * Accepted by the parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ + public static final int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; + public static final int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; + } \ No newline at end of file diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/java/org/lwjgl/opengl/NVFragmentProgram.java index 82e45058..15304d25 100644 --- a/src/java/org/lwjgl/opengl/NVFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/NVFragmentProgram.java @@ -42,7 +42,7 @@ package org.lwjgl.opengl; import java.nio.ByteBuffer; import java.nio.FloatBuffer; -public final class NVFragmentProgram { +public final class NVFragmentProgram extends NVProgram { /* Accepted by the parameter of Disable, Enable, and IsEnabled, by the diff --git a/src/java/org/lwjgl/opengl/NVProgram.java b/src/java/org/lwjgl/opengl/NVProgram.java index 31aad3c6..6070a217 100644 --- a/src/java/org/lwjgl/opengl/NVProgram.java +++ b/src/java/org/lwjgl/opengl/NVProgram.java @@ -43,7 +43,7 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.IntBuffer; -public final class NVProgram { +public class NVProgram { /* Accepted by the parameter of GetProgramivNV: diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/java/org/lwjgl/opengl/NVVertexProgram.java index f1472c7a..414b7c0a 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram.java @@ -46,7 +46,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -public final class NVVertexProgram { +public final class NVVertexProgram extends NVProgram { /* Accepted by the parameter of Disable, Enable, and IsEnabled,