diff options
| author | Sven Gothel <[email protected]> | 2012-12-23 06:58:20 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-12-23 06:58:20 +0100 |
| commit | 1c1e83011a726f49aa29a40df81f7bceceba31f8 (patch) | |
| tree | acbfe6e845359587707f6c53a9e308b4ff868210 /src/demos/es2/perftst/PerfUniLoad.java | |
| parent | cbc8b07376eb3aab3c35d768b3323159bd79a4a1 (diff) | |
Adapt to JOGL ShaderState changes - track our own instance.
Diffstat (limited to 'src/demos/es2/perftst/PerfUniLoad.java')
| -rwxr-xr-x | src/demos/es2/perftst/PerfUniLoad.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java index 92626b0..d553d64 100755 --- a/src/demos/es2/perftst/PerfUniLoad.java +++ b/src/demos/es2/perftst/PerfUniLoad.java @@ -4,6 +4,7 @@ import com.jogamp.common.nio.Buffers; import java.nio.*; import javax.media.opengl.*; import com.jogamp.opengl.util.*; +import com.jogamp.opengl.util.glsl.ShaderState; public class PerfUniLoad extends PerfModule { @@ -16,8 +17,8 @@ public class PerfUniLoad extends PerfModule { public PerfUniLoad() { } - public void initShaderState(GL2ES2 gl) { - initShaderState(gl, "uni-vert-col", "fcolor"); + public ShaderState initShaderState(GL2ES2 gl) { + return initShaderState(gl, "uni-vert-col", "fcolor"); } protected void runOneSet(GLAutoDrawable drawable, int numObjs, int numArrayElem, int loops) { |