From 27633adfcb036a2070d0898dec866e058fe89425 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 29 Mar 2004 07:53:36 +0000 Subject: [PATCH] Fixed newlines --- .../org/lwjgl/opengl/ARBFragmentProgram.java | 78 +++---- .../org/lwjgl/opengl/NVFragmentProgram.java | 127 ++++++------ src/java/org/lwjgl/opengl/NVProgram.java | 193 ++++++++---------- 3 files changed, 168 insertions(+), 230 deletions(-) diff --git a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java index 4b607de4..c9ae7c68 100644 --- a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java @@ -34,53 +34,37 @@ package org.lwjgl.opengl; public final class ARBFragmentProgram extends ARBProgram { - /* - * Accepted by the parameter of Disable, Enable, and IsEnabled, by the - * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, - * and by the parameter of ProgramStringARB, BindProgramARB, - * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB, - * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, - * GetProgramivARB and GetProgramStringARB. - */ - - public static final int GL_FRAGMENT_PROGRAM_ARB = 0x8804; - - /* - * Accepted by the parameter of GetProgramivARB: - */ - - public static final int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805; - - public static final int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806; - - public static final int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807; - - public static final int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808; - - public static final int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809; - - public static final int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A; - - public static final int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B; - - public static final int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C; - - public static final int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D; - - public static final int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E; - - public static final int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F; - - public static final int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810; - - /* - * Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, - * and GetDoublev: - */ - - public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; - - public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; + /* + * Accepted by the parameter of Disable, Enable, and IsEnabled, by the + * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + * and by the parameter of ProgramStringARB, BindProgramARB, + * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB, + * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, + * GetProgramivARB and GetProgramStringARB. + */ + public static final int GL_FRAGMENT_PROGRAM_ARB = 0x8804; + /* + * Accepted by the parameter of GetProgramivARB: + */ + public static final int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805; + public static final int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806; + public static final int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807; + public static final int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808; + public static final int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809; + public static final int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A; + public static final int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B; + public static final int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C; + public static final int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D; + public static final int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E; + public static final int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F; + public static final int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810; + /* + * Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, + * and GetDoublev: + */ + public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; + public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; } + diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/java/org/lwjgl/opengl/NVFragmentProgram.java index 2993a63d..c4219b4e 100644 --- a/src/java/org/lwjgl/opengl/NVFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/NVFragmentProgram.java @@ -44,87 +44,74 @@ import java.nio.FloatBuffer; public final class NVFragmentProgram extends NVProgram { - /* - Accepted by the parameter of Disable, Enable, and IsEnabled, by the - parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, - and by the parameter of BindProgramNV, LoadProgramNV, - ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB, - ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, - GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: - */ + /* + Accepted by the parameter of Disable, Enable, and IsEnabled, by the + parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + and by the parameter of BindProgramNV, LoadProgramNV, + ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB, + ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, + GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: + */ + public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870; - public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870; + /* + Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, + and GetDoublev: + */ + public static final int GL_MAX_TEXTURE_COORDS_NV = 0x8871; + public static final int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872; + public static final int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873; + public static final int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868; - /* - Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, - and GetDoublev: - */ + // --------------------------- - public static final int GL_MAX_TEXTURE_COORDS_NV = 0x8871; + public static void glProgramNamedParameter4fNV(int id, ByteBuffer name, float x, float y, float z, float w) { + nglProgramNamedParameter4fNV(id, name.remaining(), name, name.position(), x, y, z, w); + } - public static final int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872; + private static native void nglProgramNamedParameter4fNV( + int id, + int length, + ByteBuffer name, + int nameOffset, + float x, + float y, + float z, + float w); - public static final int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873; + // --------------------------- - public static final int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868; + // --------------------------- - // --------------------------- + public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, FloatBuffer params) { + BufferChecks.checkBuffer(params); + nglGetProgramNamedParameterfvNV(id, name.remaining(), name, name.position(), params, params.position()); + } - public static void glProgramNamedParameter4fNV(int id, ByteBuffer name, float x, float y, float z, float w) { + private static native void nglGetProgramNamedParameterfvNV( + int id, + int length, + ByteBuffer name, + int nameOffset, + FloatBuffer params, + int paramsOffset); - nglProgramNamedParameter4fNV(id, name.remaining(), name, name.position(), x, y, z, w); + // --------------------------- - } + public static native void glProgramLocalParameter4fARB(int target, int index, float x, float y, float z, float w); - private static native void nglProgramNamedParameter4fNV( - int id, - int length, - ByteBuffer name, - int nameOffset, - float x, - float y, - float z, - float w); + // --------------------------- - // --------------------------- - - // --------------------------- - - public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, FloatBuffer params) { - - BufferChecks.checkBuffer(params); - nglGetProgramNamedParameterfvNV(id, name.remaining(), name, name.position(), params, params.position()); - - } - - private static native void nglGetProgramNamedParameterfvNV( - int id, - int length, - ByteBuffer name, - int nameOffset, - FloatBuffer params, - int paramsOffset); - - // --------------------------- - - public static native void glProgramLocalParameter4fARB(int target, int index, float x, float y, float z, float w); - - // --------------------------- - - public static void glGetProgramLocalParameterARB(int target, int index, FloatBuffer params) { - - BufferChecks.checkBuffer(params); - - nglGetProgramLocalParameterfvARB(target, index, params, params.position()); - - } - - private static native void nglGetProgramLocalParameterfvARB( - int target, - int index, - FloatBuffer params, - int params_offset); - - // --------------------------- + public static void glGetProgramLocalParameterARB(int target, int index, FloatBuffer params) { + BufferChecks.checkBuffer(params); + nglGetProgramLocalParameterfvARB(target, index, params, params.position()); + } + private static native void nglGetProgramLocalParameterfvARB( + int target, + int index, + FloatBuffer params, + int params_offset); + // --------------------------- } + diff --git a/src/java/org/lwjgl/opengl/NVProgram.java b/src/java/org/lwjgl/opengl/NVProgram.java index 7d2c6dce..d68dc74d 100644 --- a/src/java/org/lwjgl/opengl/NVProgram.java +++ b/src/java/org/lwjgl/opengl/NVProgram.java @@ -45,138 +45,105 @@ import java.nio.IntBuffer; class NVProgram { - /* - Accepted by the parameter of GetProgramivNV: - */ + /* + Accepted by the parameter of GetProgramivNV: + */ + public static final int GL_PROGRAM_TARGET_NV = 0x8646; + public static final int GL_PROGRAM_LENGTH_NV = 0x8627; + public static final int GL_PROGRAM_RESIDENT_NV = 0x8647; - public static final int GL_PROGRAM_TARGET_NV = 0x8646; + /* + Accepted by the parameter of GetProgramStringNV: + */ + public static final int GL_PROGRAM_STRING_NV = 0x8628; - public static final int GL_PROGRAM_LENGTH_NV = 0x8627; + /* + Accepted by the parameter of GetBooleanv, GetIntegerv, + GetFloatv, and GetDoublev: + */ + public static final int GL_PROGRAM_ERROR_POSITION_NV = 0x864B; - public static final int GL_PROGRAM_RESIDENT_NV = 0x8647; + /* + Accepted by the parameter of GetString: + */ + public static final int GL_PROGRAM_ERROR_STRING_NV = 0x8874; - /* - Accepted by the parameter of GetProgramStringNV: - */ + // --------------------------- + public static void glLoadProgramNV(int target, int programID, ByteBuffer string) { + nglLoadProgramNV(target, programID, string.remaining(), string, string.position()); + } - public static final int GL_PROGRAM_STRING_NV = 0x8628; + private static native void nglLoadProgramNV(int target, int programID, int length, Buffer string, int stringOffset); - /* - Accepted by the parameter of GetBooleanv, GetIntegerv, - GetFloatv, and GetDoublev: - */ + // --------------------------- + public static native void glBindProgramNV(int target, int programID); + // --------------------------- - public static final int GL_PROGRAM_ERROR_POSITION_NV = 0x864B; + public static void glDeleteProgramsNV(IntBuffer programs) { + nglDeleteProgramsNV(programs.remaining(), programs, programs.position()); + } - /* - Accepted by the parameter of GetString: - */ + private static native void nglDeleteProgramsNV(int n, IntBuffer programs, int programsOffset); - public static final int GL_PROGRAM_ERROR_STRING_NV = 0x8874; + // --------------------------- - // --------------------------- + // --------------------------- + public static void glGenProgramsNV(IntBuffer programs) { + nglGenProgramsNV(programs.remaining(), programs, programs.position()); + } - public static void glLoadProgramNV(int target, int programID, ByteBuffer string) { + private static native void nglGenProgramsNV(int n, IntBuffer programs, int programsOffset); - nglLoadProgramNV(target, programID, string.remaining(), string, string.position()); + // --------------------------- - } + // --------------------------- + public static void glGetProgramNV(int programID, int parameterName, IntBuffer params) { + nglGetProgramivNV(programID, parameterName, params, params.position()); + } - private static native void nglLoadProgramNV(int target, int programID, int length, Buffer string, int stringOffset); + private static native void nglGetProgramivNV(int programID, int parameterName, IntBuffer params, int paramsOffset); + // --------------------------- - // --------------------------- + // --------------------------- + public static void glGetProgramStringNV(int programID, int parameterName, ByteBuffer paramString) { + nglGetProgramStringNV(programID, parameterName, paramString, paramString.position()); + } - public static native void glBindProgramNV(int target, int programID); + private static native void nglGetProgramStringNV( + int programID, + int parameterName, + Buffer paramString, + int paramStringOffset); + // --------------------------- - // --------------------------- + public static native boolean glIsProgramNV(int programID); - public static void glDeleteProgramsNV(IntBuffer programs) { + // --------------------------- + public static boolean glAreProgramsResidentNV(IntBuffer programIDs, ByteBuffer programResidences) { + if (programIDs.remaining() != programResidences.remaining()) + throw new IllegalArgumentException("programIDs.remaining() != programResidences.remaining()"); + return nglAreProgramsResidentNV( + programIDs.remaining(), + programIDs, + programIDs.position(), + programResidences, + programResidences.position()); + } - nglDeleteProgramsNV(programs.remaining(), programs, programs.position()); + private static native boolean nglAreProgramsResidentNV( + int n, + IntBuffer programIDs, + int programIDsOffset, + ByteBuffer programResidences, + int programResidencesOffset); + // --------------------------- - } - - private static native void nglDeleteProgramsNV(int n, IntBuffer programs, int programsOffset); - - // --------------------------- - - // --------------------------- - - public static void glGenProgramsNV(IntBuffer programs) { - - nglGenProgramsNV(programs.remaining(), programs, programs.position()); - - } - - private static native void nglGenProgramsNV(int n, IntBuffer programs, int programsOffset); - - // --------------------------- - - // --------------------------- - - public static void glGetProgramNV(int programID, int parameterName, IntBuffer params) { - - nglGetProgramivNV(programID, parameterName, params, params.position()); - - } - - private static native void nglGetProgramivNV(int programID, int parameterName, IntBuffer params, int paramsOffset); - - // --------------------------- - - // --------------------------- - - public static void glGetProgramStringNV(int programID, int parameterName, ByteBuffer paramString) { - - nglGetProgramStringNV(programID, parameterName, paramString, paramString.position()); - - } - - private static native void nglGetProgramStringNV( - int programID, - int parameterName, - Buffer paramString, - int paramStringOffset); - - // --------------------------- - - public static native boolean glIsProgramNV(int programID); - - // --------------------------- - - public static boolean glAreProgramsResidentNV(IntBuffer programIDs, ByteBuffer programResidences) { - - assert programIDs.remaining() - == programResidences.remaining() : "programIDs.remaining() != programResidences.remaining()"; - - return nglAreProgramsResidentNV( - programIDs.remaining(), - programIDs, - programIDs.position(), - programResidences, - programResidences.position()); - - } - - private static native boolean nglAreProgramsResidentNV( - int n, - IntBuffer programIDs, - int programIDsOffset, - ByteBuffer programResidences, - int programResidencesOffset); - - // --------------------------- - - // --------------------------- - - public static void glRequestResidentProgramsNV(IntBuffer programIDs) { - - nglRequestResidentProgramsNV(programIDs.remaining(), programIDs, programIDs.position()); - - } - - private static native void nglRequestResidentProgramsNV(int n, IntBuffer programIDs, int programIDsOffset); - - // --------------------------- + // --------------------------- + public static void glRequestResidentProgramsNV(IntBuffer programIDs) { + nglRequestResidentProgramsNV(programIDs.remaining(), programIDs, programIDs.position()); + } + private static native void nglRequestResidentProgramsNV(int n, IntBuffer programIDs, int programIDsOffset); + // --------------------------- } +