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/PerfTextLoad.java | |
parent | cbc8b07376eb3aab3c35d768b3323159bd79a4a1 (diff) |
Adapt to JOGL ShaderState changes - track our own instance.
Diffstat (limited to 'src/demos/es2/perftst/PerfTextLoad.java')
-rwxr-xr-x | src/demos/es2/perftst/PerfTextLoad.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java index 543ce93..429e833 100755 --- a/src/demos/es2/perftst/PerfTextLoad.java +++ b/src/demos/es2/perftst/PerfTextLoad.java @@ -7,6 +7,7 @@ import java.io.*; import java.net.*; import javax.media.opengl.*; import com.jogamp.opengl.util.*; +import com.jogamp.opengl.util.glsl.ShaderState; import com.jogamp.opengl.util.texture.*; public class PerfTextLoad extends PerfModule { @@ -15,8 +16,8 @@ public class PerfTextLoad extends PerfModule { public PerfTextLoad() { } - public void initShaderState(GL2ES2 gl) { - initShaderState(gl, "vbo-vert-text", "ftext"); + public ShaderState initShaderState(GL2ES2 gl) { + return initShaderState(gl, "vbo-vert-text", "ftext"); } Texture[] textures = null; |