Skip to content

8357625: Build should generate platform specific shaders #2071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
arapte wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

8357625: Build should generate platform specific shaders #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,9 @@ void addJSL(Project project, String name, String pkg, List<String> addExports, C
def generateShaders = project.task("generate${name}Shaders",
dependsOn: compileCompilers) {
doFirst {
mkdir "$project.buildDir/gensrc/mtl-headers"
if (IS_MAC) {
mkdir "$project.buildDir/gensrc/mtl-headers"
}
}
description = "Generate $name shaders from JSL"
def sourceDir = project.file("src/main/jsl-$lowerName")
Expand Down Expand Up @@ -2616,7 +2618,16 @@ project(":graphics") {
jvmArgs += "--module-path=$modulePath"
jvmArgs += "--add-modules=javafx.graphics"
jvmArgs += decoraAddExports
args += ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/scenario/effect", "$settings.outputs", "$settings.fileName"]
args += ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/scenario/effect"]
if (IS_WINDOWS) {
args += [ "-d3d" ]
} else if (IS_MAC) {
args += [ "-mtl" ]
}
if (IS_LINUX | IS_INCLUDE_ES2) {
args += [ "-es2" ]
}
args += ["$settings.outputs", "$settings.fileName"]
}
}
}
Expand Down Expand Up @@ -2707,7 +2718,16 @@ project(":graphics") {
classpath += files(project.sourceSets.jslc.resources)
classpath += files("$buildDir/classes/jsl-compilers/prism",
project.projectDir.path + "/src/main/jsl-prism") // for the .stg
args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/prism", "-d3d", "-es2", "-mtl", "-name", "$file"]
args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/prism"]
if (IS_WINDOWS) {
args += [ "-d3d" ]
} else if (IS_MAC) {
args += [ "-mtl" ]
}
if (IS_LINUX | IS_INCLUDE_ES2) {
args += [ "-es2" ]
}
args += ["-name", "$file"]
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions modules/javafx.graphics/src/jslc/java/com/sun/scenario/effect/compiler/JSLC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ public class JSLC {

public static final int OUT_SW_PEERS = OUT_JAVA | OUT_SSE;
public static final int OUT_HW_PEERS = OUT_PRISM;
public static final int OUT_ALL_PEERS = OUT_SW_PEERS | OUT_HW_PEERS;

public static final int OUT_HW_SHADERS = OUT_D3D | OUT_ES2 | OUT_MTL;
public static final int OUT_ALL = OUT_SW_PEERS | OUT_HW_PEERS | OUT_HW_SHADERS;

private static final String rootPkg = "com/sun/scenario/effect";
public static final STGroup group;
Expand Down Expand Up @@ -356,7 +357,7 @@ public void usage(PrintStream out) {
String prefix0 = "Usage: java "+prog+" ";
String prefix1 = "";
for (int i = 0; i < prefix0.length(); i++) prefix1 += " ";
out.println(prefix0+"[-d3d | -es2 | -java | -sse | -me | -sw | -hw | -all]");
out.println(prefix0+"[-d3d | -es2 | -mtl | -java | -sse | -me | -sw | -hw | -all]");
out.println(prefix1+"[-o <outdir>] [-i <srcdir>] [-t]");
out.println(prefix1+"[-name <name>] [-ifname <interface name>]");
if (extraOpts != null) {
Expand Down Expand Up @@ -411,9 +412,9 @@ public int parseArg(String args[], int index) {
} else if (arg.equals("-sw")) {
outTypes = OUT_SW_PEERS;
} else if (arg.equals("-hw")) {
outTypes = OUT_HW_PEERS | OUT_HW_SHADERS;
outTypes |= OUT_HW_PEERS;
} else if (arg.equals("-all")) {
outTypes = OUT_ALL;
outTypes |= OUT_ALL_PEERS;
} else if (arg.equals("-help")) {
usage(System.out);
System.exit(0);
Expand Down
4 changes: 2 additions & 2 deletions modules/javafx.graphics/src/main/jsl-decora/GenAllDecoraShaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public class GenAllDecoraShaders {

public static void main(String[] args) throws Exception {
for (int i = 0; i < compileShaders.length; i++) {
args[7] = compileShaders[i][1]; // types of shaders to be generated
args[8] = compileShaders[i][2]; // jsl shader file name
args[args.length - 2] = compileShaders[i][1]; // types of shaders to be generated
args[args.length - 1] = compileShaders[i][2]; // jsl shader file name
Class<?> cls = Class.forName(compileShaders[i][0]);
Method meth = cls.getMethod("main", String[].class);
meth.invoke(null, (Object) args);
Expand Down