From 4882763851a38d979b2117a4e4fbf62683d9ff8b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 1 Aug 2011 08:45:59 +0200 Subject: FixedFuncUtil.getFixedFuncImpl() -> FixedFuncUtil.wrapFixedFuncEmul() --- src/demos/es1/RedSquare.java | 2 +- src/demos/es1/angeles/AngelesGL.java | 2 +- src/demos/es1/angeles/AngelesGLil.java | 2 +- src/demos/es1/cube/Cube.java | 2 +- src/demos/es1/cube/CubeImmModeSink.java | 2 +- src/demos/es1/cubefbo/FBCubes.java | 2 +- src/demos/es2/openmax/Cube.java | 2 +- src/demos/es2/openmax/MovieCube.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index 0a672e5..951eed0 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -213,7 +213,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo glTrace = false; } - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(_gl); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(_gl); if(swapInterval>=0) { gl.setSwapInterval(swapInterval); } diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java index 713cca7..0068ade 100755 --- a/src/demos/es1/angeles/AngelesGL.java +++ b/src/demos/es1/angeles/AngelesGL.java @@ -86,7 +86,7 @@ public class AngelesGL implements GLEventListener { cComps = drawable.getGL().isGLES1() ? 4: 3; - this.gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + this.gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); System.err.println("AngelesGL: "+this.gl); this.glu = GLU.createGLU(); diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java index fab211f..2ead5ea 100755 --- a/src/demos/es1/angeles/AngelesGLil.java +++ b/src/demos/es1/angeles/AngelesGLil.java @@ -82,7 +82,7 @@ public class AngelesGLil implements GLEventListener { cComps = drawable.getGL().isGLES1() ? 4: 3; - this.gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + this.gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); System.err.println("AngelesGL: "+this.gl); this.glu = GLU.createGLU(); diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java index 769bbe6..001f821 100644 --- a/src/demos/es1/cube/Cube.java +++ b/src/demos/es1/cube/Cube.java @@ -95,7 +95,7 @@ public class Cube implements GLEventListener { } catch (Exception e) {e.printStackTrace();} } - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(_gl); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(_gl); glu = GLU.createGLU(); diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java index 944cad0..81f89d8 100644 --- a/src/demos/es1/cube/CubeImmModeSink.java +++ b/src/demos/es1/cube/CubeImmModeSink.java @@ -167,7 +167,7 @@ public class CubeImmModeSink implements GLEventListener { } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); glu = GLU.createGLU(); diff --git a/src/demos/es1/cubefbo/FBCubes.java b/src/demos/es1/cubefbo/FBCubes.java index e0dea40..b658798 100755 --- a/src/demos/es1/cubefbo/FBCubes.java +++ b/src/demos/es1/cubefbo/FBCubes.java @@ -53,7 +53,7 @@ public class FBCubes implements GLEventListener { } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); System.out.println(gl); gl.glGetError(); // flush error .. diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java index db09a06..51578dd 100644 --- a/src/demos/es2/openmax/Cube.java +++ b/src/demos/es2/openmax/Cube.java @@ -93,7 +93,7 @@ public class Cube implements GLEventListener { } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); glu = GLU.createGLU(); diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java index d992de1..932fcf8 100755 --- a/src/demos/es2/openmax/MovieCube.java +++ b/src/demos/es2/openmax/MovieCube.java @@ -122,7 +122,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.wrapFixedFuncEmul(drawable.getGL()); System.out.println(gl); gl.glGetError(); // flush error .. -- cgit v1.2.3