xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont use vbo texture-layers for samsung devices with kitkat

Browse Source
This commit is contained in:
Hannes Janetzek
2014-05-08 12:33:22 +02:00
parent f207a6eb4a
commit ee3ffa8cec
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vtm-android/src/org/oscim/android/MapView.java
View File

@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.GestureDetector; import android.view.GestureDetector;
@@ -58,6 +59,12 @@ public class MapView extends RelativeLayout {
AndroidAssets.init(context); AndroidAssets.init(context);
GLAdapter.init(new AndroidGL()); GLAdapter.init(new AndroidGL());
/* Use workaround for adreno driver bug in some
* samsung S4 and Note3 models */
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT
&& "samsung".equals(Build.MANUFACTURER))
GLAdapter.VBO_TEXTURE_LAYERS = false;
DisplayMetrics metrics = getResources().getDisplayMetrics(); DisplayMetrics metrics = getResources().getDisplayMetrics();
CanvasAdapter.dpi = (int) Math.max(metrics.xdpi, metrics.ydpi); CanvasAdapter.dpi = (int) Math.max(metrics.xdpi, metrics.ydpi);

8
vtm/src/org/oscim/backend/GLAdapter.java
View File

@@ -24,16 +24,14 @@ public class GLAdapter {
/** The instance provided by backend */ /** The instance provided by backend */
private static GL20 g; private static GL20 g;
public static boolean GDX_DESKTOP_QUIRKS; public static boolean GDX_DESKTOP_QUIRKS = false;
public static boolean GDX_WEBGL_QUIRKS; public static boolean GDX_WEBGL_QUIRKS = false;
public static boolean NON_PREMUL_CANVAS;
/** /**
* Set false as workaround for adreno driver issue: * Set false as workaround for adreno driver issue:
* https://github.com/opensciencemap/vtm/issues/52 * https://github.com/opensciencemap/vtm/issues/52
*/ */
public static boolean VBO_TEXTURE_LAYERS = false; public static boolean VBO_TEXTURE_LAYERS = true;
public static GL20 get() { public static GL20 get() {
if (g == null) if (g == null)