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

CircleBucket: exclude VERTEX_PROGRAM_POINT_SIZE on Android (#620)

Browse Source
This commit is contained in:
Gustl22 2018-12-15 14:29:13 +01:00 committed by Emux
parent 8ac26e9567
commit e18f3577f0
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016-2017 devemux86 * Copyright 2016-2017 devemux86
* Copyright 2018 Gustl22
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -29,6 +30,7 @@ public class GLAdapter {
*/ */
public static GL gl; public static GL gl;
public static boolean ANDROID_QUIRKS = false;
public static boolean GDX_DESKTOP_QUIRKS = false; public static boolean GDX_DESKTOP_QUIRKS = false;
public static boolean GDX_WEBGL_QUIRKS = false; public static boolean GDX_WEBGL_QUIRKS = false;
@ -46,6 +48,7 @@ public class GLAdapter {
public static void init(GL gl20) { public static void init(GL gl20) {
gl = gl20; gl = gl20;
ANDROID_QUIRKS = (CanvasAdapter.platform == Platform.ANDROID);
GDX_DESKTOP_QUIRKS = CanvasAdapter.platform.isDesktop(); GDX_DESKTOP_QUIRKS = CanvasAdapter.platform.isDesktop();
GDX_WEBGL_QUIRKS = (CanvasAdapter.platform == Platform.WEBGL); GDX_WEBGL_QUIRKS = (CanvasAdapter.platform == Platform.WEBGL);

3
vtm/src/org/oscim/renderer/bucket/CircleBucket.java
View File

@ -2,6 +2,7 @@
* Copyright 2016 Andrey Novikov * Copyright 2016 Andrey Novikov
* Copyright 2016 devemux86 * Copyright 2016 devemux86
* Copyright 2017 schedul-xor * Copyright 2017 schedul-xor
* Copyright 2018 Gustl22
* *
* This program is free software: you can redistribute it and/or modify it under the * This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software * terms of the GNU Lesser General Public License as published by the Free Software
@ -94,7 +95,7 @@ public class CircleBucket extends RenderBucket {
int uMVP, uFill, uRadius, uStroke, uWidth, aPos; int uMVP, uFill, uRadius, uStroke, uWidth, aPos;
Shader(String shaderFile) { Shader(String shaderFile) {
if (!GLAdapter.CIRCLE_QUADS && !GLAdapter.GDX_WEBGL_QUIRKS) if (!GLAdapter.CIRCLE_QUADS && !GLAdapter.ANDROID_QUIRKS && !GLAdapter.GDX_WEBGL_QUIRKS)
gl.enable(GL.VERTEX_PROGRAM_POINT_SIZE); gl.enable(GL.VERTEX_PROGRAM_POINT_SIZE);
String version = null; String version = null;