rlsl 0.1.0 → 1.0.0

data/lib/rlsl/wgsl/translator.rb

@@ -3,30 +3,24 @@
 module RLSL
   module WGSL
     class Translator < BaseTranslator
-      TYPE_MAP = {
-        "vec2" => "vec2<f32>",
-        "vec3" => "vec3<f32>",
-        "vec4" => "vec4<f32>"
-      }.freeze
-
-      FUNC_REPLACEMENTS = BaseTranslator.common_func_replacements(
-        target_vec2: "vec2<f32>",
-        target_vec3: "vec3<f32>",
-        target_vec4: "vec4<f32>"
-      ).freeze
+      PROFILE = BaseTranslator.build_profile(
+        uniform_target: :wgsl,
+        identifier_replacements: {
+          "float" => "f32",
+          "int" => "i32",
+          "vec2" => "vec2<f32>",
+          "vec3" => "vec3<f32>",
+          "vec4" => "vec4<f32>"
+        },
+        call_rewrites: BaseTranslator.common_call_rewrites(
+          target_vec2: "vec2<f32>",
+          target_vec3: "vec3<f32>",
+          target_vec4: "vec4<f32>"
+        )
+      )
 
       protected
 
-      def translate_code(c_code)
-        result = super(c_code)
-        return result if result.empty?
-
-        result.gsub!(/\bstatic\s+/, "")
-        result.gsub!(/\binline\s+/, "")
-        result.gsub!(/\bfloat\b/, "f32")
-        result
-      end
-
       def generate_shader(helpers, fragment)
         <<~WGSL
           // WGSL Shader generated by RLSL
@@ -64,29 +58,19 @@ module RLSL
 
       private
 
-      def generate_uniform_struct
-        fields = ["resolution: vec2<f32>,"]
-        @uniforms.each do |name, type|
-          wgsl_type = uniform_type_to_target(type)
-          fields << "#{name}: #{wgsl_type},"
-        end
-        fields.join("\n    ")
+      def profile
+        PROFILE
       end
 
       def target_float_type
-        "f32"
+        UniformTypes.target_type(:float, uniform_target)
       end
 
-      def target_vec2_type
-        "vec2<f32>"
-      end
-
-      def target_vec3_type
-        "vec3<f32>"
-      end
-
-      def target_vec4_type
-        "vec4<f32>"
+      def generate_uniform_struct
+        fields = uniform_lines(resolution_line: "resolution: #{target_vec2_type},") do |name, wgsl_type|
+          "#{name}: #{wgsl_type},"
+        end
+        fields.join("\n    ")
       end
     end
   end

data/lib/rlsl.rb

@@ -7,9 +7,11 @@ require_relative "rlsl/types"
 require_relative "rlsl/uniform_context"
 require_relative "rlsl/function_context"
 require_relative "rlsl/code_generator"
+require_relative "rlsl/runtime_shader"
 require_relative "rlsl/compiled_shader"
 require_relative "rlsl/base_translator"
 require_relative "rlsl/msl/translator"
+require_relative "rlsl/msl/uniform_buffer_packer"
 require_relative "rlsl/msl/shader"
 require_relative "rlsl/wgsl/translator"
 require_relative "rlsl/glsl/translator"
@@ -21,27 +23,19 @@ module RLSL
 
   class << self
     def define(name, &block)
-      builder = ShaderBuilder.new(name)
-      builder.instance_eval(&block)
-      builder.compile_and_load
+      build_shader(name, &block).compile_and_load
     end
 
     def define_metal(name, &block)
-      builder = ShaderBuilder.new(name)
-      builder.instance_eval(&block)
-      builder.build_metal_shader
+      build_shader(name, &block).build_metal_shader
     end
 
     def to_wgsl(name, &block)
-      builder = ShaderBuilder.new(name)
-      builder.instance_eval(&block)
-      builder.build_wgsl_shader
+      build_shader(name, &block).build_wgsl_shader
     end
 
     def to_glsl(name, version: "450", &block)
-      builder = ShaderBuilder.new(name)
-      builder.instance_eval(&block)
-      builder.build_glsl_shader(version: version)
+      build_shader(name, &block).build_glsl_shader(version: version)
     end
 
     def cache_dir
@@ -50,6 +44,14 @@ module RLSL
         CACHE_DIR
       end
     end
+
+    private
+
+    def build_shader(name, &block)
+      builder = ShaderBuilder.new(name)
+      builder.instance_eval(&block)
+      builder
+    end
   end
 
   module CompiledShaders

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlsl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Yudai Takada
@@ -23,20 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: metaco
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: RLSL is a Ruby DSL for writing shaders that can be transpiled to GLSL,
   WGSL, and MSL
 email:
@@ -51,25 +37,78 @@ files:
 - Rakefile
 - lib/rlsl.rb
 - lib/rlsl/base_translator.rb
