From acdfefa55fa8b86f38cebed8a168122f9566cb98 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 22 Mar 2014 04:55:38 +0100
Subject: [PATCH] use GLShader.init(gl)
---
vtm/src/org/oscim/renderer/GLShader.java | 6 +++---
vtm/src/org/oscim/renderer/MapRenderer.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vtm/src/org/oscim/renderer/GLShader.java b/vtm/src/org/oscim/renderer/GLShader.java
index 61e06cf8..13c2aefe 100644
--- a/vtm/src/org/oscim/renderer/GLShader.java
+++ b/vtm/src/org/oscim/renderer/GLShader.java
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
public abstract class GLShader {
final static Logger log = LoggerFactory.getLogger(GLShader.class);
- static GL20 GL;
+ private static GL20 GL;
public int program;
@@ -123,7 +123,7 @@ public abstract class GLShader {
return program;
}
- public static class SimpleShader {
-
+ public static void init(GL20 gl20) {
+ GL = gl20;
}
}
diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java
index 6006a58c..0b38a18d 100644
--- a/vtm/src/org/oscim/renderer/MapRenderer.java
+++ b/vtm/src/org/oscim/renderer/MapRenderer.java
@@ -319,7 +319,7 @@ public class MapRenderer {
GLState.init(GL);
GLUtils.init(GL);
- GLShader.GL = GL;
+ GLShader.init(GL);
// Set up some vertex buffer objects
BufferObject.init(GL, 200);