wgpu 1.2.1 → 1.2.2

data/lib/wgpu/resources/buffer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "monitor"
+
 module WGPU
   class Buffer
     attr_reader :handle, :size, :usage
@@ -22,7 +24,9 @@ module WGPU
       @mapped = mapped_at_creation
       @map_state = mapped_at_creation ? :mapped : :unmapped
       @map_generation = 0
-      @map_state_mutex = Mutex.new
+      @map_state_mutex = Monitor.new
+      @mapped_offset = 0
+      @mapped_size = mapped_at_creation ? size : 0
 
       desc, keepalive = build_descriptor(
         label:,
@@ -32,9 +36,9 @@ module WGPU
       )
       @descriptor_keepalive = keepalive
 
-      device.push_error_scope(:validation)
-      @handle = Native.wgpuDeviceCreateBuffer(device.handle, desc)
-      error = device.pop_error_scope
+      error = device.send(:capture_error_scope) do
+        @handle = Native.wgpuDeviceCreateBuffer(NativeResource.checked_handle(device, expected_class: Device), desc)
+      end
       @descriptor_keepalive = nil
 
       if @handle.null? || (error[:type] && error[:type] != :no_error)
@@ -52,21 +56,23 @@ module WGPU
       ptr, byte_size = DataTypes.to_pointer(data, type:)
       DataTypes.validate_alignment!(offset, 4, name: "offset")
       DataTypes.validate_alignment!(byte_size, 4, name: "data size")
-      Native.wgpuQueueWriteBuffer(@device.queue.handle, @handle, offset, ptr, byte_size)
+      Native.wgpuQueueWriteBuffer(NativeResource.checked_handle(@device.queue, expected_class: Queue), @handle, offset, ptr, byte_size)
     end
 
     # Returns a writable view of a mapped byte range.
     # @return [BufferMappedRange]
     # @raise [BufferError] if the buffer is not mapped or no range is available
     def mapped_range(offset: 0, size: nil)
-      raise BufferError, "Buffer is not mapped" unless @mapped
+      map_state_mutex.synchronize do
+        raise BufferError, "Buffer is not mapped" unless @mapped
 
-      size ||= @size - offset
-      offset, size = validate_map_range!(offset, size)
-      ptr = Native.wgpuBufferGetMappedRange(@handle, offset, size)
-      raise BufferError, "Failed to get mapped range" if ptr.null?
+        size ||= @size - offset
+        offset, size = validate_mapped_access!(offset, size)
+        ptr = Native.wgpuBufferGetMappedRange(@handle, offset, size)
+        raise BufferError, "Failed to get mapped range" if ptr.null?
 
-      BufferMappedRange.new(ptr, size)
+        BufferMappedRange.new(ptr, size, buffer: self, generation: current_map_generation)
+      end
     end
 
     # Returns a writable view of a mapped byte range.
@@ -78,11 +84,9 @@ module WGPU
     # Unmaps the buffer and invalidates its mapped ranges.
     # @return [void]
     def unmap
-      Native.wgpuBufferUnmap(@handle)
       map_state_mutex.synchronize do
-        @map_generation = current_map_generation + 1
-        @mapped = false
-        @map_state = :unmapped
+        Native.wgpuBufferUnmap(@handle)
+        invalidate_map_state
       end
     end
 
@@ -92,6 +96,7 @@ module WGPU
     # @return [Boolean] true when mapped
     # @raise [BufferError] if mapping fails
     def map_sync(mode, offset: 0, size: nil, timeout: nil)
+      timeout = AsyncWaiter.normalize_timeout(timeout)
       status_holder, _callback_token, future, generation =
         begin_map_request(mode, offset: offset, size: size)
       wait_for_map(status_holder, future, timeout:)
@@ -114,14 +119,16 @@ module WGPU
     # @return [String] mapped bytes
     # @raise [BufferError] if the buffer is not mapped
     def read_mapped_data(offset: 0, size: nil)
-      raise BufferError, "Buffer is not mapped" unless @mapped
+      map_state_mutex.synchronize do
+        raise BufferError, "Buffer is not mapped" unless @mapped
 
-      size ||= @size - offset
-      offset, size = validate_map_range!(offset, size)
-      ptr = Native.wgpuBufferGetConstMappedRange(@handle, offset, size)
-      raise BufferError, "Failed to get mapped range" if ptr.null?
+        size ||= @size - offset
+        offset, size = validate_mapped_access!(offset, size)
+        ptr = Native.wgpuBufferGetConstMappedRange(@handle, offset, size)
+        raise BufferError, "Failed to get mapped range" if ptr.null?
 
-      ptr.read_bytes(size)
+        ptr.read_bytes(size)
+      end
     end
 
     # Reads mapped bytes, optionally decoding typed values.