+- lib/rlsl/base_translator/call_parser.rb
+- lib/rlsl/base_translator/code_rewriter.rb
+- lib/rlsl/base_translator/code_scanner.rb
 - lib/rlsl/code_generator.rb
+- lib/rlsl/code_generator/math_prelude.rb
+- lib/rlsl/code_generator/ruby_wrapper_generator.rb
+- lib/rlsl/code_generator/shader_function_generator.rb
+- lib/rlsl/code_generator/template_context.rb
+- lib/rlsl/code_generator/uniform_struct_generator.rb
 - lib/rlsl/compiled_shader.rb
 - lib/rlsl/function_context.rb
 - lib/rlsl/glsl/translator.rb
 - lib/rlsl/msl/shader.rb
 - lib/rlsl/msl/translator.rb
+- lib/rlsl/msl/uniform_buffer_packer.rb
 - lib/rlsl/prism/ast_visitor.rb
+- lib/rlsl/prism/ast_visitor/control_flow_visiting.rb
+- lib/rlsl/prism/ast_visitor/definition_visiting.rb
+- lib/rlsl/prism/ast_visitor/expression_visiting.rb
+- lib/rlsl/prism/ast_visitor/scope_context.rb
+- lib/rlsl/prism/ast_visitor/visitor_registry.rb
 - lib/rlsl/prism/builtins.rb
+- lib/rlsl/prism/builtins/function_registry.rb
+- lib/rlsl/prism/builtins/operator_rules.rb
+- lib/rlsl/prism/builtins/swizzle_rules.rb
+- lib/rlsl/prism/compilation_unit.rb
 - lib/rlsl/prism/emitters/base_emitter.rb
+- lib/rlsl/prism/emitters/base_emitter/control_flow_emission.rb
+- lib/rlsl/prism/emitters/base_emitter/definition_emission.rb
+- lib/rlsl/prism/emitters/base_emitter/expression_emission.rb
+- lib/rlsl/prism/emitters/base_emitter/statement_emission.rb
 - lib/rlsl/prism/emitters/c_emitter.rb
 - lib/rlsl/prism/emitters/glsl_emitter.rb
 - lib/rlsl/prism/emitters/msl_emitter.rb
+- lib/rlsl/prism/emitters/target_emitter.rb
+- lib/rlsl/prism/emitters/target_profile.rb
 - lib/rlsl/prism/emitters/wgsl_emitter.rb
+- lib/rlsl/prism/ir/control_flow.rb
+- lib/rlsl/prism/ir/definitions.rb
+- lib/rlsl/prism/ir/expressions.rb
+- lib/rlsl/prism/ir/node.rb
 - lib/rlsl/prism/ir/nodes.rb
+- lib/rlsl/prism/ir/traversal.rb
 - lib/rlsl/prism/source_extractor.rb
+- lib/rlsl/prism/source_extractor/block_locator.rb
+- lib/rlsl/prism/source_unit.rb
+- lib/rlsl/prism/source_unit/parser.rb
+- lib/rlsl/prism/target_capability_validator.rb
 - lib/rlsl/prism/transpiler.rb
 - lib/rlsl/prism/type_inference.rb
+- lib/rlsl/prism/type_inference/call_type_resolver.rb
+- lib/rlsl/prism/type_inference/call_validator.rb
+- lib/rlsl/prism/type_inference/collection_type_resolver.rb
+- lib/rlsl/prism/type_inference/control_flow_inferer.rb
+- lib/rlsl/prism/type_inference/definition_inferer.rb
+- lib/rlsl/prism/type_inference/expression_inferer.rb
+- lib/rlsl/prism/type_inference/field_type_resolver.rb
+- lib/rlsl/prism/type_inference/inferer_registry.rb
+- lib/rlsl/prism/type_inference/scope_stack.rb
+- lib/rlsl/prism/type_inference/type_environment.rb
+- lib/rlsl/prism/type_inference/type_shapes.rb
+- lib/rlsl/runtime_shader.rb
 - lib/rlsl/shader_builder.rb
+- lib/rlsl/shader_builder/build_service.rb
+- lib/rlsl/shader_builder/native_extension_compiler.rb
+- lib/rlsl/shader_builder/shader_definition.rb
+- lib/rlsl/shader_builder/source_resolver.rb
 - lib/rlsl/types.rb
+- lib/rlsl/types/catalog.rb
+- lib/rlsl/types/target_resolver.rb
+- lib/rlsl/types/type_spec.rb
+- lib/rlsl/types/value_normalizer.rb
 - lib/rlsl/uniform_context.rb
 - lib/rlsl/version.rb
 - lib/rlsl/wgsl/translator.rb
@@ -94,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Ruby Like Shading Language - A shader DSL for Ruby
 test_files: []