joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

internal/vk: remove methods on C types, for Go 1.24 compatibility

Browse Source 
Go 1.24 no longer allows methods on C types (golang.org/issue/60725).

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2024-11-26 09:27:00 +00:00
parent ea456f42c7
commit 94355e5201
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/vulkan.go
+1 -1
View File
@@ -175,7 +175,7 @@ func (c *vkContext) refresh(surf vk.Surface, width, height int) error {
if err != nil { if err != nil {
return err return err
} }
minExt, maxExt := caps.MinExtent(), caps.MaxExtent() minExt, maxExt := vk.SurfaceCapabilitiesMinExtent(caps), vk.SurfaceCapabilitiesMaxExtent(caps)
if width < minExt.X || maxExt.X < width || height < minExt.Y || maxExt.Y < height { if width < minExt.X || maxExt.X < width || height < minExt.Y || maxExt.Y < height {
return errOutOfDate return errOutOfDate
} }
gpu/internal/vulkan/vulkan.go
+2 -2
View File
@@ -862,8 +862,8 @@ func (b *Backend) BindUniforms(buffer driver.Buffer) {
buf := buffer.(*Buffer) buf := buffer.(*Buffer)
cmdBuf := b.currentCmdBuf() cmdBuf := b.currentCmdBuf()
for _, s := range b.pipe.pushRanges { for _, s := range b.pipe.pushRanges {
off := s.Offset() off := vk.PushConstantRangeOffset(s)
vk.CmdPushConstants(cmdBuf, b.pipe.desc.layout, s.StageFlags(), off, buf.store[off:off+s.Size()]) vk.CmdPushConstants(cmdBuf, b.pipe.desc.layout, vk.PushConstantRangeStageFlags(s), off, buf.store[off:off+vk.PushConstantRangeSize(s)])
} }
} }
internal/vk/vulkan.go
+6 -6
View File
@@ -1893,27 +1893,27 @@ func BuildWriteDescriptorSetBuffer(set DescriptorSet, binding int, typ Descripto
} }
} }
func (r PushConstantRange) StageFlags() ShaderStageFlags { func PushConstantRangeStageFlags(r PushConstantRange) ShaderStageFlags {
return r.stageFlags return r.stageFlags
} }
func (r PushConstantRange) Offset() int { func PushConstantRangeOffset(r PushConstantRange) int {
return int(r.offset) return int(r.offset)
} }
func (r PushConstantRange) Size() int { func PushConstantRangeSize(r PushConstantRange) int {
return int(r.size) return int(r.size)
} }
func (p QueueFamilyProperties) Flags() QueueFlags { func QueueFamilyPropertiesFlags(p QueueFamilyProperties) QueueFlags {
return p.queueFlags return p.queueFlags
} }
func (c SurfaceCapabilities) MinExtent() image.Point { func SurfaceCapabilitiesMinExtent(c SurfaceCapabilities) image.Point {
return image.Pt(int(c.minImageExtent.width), int(c.minImageExtent.height)) return image.Pt(int(c.minImageExtent.width), int(c.minImageExtent.height))
} }
func (c SurfaceCapabilities) MaxExtent() image.Point { func SurfaceCapabilitiesMaxExtent(c SurfaceCapabilities) image.Point {
return image.Pt(int(c.maxImageExtent.width), int(c.maxImageExtent.height)) return image.Pt(int(c.maxImageExtent.width), int(c.maxImageExtent.height))
} }