diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2011-06-07 18:28:22 +0200 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2011-06-07 18:28:22 +0200 |
| commit | cf36398314270c2c50d55b23736e5bff8b62337d (patch) | |
| tree | 53b85ce3c10a4a7a840702902a1cc4c0894a3821 /src/jogl/classes/com/jogamp/opengl/util/glsl | |
| parent | ced1a4c644483ad5bfd28ca2bb6a5ffc030b9f1d (diff) | |
Using GlueGen IOUtil (dropped StreamUtil, FileUtil); Public GLReadBufferUtil (screenshot etc) and GLPixelStorageModes
- Using GlueGen IOUtil, dropping StreamUtil and FileUtil
- Public (util) GLReadBufferUtil for screenshots and slow r2t (AWT less), as well as GLPixelStorageModes
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/util/glsl')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java index ad17dd288..be3a1de73 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java @@ -29,6 +29,8 @@ package com.jogamp.opengl.util.glsl; import com.jogamp.common.nio.Buffers; +import com.jogamp.common.util.IOUtil; + import javax.media.opengl.*; import com.jogamp.opengl.util.*; import jogamp.opengl.Debug; @@ -350,7 +352,7 @@ public class ShaderCode { if (url == null) { return null; } - return StreamUtil.readAll2Buffer(new BufferedInputStream(url.openStream())); + return IOUtil.copyStream2ByteBuffer( new BufferedInputStream( url.openStream() ) ); } catch (IOException e) { throw new RuntimeException(e); } |