@@ -137,14 +144,16 @@ module WGPU
     # @param type [Symbol] source element type
     # @return [void]
     def write_mapped(data, offset: 0, type: :f32)
-      raise BufferError, "Buffer is not mapped" unless @mapped
+      map_state_mutex.synchronize do
+        raise BufferError, "Buffer is not mapped" unless @mapped
 
-      ptr, byte_size = DataTypes.to_pointer(data, type:)
-      offset, byte_size = validate_map_range!(offset, byte_size)
-      target = Native.wgpuBufferGetMappedRange(@handle, offset, byte_size)
-      raise BufferError, "Failed to get mapped range" if target.null?
+        ptr, byte_size = DataTypes.to_pointer(data, type:)
+        offset, byte_size = validate_mapped_access!(offset, byte_size)
+        target = Native.wgpuBufferGetMappedRange(@handle, offset, byte_size)
+        raise BufferError, "Failed to get mapped range" if target.null?
 
-      target.put_bytes(0, ptr.read_bytes(byte_size))
+        target.put_bytes(0, ptr.read_bytes(byte_size))
+      end
     end
 
     # Reads mapped bytes as 32-bit floating-point values.
@@ -228,8 +237,10 @@ module WGPU
     # Destroys the buffer's storage.
     # @return [void]
     def destroy
-      Native.wgpuBufferDestroy(@handle)
-      invalidate_map_state
+      map_state_mutex.synchronize do
+        Native.wgpuBufferDestroy(@handle)
+        invalidate_map_state
+      end
     end
 
     # Releases the native buffer handle.
@@ -237,10 +248,12 @@ module WGPU
     # Calling this method more than once has no effect.
     # @return [void]
     def release
-      return if @handle.null?
-      Native.wgpuBufferRelease(@handle)
-      @handle = FFI::Pointer::NULL
-      invalidate_map_state
+      map_state_mutex.synchronize do
+        return if @handle.null?
+        Native.wgpuBufferRelease(@handle)
+        @handle = FFI::Pointer::NULL
+        invalidate_map_state
+      end
     end
 
     private
@@ -263,7 +276,11 @@ module WGPU
 
       status_holder = { done: false, status: nil, message: nil }
       generation = map_state_mutex.synchronize do
+        raise BufferError, "Buffer is already mapped or mapping" if @mapped || @map_state == :pending
+
         @map_generation = current_map_generation + 1
+        @mapped_offset = offset
+        @mapped_size = size
         @map_state = :pending
         @map_generation
       end
@@ -351,7 +368,7 @@ module WGPU
     end
 
     def map_state_mutex
-      @map_state_mutex ||= Mutex.new
+      @map_state_mutex ||= Monitor.new
     end
 
     def normalize_usage(usage)
@@ -363,6 +380,25 @@ module WGPU
       "create buffer#{context}: #{message}"
     end
 
+    def with_mapped_generation(generation)
+      map_state_mutex.synchronize do
+        unless @mapped && !released? && generation == current_map_generation
+          raise BufferError, "Mapped range is no longer valid"
+        end
+
+        yield
+      end
+    end
+
+    def validate_mapped_access!(offset, size)
+      offset, size = validate_map_range!(offset, size)
+      if offset < @mapped_offset || offset + size > @mapped_offset + @mapped_size
+        raise BufferError, "Requested range is outside the current mapping"
+      end
+
+      [offset, size]
+    end
+
     def validate_map_range!(offset, size)
       offset = DataTypes.validate_alignment!(offset, 8, name: "map offset")
       size = DataTypes.validate_alignment!(size, 4, name: "map size")
@@ -379,9 +415,13 @@ module WGPU
     # Wraps a native mapped memory range.
     # @param pointer [FFI::Pointer] start of mapped memory
     # @param size [Integer] range size in bytes
-    def initialize(pointer, size)
+    # @param buffer [Buffer] owner retaining the mapped allocation
+    # @param generation [Integer] mapping generation at acquisition
+    def initialize(pointer, size, buffer:, generation:)
       @pointer = pointer
       @size = size
+      @buffer = buffer
+      @generation = generation
     end
 
     # Reads 32-bit floating-point values from the mapped range.
@@ -498,7 +538,7 @@ module WGPU
 
       bytes_to_read = count * byte_size
       validate_byte_length!(bytes_to_read)
-      DataTypes.unpack(@pointer.read_bytes(bytes_to_read), type:)
+      DataTypes.unpack(with_valid_mapping { @pointer.read_bytes(bytes_to_read) }, type:)
     end
 
     # Encodes typed values into the mapped range.
