Vulkan compiler, Unify use of enum to set name of input/output when compiling

Author: rsahlin

graphics-by-opengl-j2se/src/main/java/com/nucleus/vulkan/GLSLCompiler.java

@@ -13,6 +13,7 @@
 import com.nucleus.io.StreamUtils;
 import com.nucleus.spirv.SpirvBinary;
 import com.nucleus.spirv.SpirvBinary.SpirvStream;
+import com.nucleus.vulkan.structs.ShaderModuleCreateInfo.Type;
 
 /**
  * Used to compile GLSL to SPIR-V in runtime.
@@ -24,16 +25,6 @@ public class GLSLCompiler {
     private static final String TARGET_CLASSES = "target/classes/";
     private static final String DESTINATION_RESOURCES = "src/main/resources/";
 
-    public enum Stage {
-        vert(),
-        tesc(),
-        tese(),
-        geom(),
-        frag(),
-        comp();
-
-    }
-
     private static GLSLCompiler compiler = new GLSLCompiler();
 
     /**
@@ -59,26 +50,27 @@ public static GLSLCompiler getInstance() {
     public synchronized void compileShaders(String path, ArrayList<String> folders)
             throws IOException, URISyntaxException {
         ByteBuffer buffer = BufferUtils.createByteBuffer(16000);
-        compileStage(path, folders, buffer, Stage.vert);
-        compileStage(path, folders, buffer, Stage.geom);
-        compileStage(path, folders, buffer, Stage.frag);
+        compileStage(path, folders, buffer, Type.VERTEX);
+        compileStage(path, folders, buffer, Type.GEOMETRY);
+        compileStage(path, folders, buffer, Type.FRAGMENT);
     }
 
-    public void compileStage(String path, ArrayList<String> folders, ByteBuffer buffer, Stage stage)
+    public void compileStage(String path, ArrayList<String> folders, ByteBuffer buffer, Type type)
             throws IOException, URISyntaxException {
         for (String folder : folders) {
             ArrayList<String> currentFolder = new ArrayList<String>();
             currentFolder.add(folder);
-            String stageSuffix = "." + stage.name();
+            // Get the mime for the shader type/stage - ie the glsl sourcefiles to compile
+            String stageSuffix = "." + type.stage;
             ArrayList<String> filenames = FileUtils.getInstance().listFiles(path, currentFolder,
                     new String[] { stageSuffix });
 
             String name = null;
             String output = null;
             for (String filename : filenames) {
                 String filePath = FileUtils.getInstance().getFilePath(path + filename, folder);
-                name = filename.substring(0, filename.length() - (stage.name().length() + 1));
-                output = name + "_" + stage.name() + ".spv";
+                name = filename.substring(0, filename.length() - (type.fileName.length() + 1));
+                output = name + type.fileName;
                 String cmd = "glslc " + filename + " -o -";
                 buffer.clear();
                 SpirvBinary binary = compile(

graphics-by-opengl-j2se/src/main/java/com/nucleus/vulkan/VulkanGraphicsPipeline.java

@@ -23,17 +23,10 @@
 import com.nucleus.shader.ShaderVariable.VariableType;
 import com.nucleus.shader.VariableIndexer;
 import com.nucleus.vulkan.structs.ShaderModuleCreateInfo;
+import com.nucleus.vulkan.structs.ShaderModuleCreateInfo.Type;
 
 public class VulkanGraphicsPipeline implements GraphicsPipeline<ShaderBinary> {
 
-    /**
-     * Shader type sourcename
-     */
-    public static final String FRAGMENT_TYPE = "_fs";
-    public static final String VERTEX_TYPE = "_vs";
-    public static final String GEOMETRY_TYPE = "_gs";
-    public static final String COMPUTE_TYPE = "_cs";
-
     private Vulkan10Wrapper vulkan;
 
     public VulkanGraphicsPipeline(Vulkan10Wrapper vulkan) {
@@ -123,16 +116,20 @@ public ShaderBinary getShaderSource(Renderers version, Categorizer function, Sha
         switch (type) {
             case VERTEX:
                 return new ShaderModuleCreateInfo(ShaderBinary.PROGRAM_DIRECTORY + sourceNameVersion,
-                        function.getShaderSourceName(type), VERTEX_TYPE, type);
+                        function.getShaderSourceName(type), Type.VERTEX.fileName,
+                        type);
             case FRAGMENT:
                 return new ShaderModuleCreateInfo(ShaderBinary.PROGRAM_DIRECTORY + sourceNameVersion,
-                        function.getShaderSourceName(type), FRAGMENT_TYPE, type);
+                        function.getShaderSourceName(type), Type.FRAGMENT.fileName,
+                        type);
             case COMPUTE:
                 return new ShaderModuleCreateInfo(ShaderBinary.PROGRAM_DIRECTORY + sourceNameVersion,
-                        function.getShaderSourceName(type), COMPUTE_TYPE, type);
+                        function.getShaderSourceName(type), Type.COMPUTE.fileName,
+                        type);
             case GEOMETRY:
                 return new ShaderModuleCreateInfo(ShaderBinary.PROGRAM_DIRECTORY + sourceNameVersion,
-                        function.getShaderSourceName(type), GEOMETRY_TYPE, type);
+                        function.getShaderSourceName(type), Type.GEOMETRY.fileName,
+                        type);
 
             default:
                 throw new IllegalArgumentException("Not implemented for type: " + type);

graphics-by-opengl-j2se/src/main/java/com/nucleus/vulkan/structs/ShaderModuleCreateInfo.java

@@ -17,11 +17,20 @@
 public class ShaderModuleCreateInfo extends ShaderBinary {
 
     public enum Type {
-        VERTEX(),
-        FRAGMENT(),
-        GEOMETRY(),
-        TESSELATION(),
-        COMPUTE();
+        VERTEX("vert", "_vert.spv"),
+        TESSELATION_CONTROL("tesc", "_tesc.spv"),
+        TESSELATION("tese", "_tese.spv"),
+        GEOMETRY("geom", "_geom.spv"),
+        FRAGMENT("frag", "_frag.spv"),
+        COMPUTE("comp", "_comp.spv");
+
+        public final String stage;
+        public final String fileName;
+
+        Type(String stage, String fileName) {
+            this.stage = stage;
+            this.fileName = fileName;
+        }
     }
 
     /**