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

GL shader preprocessor improvements (#658)

Browse Source
This commit is contained in:
Gustl22 2019-02-12 19:03:01 +01:00 committed by Emux
parent 45cf4057d1
commit bac510370a
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vtm/src/org/oscim/renderer/GLShader.java
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86 * Copyright 2016 devemux86
* Copyright 2019 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).
* *
@ -36,17 +37,27 @@ public abstract class GLShader {
return createVersioned(vertexSource, fragmentSource, null); return createVersioned(vertexSource, fragmentSource, null);
} }
protected boolean createDirective(String vertexSource, String fragmentSource, String directives) {
program = createProgramDirective(vertexSource, fragmentSource, directives);
return program != 0;
}
protected boolean createVersioned(String vertexSource, String fragmentSource, String version) { protected boolean createVersioned(String vertexSource, String fragmentSource, String version) {
program = createProgramVersioned(vertexSource, fragmentSource, version); program = createProgramDirective(vertexSource, fragmentSource, version == null ? null : ("#version " + version + "\n"));
return program != 0; return program != 0;
} }
protected boolean create(String fileName) { protected boolean create(String fileName) {
return createVersioned(fileName, null); return createDirective(fileName, null);
}
protected boolean createDirective(String fileName, String directives) {
program = loadShaderDirective(fileName, directives);
return program != 0;
} }
protected boolean createVersioned(String fileName, String version) { protected boolean createVersioned(String fileName, String version) {
program = loadShaderVersioned(fileName, version); program = loadShaderDirective(fileName, version == null ? null : ("#version " + version + "\n"));
return program != 0; return program != 0;
} }
@ -69,10 +80,10 @@ public abstract class GLShader {
} }
public static int loadShader(String file) { public static int loadShader(String file) {
return loadShaderVersioned(file, null); return loadShaderDirective(file, null);
} }
public static int loadShaderVersioned(String file, String version) { public static int loadShaderDirective(String file, String directives) {
String path = "shaders/" + file + ".glsl"; String path = "shaders/" + file + ".glsl";
String vs = AssetAdapter.readTextFile(path); String vs = AssetAdapter.readTextFile(path);
@ -87,7 +98,7 @@ public abstract class GLShader {
String fs = vs.substring(fsStart + 2); String fs = vs.substring(fsStart + 2);
vs = vs.substring(0, fsStart); vs = vs.substring(0, fsStart);
int shader = createProgramVersioned(vs, fs, version); int shader = createProgramDirective(vs, fs, directives);
if (shader == 0) { if (shader == 0) {
System.out.println(vs + " \n\n" + fs); System.out.println(vs + " \n\n" + fs);
} }
@ -115,18 +126,20 @@ public abstract class GLShader {
} }
public static int createProgram(String vertexSource, String fragmentSource) { public static int createProgram(String vertexSource, String fragmentSource) {
return createProgramVersioned(vertexSource, fragmentSource, null); return createProgramDirective(vertexSource, fragmentSource, null);
} }
public static int createProgramVersioned(String vertexSource, String fragmentSource, String version) { public static int createProgramDirective(String vertexSource, String fragmentSource, String directives) {
String defs = ""; String defs = "";
if (version != null) if (directives != null)
defs += "#version " + version + "\n"; defs += directives + "\n";
if (GLAdapter.GDX_DESKTOP_QUIRKS) if (GLAdapter.GDX_DESKTOP_QUIRKS)
defs += "#define DESKTOP_QUIRKS 1\n"; defs += "#define DESKTOP_QUIRKS 1\n";
else else
defs += "#define GLES 1\n"; defs += "#define GLES 1\n";
defs += "#define GLVERSION " + (GLAdapter.isGL30() ? "30" : "20") + "\n";
int vertexShader = loadShader(GL.VERTEX_SHADER, defs + vertexSource); int vertexShader = loadShader(GL.VERTEX_SHADER, defs + vertexSource);
if (vertexShader == 0) { if (vertexShader == 0) {
return 0; return 0;