@@ -510,13 +550,13 @@ module WGPU
       bytes = data.is_a?(String) ? data : DataTypes.pack(data, type:)
       raise ArgumentError, "data exceeds mapped range" if bytes.bytesize > @size
 
-      @pointer.put_bytes(0, bytes)
+      with_valid_mapping { @pointer.put_bytes(0, bytes) }
     end
 
     # Returns all bytes in the mapped range.
     # @return [String]
     def read_bytes
-      @pointer.read_bytes(@size)
+      with_valid_mapping { @pointer.read_bytes(@size) }
     end
 
     # Writes bytes at the start of the mapped range.
@@ -524,11 +564,15 @@ module WGPU
     # @return [void]
     def write_bytes(data)
       validate_byte_length!(data.bytesize)
-      @pointer.put_bytes(0, data)
+      with_valid_mapping { @pointer.put_bytes(0, data) }
     end
 
     private
 
+    def with_valid_mapping(&block)
+      @buffer.send(:with_mapped_generation, @generation, &block)
+    end
+
     def validate_byte_length!(byte_length)
       return if byte_length <= @size
 

data/lib/wgpu/resources/query_set.rb

@@ -29,7 +29,7 @@ module WGPU
       desc[:type] = type_value
       desc[:count] = @count
 
-      @handle = Native.wgpuDeviceCreateQuerySet(device.handle, desc)
+      @handle = Native.wgpuDeviceCreateQuerySet(NativeResource.checked_handle(device, expected_class: Device), desc)
       raise ResourceError, "Failed to create query set" if @handle.null?
     end
 

data/lib/wgpu/resources/sampler.rb

@@ -25,9 +25,9 @@ module WGPU
       )
       @descriptor_keepalive = keepalive
 
-      device.push_error_scope(:validation)
-      @handle = Native.wgpuDeviceCreateSampler(device.handle, desc)
-      error = device.pop_error_scope
+      error = device.send(:capture_error_scope) do
+        @handle = Native.wgpuDeviceCreateSampler(NativeResource.checked_handle(device, expected_class: Device), desc)
+      end
       @descriptor_keepalive = nil
 
       if @handle.null? || (error[:type] && error[:type] != :no_error)

data/lib/wgpu/resources/texture.rb

@@ -25,9 +25,9 @@ module WGPU
       )
       @descriptor_keepalive = keepalive
 
-      device.push_error_scope(:validation)
-      @handle = Native.wgpuDeviceCreateTexture(device.handle, desc)
-      error = device.pop_error_scope
+      error = device.send(:capture_error_scope) do
+        @handle = Native.wgpuDeviceCreateTexture(NativeResource.checked_handle(device, expected_class: Device), desc)
+      end
       @descriptor_keepalive = nil
 
       if @handle.null? || (error[:type] && error[:type] != :no_error)
@@ -156,9 +156,7 @@ module WGPU
       DescriptorHelpers.set_label(desc, label, keepalive:)
       desc[:usage] = normalize_usage(usage)
       desc[:dimension] = Native::EnumHelper.coerce(Native::TextureDimension, dimension, name: "texture dimension")
-      desc[:size][:width] = size[:width] || size[0]
-      desc[:size][:height] = size[:height] || size[1] || 1
-      desc[:size][:depth_or_array_layers] = size[:depth_or_array_layers] || size[2] || 1
+      desc[:size] = DescriptorHelpers.extent_3d(size)
       desc[:format] = Native::EnumHelper.coerce(Native::TextureFormat, format, name: "texture format")
       desc[:mip_level_count] = mip_level_count
       desc[:sample_count] = sample_count

data/lib/wgpu/resources/texture_view.rb

@@ -41,7 +41,7 @@ module WGPU
         name: "texture view usage"
       )
 
-      @handle = Native.wgpuTextureCreateView(texture.handle, desc)
+      @handle = Native.wgpuTextureCreateView(NativeResource.checked_handle(texture, expected_class: Texture), desc)
       raise ResourceError, "Failed to create texture view" if @handle.null?
     end
 

data/lib/wgpu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WGPU
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/sig/wgpu.rbs

@@ -248,6 +248,7 @@ module WGPU
   end
 
   class BufferMappedRange
+    def initialize: (untyped pointer, Integer size, buffer: Buffer, generation: Integer) -> void
     def read: (?type: Symbol, ?count: Integer?) -> Array[Numeric]
     def write: (data, ?type: Symbol) -> void
     def read_floats: (?Integer?) -> Array[Float]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wgpu
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Yudai Takada
@@ -27,16 +27,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Ruby bindings for the WebGPU API, providing GPU compute and graphics
   capabilities through the wgpu-native library.
 email:
@@ -138,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Ruby bindings for WebGPU via wgpu-native
 test_files: []