Skip to content

Commit 9a85838

Browse files
JakubValtarJakubValtar
committed
Remove hardcoded shader versions
1 parent 0c18512 commit 9a85838

File tree

2 files changed

+48
-23
lines changed

2 files changed

+48
-23
lines changed

‎core/src/processing/opengl/PGraphicsOpenGL.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7197,25 +7197,25 @@ public PShader loadShader(String fragFilename) {
71977197
shader.setType(type);
71987198
shader.setFragmentShader(fragFilename);
71997199
if (type == PShader.POINT) {
7200-
String[] vertSource = pgl.loadVertexShader(defPointShaderVertURL, 120);
7200+
String[] vertSource = pgl.loadVertexShader(defPointShaderVertURL);
72017201
shader.setVertexShader(vertSource);
72027202
} else if (type == PShader.LINE) {
7203-
String[] vertSource = pgl.loadVertexShader(defLineShaderVertURL, 120);
7203+
String[] vertSource = pgl.loadVertexShader(defLineShaderVertURL);
72047204
shader.setVertexShader(vertSource);
72057205
} else if (type == PShader.TEXLIGHT) {
7206-
String[] vertSource = pgl.loadVertexShader(defTexlightShaderVertURL, 120);
7206+
String[] vertSource = pgl.loadVertexShader(defTexlightShaderVertURL);
72077207
shader.setVertexShader(vertSource);
72087208
} else if (type == PShader.LIGHT) {
7209-
String[] vertSource = pgl.loadVertexShader(defLightShaderVertURL, 120);
7209+
String[] vertSource = pgl.loadVertexShader(defLightShaderVertURL);
72107210
shader.setVertexShader(vertSource);
72117211
} else if (type == PShader.TEXTURE) {
7212-
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL, 120);
7212+
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL);
72137213
shader.setVertexShader(vertSource);
72147214
} else if (type == PShader.COLOR) {
7215-
String[] vertSource = pgl.loadVertexShader(defColorShaderVertURL, 120);
7215+
String[] vertSource = pgl.loadVertexShader(defColorShaderVertURL);
72167216
shader.setVertexShader(vertSource);
72177217
} else {
7218-
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL, 120);
7218+
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL);
72197219
shader.setVertexShader(vertSource);
72207220
}
72217221
return shader;
@@ -7309,8 +7309,8 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
73097309
if (tex) {
73107310
if (useDefault || !polyShader.checkPolyType(PShader.TEXLIGHT)) {
73117311
if (ppg.defTexlightShader == null) {
7312-
String[] vertSource = pgl.loadVertexShader(defTexlightShaderVertURL, 120);
7313-
String[] fragSource = pgl.loadFragmentShader(defTexlightShaderFragURL, 120);
7312+
String[] vertSource = pgl.loadVertexShader(defTexlightShaderVertURL);
7313+
String[] fragSource = pgl.loadFragmentShader(defTexlightShaderFragURL);
73147314
ppg.defTexlightShader = new PShader(parent, vertSource, fragSource);
73157315
}
73167316
shader = ppg.defTexlightShader;
@@ -7320,8 +7320,8 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
73207320
} else {
73217321
if (useDefault || !polyShader.checkPolyType(PShader.LIGHT)) {
73227322
if (ppg.defLightShader == null) {
7323-
String[] vertSource = pgl.loadVertexShader(defLightShaderVertURL, 120);
7324-
String[] fragSource = pgl.loadFragmentShader(defLightShaderFragURL, 120);
7323+
String[] vertSource = pgl.loadVertexShader(defLightShaderVertURL);
7324+
String[] fragSource = pgl.loadFragmentShader(defLightShaderFragURL);
73257325
ppg.defLightShader = new PShader(parent, vertSource, fragSource);
73267326
}
73277327
shader = ppg.defLightShader;
@@ -7338,8 +7338,8 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
73387338
if (tex) {
73397339
if (useDefault || !polyShader.checkPolyType(PShader.TEXTURE)) {
73407340
if (ppg.defTextureShader == null) {
7341-
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL, 120);
7342-
String[] fragSource = pgl.loadFragmentShader(defTextureShaderFragURL, 120);
7341+
String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL);
7342+
String[] fragSource = pgl.loadFragmentShader(defTextureShaderFragURL);
73437343
ppg.defTextureShader = new PShader(parent, vertSource, fragSource);
73447344
}
73457345
shader = ppg.defTextureShader;
@@ -7349,8 +7349,8 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
73497349
} else {
73507350
if (useDefault || !polyShader.checkPolyType(PShader.COLOR)) {
73517351
if (ppg.defColorShader == null) {
7352-
String[] vertSource = pgl.loadVertexShader(defColorShaderVertURL, 120);
7353-
String[] fragSource = pgl.loadFragmentShader(defColorShaderFragURL, 120);
7352+
String[] vertSource = pgl.loadVertexShader(defColorShaderVertURL);
7353+
String[] fragSource = pgl.loadFragmentShader(defColorShaderFragURL);
73547354
ppg.defColorShader = new PShader(parent, vertSource, fragSource);
73557355
}
73567356
shader = ppg.defColorShader;
@@ -7373,8 +7373,8 @@ protected PShader getLineShader() {
73737373
PGraphicsOpenGL ppg = getPrimaryPG();
73747374
if (lineShader == null) {
73757375
if (ppg.defLineShader == null) {
7376-
String[] vertSource = pgl.loadVertexShader(defLineShaderVertURL, 120);
7377-
String[] fragSource = pgl.loadFragmentShader(defLineShaderFragURL, 120);
7376+
String[] vertSource = pgl.loadVertexShader(defLineShaderVertURL);
7377+
String[] fragSource = pgl.loadFragmentShader(defLineShaderFragURL);
73787378
ppg.defLineShader = new PShader(parent, vertSource, fragSource);
73797379
}
73807380
shader = ppg.defLineShader;
@@ -7393,8 +7393,8 @@ protected PShader getPointShader() {
73937393
PGraphicsOpenGL ppg = getPrimaryPG();
73947394
if (pointShader == null) {
73957395
if (ppg.defPointShader == null) {
7396-
String[] vertSource = pgl.loadVertexShader(defPointShaderVertURL, 120);
7397-
String[] fragSource = pgl.loadFragmentShader(defPointShaderFragURL, 120);
7396+
String[] vertSource = pgl.loadVertexShader(defPointShaderVertURL);
7397+
String[] fragSource = pgl.loadFragmentShader(defPointShaderFragURL);
73987398
ppg.defPointShader = new PShader(parent, vertSource, fragSource);
73997399
}
74007400
shader = ppg.defPointShader;

‎core/src/processing/opengl/PJOGL.java‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,25 +1244,50 @@ private static int getGLSLVersion(GLContext context) {
12441244
return vn.getMajor() * 100 + vn.getMinor();
12451245
}
12461246

1247+
1248+
@Override
1249+
protected String[] loadVertexShader(String filename) {
1250+
return loadVertexShader(filename, getGLSLVersion(context));
1251+
}
1252+
1253+
1254+
@Override
1255+
protected String[] loadFragmentShader(String filename) {
1256+
return loadFragmentShader(filename, getGLSLVersion(context));
1257+
}
1258+
1259+
1260+
@Override
1261+
protected String[] loadVertexShader(URL url) {
1262+
return loadVertexShader(url, getGLSLVersion(context));
1263+
}
1264+
1265+
1266+
@Override
1267+
protected String[] loadFragmentShader(URL url) {
1268+
return loadFragmentShader(url, getGLSLVersion(context));
1269+
}
1270+
1271+
12471272
@Override
12481273
protected String[] loadVertexShader(String filename, int version) {
12491274
String[] fragSrc0 = pg.parent.loadStrings(filename);
1250-
return preprocessFragmentSource(fragSrc0, getGLSLVersion(context));
1275+
return preprocessFragmentSource(fragSrc0, version);
12511276
}
12521277

12531278

12541279
@Override
12551280
protected String[] loadFragmentShader(String filename, int version) {
12561281
String[] vertSrc0 = pg.parent.loadStrings(filename);
1257-
return preprocessVertexSource(vertSrc0, getGLSLVersion(context));
1282+
return preprocessVertexSource(vertSrc0, version);
12581283
}
12591284

12601285

12611286
@Override
12621287
protected String[] loadFragmentShader(URL url, int version) {
12631288
try {
12641289
String[] fragSrc0 = PApplet.loadStrings(url.openStream());
1265-
return preprocessFragmentSource(fragSrc0, getGLSLVersion(context));
1290+
return preprocessFragmentSource(fragSrc0, version);
12661291
} catch (IOException e) {
12671292
PGraphics.showException("Cannot load fragment shader " + url.getFile());
12681293
}
@@ -1274,7 +1299,7 @@ protected String[] loadFragmentShader(URL url, int version) {
12741299
protected String[] loadVertexShader(URL url, int version) {
12751300
try {
12761301
String[] vertSrc0 = PApplet.loadStrings(url.openStream());
1277-
return preprocessVertexSource(vertSrc0, getGLSLVersion(context));
1302+
return preprocessVertexSource(vertSrc0, version);
12781303
} catch (IOException e) {
12791304
PGraphics.showException("Cannot load vertex shader " + url.getFile());
12801305
}

0 commit comments

Comments
 (0)