⋯ 148 hidden lines@@ -149,45 +149,48 @@ func (r *Renderer) prepareCaptureCursor(s *captureSlot, c *domain.CaptureCursor, 149 return nil 149 return nil 150 } 150 } 151 151 152 + type captureCursorParams struct {153 + Rect [4]int32 154 + Mode int32 155 + Nits float32 156 + } 157 + 152 func (r *Renderer) recordCaptureCursor(cmd vk.CommandBuffer, s *captureSlot, c *domain.CaptureCursor, pq bool) {158 func (r *Renderer) recordCaptureCursor(cmd vk.CommandBuffer, s *captureSlot, c *domain.CaptureCursor, pq bool) {153 d, p, t := r.gpu.dd, &s.cursor, r.last 159 d, p, t := r.gpu.dd, &s.cursor, r.last 160 + sc := &r.capCall 154 barrier := func (img vk.Image, old, new vk.ImageLayout, src, dst vk.AccessFlags, ss, ds vk.PipelineStageFlags) { 161 barrier := func (img vk.Image, old, new vk.ImageLayout, src, dst vk.AccessFlags, ss, ds vk.PipelineStageFlags) { 155 - b := vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, SrcAccessMask: src, DstAccessMask: dst, OldLayout: old, NewLayout: new, SrcQueueFamilyIndex: queueFamilyIgnored, DstQueueFamilyIndex: queueFamilyIgnored, Image: img, SubresourceRange: colorRange} 162 + sc.b = vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, SrcAccessMask: src, DstAccessMask: dst, OldLayout: old, NewLayout: new, SrcQueueFamilyIndex: queueFamilyIgnored, DstQueueFamilyIndex: queueFamilyIgnored, Image: img, SubresourceRange: colorRange} 156 - d.CmdPipelineBarrier(cmd, ss, ds, 0, 0, nil , 0, nil , 1, &b) 163 + d.CmdPipelineBarrier(cmd, ss, ds, 0, 0, nil , 0, nil , 1, &sc.b) 157 } 164 } 158 if t.exported { 165 if t.exported { 159 - b := vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, DstAccessMask: vk.AccessTransferReadBit, OldLayout: t.layout, NewLayout: t.layout, SrcQueueFamilyIndex: vk.QueueFamilyForeignEXT, DstQueueFamilyIndex: r.gpu.family, Image: t.image, SubresourceRange: colorRange} 166 + sc.b = vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, DstAccessMask: vk.AccessTransferReadBit, OldLayout: t.layout, NewLayout: t.layout, SrcQueueFamilyIndex: vk.QueueFamilyForeignEXT, DstQueueFamilyIndex: r.gpu.family, Image: t.image, SubresourceRange: colorRange} 160 - d.CmdPipelineBarrier(cmd, vk.PipelineStageAllCommandsBit, vk.PipelineStageTransferBit, 0, 0, nil , 0, nil , 1, &b) 167 + d.CmdPipelineBarrier(cmd, vk.PipelineStageAllCommandsBit, vk.PipelineStageTransferBit, 0, 0, nil , 0, nil , 1, &sc.b) 161 } 168 } 162 barrier(p.source.image, vk.ImageLayoutUndefined, vk.ImageLayoutTransferDstOptimal, 0, vk.AccessTransferWriteBit, vk.PipelineStageTopOfPipeBit, vk.PipelineStageTransferBit) 169 barrier(p.source.image, vk.ImageLayoutUndefined, vk.ImageLayoutTransferDstOptimal, 0, vk.AccessTransferWriteBit, vk.PipelineStageTopOfPipeBit, vk.PipelineStageTransferBit) 163 offsets := [2]vk.Offset3D{{}, {X: int32(r.width), Y: int32(r.height), Z: 1}} 170 offsets := [2]vk.Offset3D{{}, {X: int32(r.width), Y: int32(r.height), Z: 1}} 164 - region := vk.ImageBlit{SrcSubresource: vk.ImageSubresourceLayers{AspectMask: vk.ImageAspectColorBit, LayerCount: 1}, DstSubresource: vk.ImageSubresourceLayers{AspectMask: vk.ImageAspectColorBit, LayerCount: 1}, SrcOffsets: offsets, DstOffsets: offsets} 171 + sc.blit = vk.ImageBlit{SrcSubresource: vk.ImageSubresourceLayers{AspectMask: vk.ImageAspectColorBit, LayerCount: 1}, DstSubresource: vk.ImageSubresourceLayers{AspectMask: vk.ImageAspectColorBit, LayerCount: 1}, SrcOffsets: offsets, DstOffsets: offsets} 165 - d.CmdBlitImage(cmd, t.image, t.layout, p.source.image, vk.ImageLayoutTransferDstOptimal, 1, ®ion, vk.FilterNearest) 172 + d.CmdBlitImage(cmd, t.image, t.layout, p.source.image, vk.ImageLayoutTransferDstOptimal, 1, &sc.blit, vk.FilterNearest) 166 if t.exported { 173 if t.exported { 167 - b := vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, SrcAccessMask: vk.AccessTransferReadBit, OldLayout: t.layout, NewLayout: t.layout, SrcQueueFamilyIndex: r.gpu.family, DstQueueFamilyIndex: vk.QueueFamilyForeignEXT, Image: t.image, SubresourceRange: colorRange} 174 + sc.b = vk.ImageMemoryBarrier{SType: vk.StructureTypeImageMemoryBarrier, SrcAccessMask: vk.AccessTransferReadBit, OldLayout: t.layout, NewLayout: t.layout, SrcQueueFamilyIndex: r.gpu.family, DstQueueFamilyIndex: vk.QueueFamilyForeignEXT, Image: t.image, SubresourceRange: colorRange} 168 - d.CmdPipelineBarrier(cmd, vk.PipelineStageTransferBit, vk.PipelineStageBottomOfPipeBit, 0, 0, nil , 0, nil , 1, &b) 175 + d.CmdPipelineBarrier(cmd, vk.PipelineStageTransferBit, vk.PipelineStageBottomOfPipeBit, 0, 0, nil , 0, nil , 1, &sc.b) 169 } 176 } 170 barrier(p.source.image, vk.ImageLayoutTransferDstOptimal, vk.ImageLayoutShaderReadOnlyOptimal, vk.AccessTransferWriteBit, vk.AccessShaderReadBit, vk.PipelineStageTransferBit, vk.PipelineStageFragmentShaderBit) 177 barrier(p.source.image, vk.ImageLayoutTransferDstOptimal, vk.ImageLayoutShaderReadOnlyOptimal, vk.AccessTransferWriteBit, vk.AccessShaderReadBit, vk.PipelineStageTransferBit, vk.PipelineStageFragmentShaderBit) 171 - hb := vk.BufferMemoryBarrier{SType: vk.StructureTypeBufferMemoryBarrier, SrcAccessMask: vk.AccessHostWriteBit, DstAccessMask: vk.AccessShaderReadBit, SrcQueueFamilyIndex: queueFamilyIgnored, DstQueueFamilyIndex: queueFamilyIgnored, Buffer: p.upload.buffer, Size: wholeSize} 178 + sc.hb = vk.BufferMemoryBarrier{SType: vk.StructureTypeBufferMemoryBarrier, SrcAccessMask: vk.AccessHostWriteBit, DstAccessMask: vk.AccessShaderReadBit, SrcQueueFamilyIndex: queueFamilyIgnored, DstQueueFamilyIndex: queueFamilyIgnored, Buffer: p.upload.buffer, Size: wholeSize} 172 - d.CmdPipelineBarrier(cmd, vk.PipelineStageHostBit, vk.PipelineStageFragmentShaderBit, 0, 0, nil , 1, &hb, 0, nil ) 179 + d.CmdPipelineBarrier(cmd, vk.PipelineStageHostBit, vk.PipelineStageFragmentShaderBit, 0, 0, nil , 1, &sc.hb, 0, nil ) 173 barrier(p.out.image, vk.ImageLayoutUndefined, vk.ImageLayoutColorAttachmentOptimal, 0, vk.AccessColorAttachmentWriteBit, vk.PipelineStageTopOfPipeBit, vk.PipelineStageColorAttachmentOutputBit) 180 barrier(p.out.image, vk.ImageLayoutUndefined, vk.ImageLayoutColorAttachmentOptimal, 0, vk.AccessColorAttachmentWriteBit, vk.PipelineStageTopOfPipeBit, vk.PipelineStageColorAttachmentOutputBit) 174 - attachment := vk.RenderingAttachmentInfo{SType: vk.StructureTypeRenderingAttachmentInfo, ImageView: p.out.view, ImageLayout: vk.ImageLayoutColorAttachmentOptimal, LoadOp: vk.AttachmentLoadOpDontCare, StoreOp: vk.AttachmentStoreOpStore} 181 + sc.attachment = vk.RenderingAttachmentInfo{SType: vk.StructureTypeRenderingAttachmentInfo, ImageView: p.out.view, ImageLayout: vk.ImageLayoutColorAttachmentOptimal, LoadOp: vk.AttachmentLoadOpDontCare, StoreOp: vk.AttachmentStoreOpStore} 175 - info := vk.RenderingInfo{SType: vk.StructureTypeRenderingInfo, RenderArea: vk.Rect2D{Extent: vk.Extent2D{Width: uint32(r.width), Height: uint32(r.height)}}, LayerCount: 1, ColorAttachmentCount: 1, ColorAttachments: &attachment} 182 + sc.info = vk.RenderingInfo{SType: vk.StructureTypeRenderingInfo, RenderArea: vk.Rect2D{Extent: vk.Extent2D{Width: uint32(r.width), Height: uint32(r.height)}}, LayerCount: 1, ColorAttachmentCount: 1, ColorAttachments: &sc.attachment} 176 - d.CmdBeginRendering(cmd, &info) 183 + d.CmdBeginRendering(cmd, &sc.info) 177 d.CmdBindPipeline(cmd, vk.PipelineBindPointGraphics, p.pass.pipeline) 184 d.CmdBindPipeline(cmd, vk.PipelineBindPointGraphics, p.pass.pipeline) 178 d.CmdBindDescriptorSets(cmd, vk.PipelineBindPointGraphics, p.pass.layout, 0, 1, &p.pass.set, 0, nil ) 185 d.CmdBindDescriptorSets(cmd, vk.PipelineBindPointGraphics, p.pass.layout, 0, 1, &p.pass.set, 0, nil ) 179 - params := struct { 186 + sc.cursorParams = captureCursorParams{Rect: [4]int32{int32(c.X - c.Image.HotX), int32(c.Y - c.Image.HotY), int32(c.Image.W), int32(c.Image.H)}, Nits: float32(r.hdrNits)} 180 - Rect [4]int32 181 - Mode int32 182 - Nits float32 183 - }{Rect: [4]int32{int32(c.X - c.Image.HotX), int32(c.Y - c.Image.HotY), int32(c.Image.W), int32(c.Image.H)}, Nits: float32(r.hdrNits)} 184 if t == &r.hdrOwn { 187 if t == &r.hdrOwn { 185 - params.Mode = 1 188 + sc.cursorParams.Mode = 1 186 } 189 } 187 if pq { 190 if pq { 188 - params.Mode = 2 191 + sc.cursorParams.Mode = 2 189 } 192 } 190 - d.CmdPushConstants(cmd, p.pass.layout, vk.ShaderStageFragmentBit, 0, 24, unsafe.Pointer(¶ms)) 193 + d.CmdPushConstants(cmd, p.pass.layout, vk.ShaderStageFragmentBit, 0, 24, unsafe.Pointer(&sc.cursorParams)) 191 d.CmdDraw(cmd, 3, 1, 0, 0) 194 d.CmdDraw(cmd, 3, 1, 0, 0) 192 d.CmdEndRendering(cmd) 195 d.CmdEndRendering(cmd) 193 barrier(p.out.image, vk.ImageLayoutColorAttachmentOptimal, vk.ImageLayoutTransferSrcOptimal, vk.AccessColorAttachmentWriteBit, vk.AccessTransferReadBit, vk.PipelineStageColorAttachmentOutputBit, vk.PipelineStageTransferBit) 196 barrier(p.out.image, vk.ImageLayoutColorAttachmentOptimal, vk.ImageLayoutTransferSrcOptimal, vk.AccessColorAttachmentWriteBit, vk.AccessTransferReadBit, vk.PipelineStageColorAttachmentOutputBit, vk.PipelineStageTransferBit)