use GLShader.init(gl)

This commit is contained in:
Hannes Janetzek 2014-03-22 04:55:38 +01:00
parent 41c92f0a38
commit acdfefa55f
2 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
public abstract class GLShader { public abstract class GLShader {
final static Logger log = LoggerFactory.getLogger(GLShader.class); final static Logger log = LoggerFactory.getLogger(GLShader.class);
static GL20 GL; private static GL20 GL;
public int program; public int program;
@ -123,7 +123,7 @@ public abstract class GLShader {
return program; return program;
} }
public static class SimpleShader { public static void init(GL20 gl20) {
GL = gl20;
} }
} }

View File

@ -319,7 +319,7 @@ public class MapRenderer {
GLState.init(GL); GLState.init(GL);
GLUtils.init(GL); GLUtils.init(GL);
GLShader.GL = GL; GLShader.init(GL);
// Set up some vertex buffer objects // Set up some vertex buffer objects
BufferObject.init(GL, 200); BufferObject.init(GL, 200);