diff options
Diffstat (limited to 'src/jogl/classes/jogamp/opengl')
7 files changed, 19 insertions, 20 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java index 6e2b7b744..d7958c7f1 100644 --- a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java +++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java @@ -40,9 +40,9 @@ public class GLGraphicsConfigurationUtil { public static final int PBUFFER_BIT = 1 << 2; public static final int ALL_BITS = WINDOW_BIT | BITMAP_BIT | PBUFFER_BIT ; - public static final StringBuffer winAttributeBits2String(StringBuffer sb, int winattrbits) { + public static final StringBuilder winAttributeBits2String(StringBuilder sb, int winattrbits) { if(null==sb) { - sb = new StringBuffer(); + sb = new StringBuilder(); } boolean seperator = false; if( 0 != ( WINDOW_BIT & winattrbits ) ) { diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java index 0ae597938..f813edf86 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java @@ -122,9 +122,9 @@ public class EGLGLCapabilities extends GLCapabilities { return null; } - public static StringBuffer renderableTypeToString(StringBuffer sink, int renderableType) { + public static StringBuilder renderableTypeToString(StringBuilder sink, int renderableType) { if(null == sink) { - sink = new StringBuffer(); + sink = new StringBuilder(); } boolean first=true; if(0 != (renderableType & EGL.EGL_OPENGL_BIT)) { @@ -142,9 +142,9 @@ public class EGLGLCapabilities extends GLCapabilities { return sink; } - public StringBuffer toString(StringBuffer sink) { + public StringBuilder toString(StringBuilder sink) { if(null == sink) { - sink = new StringBuffer(); + sink = new StringBuilder(); } sink.append("egl cfg 0x").append(Integer.toHexString(eglcfgid)); sink.append(", vid 0x").append(Integer.toHexString(nativeVisualID)).append(": "); diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 63d58f447..19a1469cb 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -382,7 +382,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getClass().getSimpleName()); sb.append(" ["); super.append(sb); diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java index fe4db892f..897967f8b 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java @@ -31,10 +31,9 @@ package jogamp.opengl.util.glsl.fixedfunc; import javax.media.opengl.*; import javax.media.opengl.fixedfunc.*; -import javax.media.opengl.glu.*; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.*; -import com.jogamp.opengl.util.glsl.*; + import java.nio.*; public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFunc { @@ -56,7 +55,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun } public FixedFuncHook(GL2ES2 gl, PMVMatrix matrix, - Class shaderRootClass, String shaderSrcRoot, String shaderBinRoot, + Class<?> shaderRootClass, String shaderSrcRoot, String shaderBinRoot, String vertexColorFile, String vertexColorLightFile, String fragmentColorFile, @@ -112,28 +111,28 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun } public void glGetFloatv(int pname, java.nio.FloatBuffer params) { - if(pmvMatrix.isMatrixGetName(pname)) { + if(PMVMatrix.isMatrixGetName(pname)) { pmvMatrix.glGetFloatv(pname, params); return; } gl.glGetFloatv(pname, params); } public void glGetFloatv(int pname, float[] params, int params_offset) { - if(pmvMatrix.isMatrixGetName(pname)) { + if(PMVMatrix.isMatrixGetName(pname)) { pmvMatrix.glGetFloatv(pname, params, params_offset); return; } gl.glGetFloatv(pname, params, params_offset); } public void glGetIntegerv(int pname, IntBuffer params) { - if(pmvMatrix.isMatrixGetName(pname)) { + if(PMVMatrix.isMatrixGetName(pname)) { pmvMatrix.glGetIntegerv(pname, params); return; } gl.glGetIntegerv(pname, params); } public void glGetIntegerv(int pname, int[] params, int params_offset) { - if(pmvMatrix.isMatrixGetName(pname)) { + if(PMVMatrix.isMatrixGetName(pname)) { pmvMatrix.glGetIntegerv(pname, params, params_offset); return; } @@ -339,7 +338,7 @@ public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFun } public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(getClass().getName()+" ("); if(null!=pmvMatrix) { buf.append(", matrixDirty: "+pmvMatrix.isDirty()); diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java index 24bc5aea6..5ff63d93b 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java @@ -208,9 +208,9 @@ public class WGLGLCapabilities extends GLCapabilities { } } - public StringBuffer toString(StringBuffer sink) { + public StringBuilder toString(StringBuilder sink) { if(null == sink) { - sink = new StringBuffer(); + sink = new StringBuilder(); } sink.append("wgl vid 0x").append(Integer.toHexString(pfdID)).append(" "); switch (arb_pixelformat) { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java index bb0673581..96d4c7713 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java @@ -89,9 +89,9 @@ public class X11GLCapabilities extends GLCapabilities { } } - public StringBuffer toString(StringBuffer sink) { + public StringBuilder toString(StringBuilder sink) { if(null == sink) { - sink = new StringBuffer(); + sink = new StringBuilder(); } sink.append("glx vid "); if(hasXVisualInfo()) { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java index 2de747136..2fd8cbcd9 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -606,7 +606,7 @@ public abstract class X11GLXContext extends GLContextImpl { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getClass().getSimpleName()); sb.append(" ["); super.append(sb); |