games/semicongine: semiconginev2/rendering/renderer.nim annotate

annotate semiconginev2/rendering/renderer.nim @ 1239:69489a678141

add: better syncing, better swapchain access, correct font offset, two font-rendering tests

author	sam <sam@basx.dev>
date	Mon, 22 Jul 2024 00:46:10 +0700
parents	176383220123
children	42eeb59f3a43

rev	line source
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	1 func pointerAddOffset[T: SomeInteger](p: pointer, offset: T): pointer =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	2 cast[pointer](cast[T](p) + offset)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	3
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	4 func usage(bType: BufferType): seq[VkBufferUsageFlagBits] =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	5 case bType:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	6 of VertexBuffer: @[VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	7 of VertexBufferMapped: @[VK_BUFFER_USAGE_VERTEX_BUFFER_BIT]
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	8 of IndexBuffer: @[VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	9 of IndexBufferMapped: @[VK_BUFFER_USAGE_INDEX_BUFFER_BIT]
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	10 of UniformBuffer: @[VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	11 of UniformBufferMapped: @[VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT]
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	12
1212 518a952eccbf did: increase texture format compatability sam <sam@basx.dev> parents: 1210 diff changeset	13 proc GetVkFormat(grayscale: bool, usage: openArray[VkImageUsageFlagBits]): VkFormat =
518a952eccbf did: increase texture format compatability sam <sam@basx.dev> parents: 1210 diff changeset	14 let formats = if grayscale: [VK_FORMAT_R8_SRGB, VK_FORMAT_R8_UNORM]
1214 04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	15 else: [VK_FORMAT_B8G8R8A8_SRGB, VK_FORMAT_B8G8R8A8_UNORM]
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	16
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	17 var formatProperties = VkImageFormatProperties2(sType: VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2)
1212 518a952eccbf did: increase texture format compatability sam <sam@basx.dev> parents: 1210 diff changeset	18 for format in formats:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	19 var formatInfo = VkPhysicalDeviceImageFormatInfo2(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	20 sType: VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	21 format: format,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	22 thetype: VK_IMAGE_TYPE_2D,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	23 tiling: VK_IMAGE_TILING_OPTIMAL,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	24 usage: usage.toBits,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	25 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	26 let formatCheck = vkGetPhysicalDeviceImageFormatProperties2(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	27 vulkan.physicalDevice,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	28 addr formatInfo,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	29 addr formatProperties,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	30 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	31 if formatCheck == VK_SUCCESS: # found suitable format
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	32 return format
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	33 elif formatCheck == VK_ERROR_FORMAT_NOT_SUPPORTED: # nope, try to find other format
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	34 continue
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	35 else: # raise error
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	36 checkVkResult formatCheck
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	37
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	38 assert false, "Unable to find format for textures"
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	39
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	40
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	41 func alignedTo[T: SomeInteger](value: T, alignment: T): T =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	42 let remainder = value mod alignment
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	43 if remainder == 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	44 return value
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	45 else:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	46 return value + alignment - remainder
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	47
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	48 template sType(descriptorSet: DescriptorSet): untyped =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	49 get(genericParams(typeof(descriptorSet)), 1)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	50
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	51 template bufferType(gpuData: GPUData): untyped =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	52 typeof(gpuData).TBuffer
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	53 func NeedsMapping(bType: BufferType): bool =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	54 bType in [VertexBufferMapped, IndexBufferMapped, UniformBufferMapped]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	55 template NeedsMapping(gpuData: GPUData): untyped =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	56 gpuData.bufferType.NeedsMapping
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	57
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	58 template size(gpuArray: GPUArray): uint64 =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	59 (gpuArray.data.len * sizeof(elementType(gpuArray.data))).uint64
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	60 template size(gpuValue: GPUValue): uint64 =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	61 sizeof(gpuValue.data).uint64
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	62 func size(image: Image): uint64 =
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	63 image.data.len.uint64 * sizeof(elementType(image.data)).uint64
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	64
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	65 template rawPointer(gpuArray: GPUArray): pointer =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	66 addr(gpuArray.data[0])
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	67 template rawPointer(gpuValue: GPUValue): pointer =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	68 addr(gpuValue.data)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	69
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	70 proc IsMappable(memoryTypeIndex: uint32): bool =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	71 var physicalProperties: VkPhysicalDeviceMemoryProperties
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	72 vkGetPhysicalDeviceMemoryProperties(vulkan.physicalDevice, addr(physicalProperties))
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	73 let flags = toEnums(physicalProperties.memoryTypes[memoryTypeIndex].propertyFlags)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	74 return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT in flags
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	75
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	76 proc InitDescriptorSet*(
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	77 renderData: RenderData,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	78 layout: VkDescriptorSetLayout,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	79 descriptorSet: var DescriptorSet,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	80 ) =
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	81
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	82 # santization checks
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	83 for theName, value in descriptorSet.data.fieldPairs:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	84 when typeof(value) is GPUValue:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	85 assert value.buffer.vk.Valid
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	86 elif typeof(value) is Image:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	87 assert value.vk.Valid
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	88 assert value.imageview.Valid
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	89 assert value.sampler.Valid
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	90 elif typeof(value) is array:
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	91 when elementType(value) is Image:
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	92 for t in value:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	93 assert t.vk.Valid
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	94 assert t.imageview.Valid
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	95 assert t.sampler.Valid
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	96 elif elementType(value) is GPUValue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	97 for t in value:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	98 assert t.buffer.vk.Valid
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	99 else:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	100 {.error: "Unsupported descriptor set field: '" & theName & "'".}
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	101 else:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	102 {.error: "Unsupported descriptor set field: '" & theName & "'".}
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	103
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	104 # allocate
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	105 var layouts = newSeqWith(descriptorSet.vk.len, layout)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	106 var allocInfo = VkDescriptorSetAllocateInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	107 sType: VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	108 descriptorPool: renderData.descriptorPool,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	109 descriptorSetCount: uint32(layouts.len),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	110 pSetLayouts: layouts.ToCPointer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	111 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	112 checkVkResult vkAllocateDescriptorSets(vulkan.device, addr(allocInfo), descriptorSet.vk.ToCPointer)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	113
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	114 # allocate seq with high cap to prevent realocation while adding to set
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	115 # (which invalidates pointers that are passed to the vulkan api call)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	116 var descriptorSetWrites = newSeqOfCap[VkWriteDescriptorSet](1024)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	117 var imageWrites = newSeqOfCap[VkDescriptorImageInfo](1024)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	118 var bufferWrites = newSeqOfCap[VkDescriptorBufferInfo](1024)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	119
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	120 ForDescriptorFields(descriptorSet.data, fieldName, fieldValue, descriptorType, descriptorCount, descriptorBindingNumber):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	121 for i in 0 ..< descriptorSet.vk.len:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	122 when typeof(fieldValue) is GPUValue:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	123 bufferWrites.add VkDescriptorBufferInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	124 buffer: fieldValue.buffer.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	125 offset: fieldValue.offset,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	126 range: fieldValue.size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	127 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	128 descriptorSetWrites.add VkWriteDescriptorSet(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	129 sType: VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	130 dstSet: descriptorSet.vk[i],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	131 dstBinding: descriptorBindingNumber,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	132 dstArrayElement: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	133 descriptorType: descriptorType,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	134 descriptorCount: descriptorCount,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	135 pImageInfo: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	136 pBufferInfo: addr(bufferWrites[^1]),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	137 )
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	138 elif typeof(fieldValue) is Image:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	139 imageWrites.add VkDescriptorImageInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	140 sampler: fieldValue.sampler,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	141 imageView: fieldValue.imageView,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	142 imageLayout: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	143 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	144 descriptorSetWrites.add VkWriteDescriptorSet(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	145 sType: VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	146 dstSet: descriptorSet.vk[i],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	147 dstBinding: descriptorBindingNumber,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	148 dstArrayElement: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	149 descriptorType: descriptorType,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	150 descriptorCount: descriptorCount,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	151 pImageInfo: addr(imageWrites[^1]),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	152 pBufferInfo: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	153 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	154 elif typeof(fieldValue) is array:
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	155 when elementType(fieldValue) is Image:
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	156 for image in fieldValue:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	157 imageWrites.add VkDescriptorImageInfo(
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	158 sampler: image.sampler,
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	159 imageView: image.imageView,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	160 imageLayout: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	161 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	162 descriptorSetWrites.add VkWriteDescriptorSet(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	163 sType: VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	164 dstSet: descriptorSet.vk[i],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	165 dstBinding: descriptorBindingNumber,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	166 dstArrayElement: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	167 descriptorType: descriptorType,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	168 descriptorCount: descriptorCount,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	169 pImageInfo: addr(imageWrites[^descriptorCount.int]),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	170 pBufferInfo: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	171 )
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	172 elif elementType(fieldValue) is GPUValue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	173 for entry in fieldValue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	174 bufferWrites.add VkDescriptorBufferInfo(
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	175 buffer: entry.buffer.vk,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	176 offset: entry.offset,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	177 range: entry.size,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	178 )
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	179 descriptorSetWrites.add VkWriteDescriptorSet(
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	180 sType: VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	181 dstSet: descriptorSet.vk[i],
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	182 dstBinding: descriptorBindingNumber,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	183 dstArrayElement: 0,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	184 descriptorType: descriptorType,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	185 descriptorCount: descriptorCount,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	186 pImageInfo: nil,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	187 pBufferInfo: addr(bufferWrites[^descriptorCount.int]),
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	188 )
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	189 else:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	190 {.error: "Unsupported descriptor type: " & typetraits.name(typeof(fieldValue)).}
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	191 else:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	192 {.error: "Unsupported descriptor type: " & typetraits.name(typeof(fieldValue)).}
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	193
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	194 vkUpdateDescriptorSets(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	195 device = vulkan.device,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	196 descriptorWriteCount = descriptorSetWrites.len.uint32,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	197 pDescriptorWrites = descriptorSetWrites.ToCPointer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	198 descriptorCopyCount = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	199 pDescriptorCopies = nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	200 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	201
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	202 proc AllocateNewMemoryBlock(size: uint64, mType: uint32): MemoryBlock =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	203 result = MemoryBlock(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	204 vk: svkAllocateMemory(size, mType),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	205 size: size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	206 rawPointer: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	207 offsetNextFree: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	208 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	209 if mType.IsMappable():
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	210 checkVkResult vkMapMemory(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	211 device = vulkan.device,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	212 memory = result.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	213 offset = 0'u64,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	214 size = result.size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	215 flags = VkMemoryMapFlags(0),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	216 ppData = addr(result.rawPointer)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	217 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	218
1231 70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	219 proc FlushBuffer*(buffer: Buffer) =
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	220 var flushRegion = VkMappedMemoryRange(
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	221 sType: VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	222 memory: buffer.memory,
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	223 offset: buffer.memoryOffset,
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	224 size: buffer.size,
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	225 )
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	226 checkVkResult vkFlushMappedMemoryRanges(vulkan.device, 1, addr(flushRegion))
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	227
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	228 proc FlushAllMemory*(renderData: RenderData) =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	229 var flushRegions = newSeq[VkMappedMemoryRange]()
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	230 for memoryBlocks in renderData.memory:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	231 for memoryBlock in memoryBlocks:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	232 if memoryBlock.rawPointer != nil and memoryBlock.offsetNextFree > 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	233 flushRegions.add VkMappedMemoryRange(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	234 sType: VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	235 memory: memoryBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	236 size: alignedTo(memoryBlock.offsetNextFree, svkGetPhysicalDeviceProperties().limits.nonCoherentAtomSize),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	237 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	238 if flushRegions.len > 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	239 checkVkResult vkFlushMappedMemoryRanges(vulkan.device, flushRegions.len.uint32, flushRegions.ToCPointer())
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	240
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	241 proc AllocateNewBuffer(renderData: var RenderData, size: uint64, bufferType: BufferType): Buffer =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	242 result = Buffer(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	243 vk: svkCreateBuffer(size, bufferType.usage),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	244 size: size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	245 rawPointer: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	246 offsetNextFree: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	247 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	248 let memoryRequirements = svkGetBufferMemoryRequirements(result.vk)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	249 let memoryType = BestMemory(mappable = bufferType.NeedsMapping, filter = memoryRequirements.memoryTypes)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	250
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	251 # check if there is an existing allocated memory block that is large enough to be used
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	252 var selectedBlockI = -1
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	253 for i in 0 ..< renderData.memory[memoryType].len:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	254 let memoryBlock = renderData.memory[memoryType][i]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	255 if memoryBlock.size - alignedTo(memoryBlock.offsetNextFree, memoryRequirements.alignment) >= memoryRequirements.size:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	256 selectedBlockI = i
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	257 break
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	258 # otherwise, allocate a new block of memory and use that
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	259 if selectedBlockI < 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	260 selectedBlockI = renderData.memory[memoryType].len
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	261 renderData.memory[memoryType].add AllocateNewMemoryBlock(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	262 size = max(memoryRequirements.size, MEMORY_BLOCK_ALLOCATION_SIZE),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	263 mType = memoryType
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	264 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	265
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	266 let selectedBlock = renderData.memory[memoryType][selectedBlockI]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	267 renderData.memory[memoryType][selectedBlockI].offsetNextFree = alignedTo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	268 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	269 memoryRequirements.alignment,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	270 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	271 checkVkResult vkBindBufferMemory(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	272 vulkan.device,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	273 result.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	274 selectedBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	275 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	276 )
1231 70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	277 result.memory = selectedBlock.vk
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	278 result.memoryOffset = selectedBlock.offsetNextFree
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	279 result.rawPointer = selectedBlock.rawPointer.pointerAddOffset(selectedBlock.offsetNextFree)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	280 renderData.memory[memoryType][selectedBlockI].offsetNextFree += memoryRequirements.size
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	281
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	282 proc UpdateGPUBuffer*(gpuData: GPUData, flush = false, allFrames = false) =
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	283 if gpuData.size == 0:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	284 return
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	285
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	286 when NeedsMapping(gpuData):
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	287 copyMem(pointerAddOffset(gpuData.buffer.rawPointer, gpuData.offset), gpuData.rawPointer, gpuData.size)
1231 70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	288 if flush:
70f6c1cfe005 add: incomplete cube demo sam <sam@basx.dev> parents: 1229 diff changeset	289 FlushBuffer(gpuData.buffer)
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	290 else:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	291 WithStagingBuffer((gpuData.buffer.vk, gpuData.offset), gpuData.size, stagingPtr):
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	292 copyMem(stagingPtr, gpuData.rawPointer, gpuData.size)
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	293
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	294 proc UpdateAllGPUBuffers*[T](value: T, flush = false, allFrames = false) =
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	295 for name, fieldvalue in value.fieldPairs():
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	296 when typeof(fieldvalue) is GPUData:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	297 UpdateGPUBuffer(fieldvalue, flush = flush, allFrames = allFrames)
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	298 when typeof(fieldvalue) is array:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	299 when elementType(fieldvalue) is GPUData:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	300 for entry in fieldvalue:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	301 UpdateGPUBuffer(entry, flush = flush, allFrames = allFrames)
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	302
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	303 proc AllocateGPUData(
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	304 renderdata: var RenderData,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	305 bufferType: BufferType,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	306 size: uint64,
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	307 needsFrameInFlight = -1
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	308 ): (Buffer, uint64) =
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	309
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	310 # find buffer that has space
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	311 var selectedBufferI = -1
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	312
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	313 for i in 0 ..< renderData.buffers[bufferType].len:
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	314 let buffer = renderData.buffers[bufferType][i]
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	315 if needsFrameInFlight == -1 or buffer.useForFrameInFlight == needsFrameInFlight:
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	316 if buffer.size - alignedTo(buffer.offsetNextFree, BUFFER_ALIGNMENT) >= size:
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	317 selectedBufferI = i
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	318
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	319 # otherwise create new buffer
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	320 if selectedBufferI < 0:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	321 selectedBufferI = renderdata.buffers[bufferType].len
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	322 renderdata.buffers[bufferType].add renderdata.AllocateNewBuffer(
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	323 size = max(size, BUFFER_ALLOCATION_SIZE),
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	324 bufferType = bufferType,
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	325 )
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	326 if needsFrameInFlight >= 0:
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	327 renderdata.buffers[bufferType][selectedBufferI].useForFrameInFlight = needsFrameInFlight
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	328
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	329 # assigne value
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	330 let selectedBuffer = renderdata.buffers[bufferType][selectedBufferI]
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	331 renderdata.buffers[bufferType][selectedBufferI].offsetNextFree = alignedTo(
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	332 selectedBuffer.offsetNextFree,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	333 BUFFER_ALIGNMENT
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	334 )
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	335
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	336 result[0] = selectedBuffer
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	337 result[1] = renderdata.buffers[bufferType][selectedBufferI].offsetNextFree
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	338 renderdata.buffers[bufferType][selectedBufferI].offsetNextFree += size
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	339
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	340 proc AssignBuffers*[T](renderdata: var RenderData, data: var T, uploadData = true) =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	341 for name, value in fieldPairs(data):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	342
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	343 when typeof(value) is GPUData:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	344 (value.buffer, value.offset) = AllocateGPUData(renderdata, value.bufferType, value.size)
1234 841e12f33c47 add: text & font rendering, not tested yet sam <sam@basx.dev> parents: 1231 diff changeset	345
841e12f33c47 add: text & font rendering, not tested yet sam <sam@basx.dev> parents: 1231 diff changeset	346 elif typeof(value) is DescriptorSet:
841e12f33c47 add: text & font rendering, not tested yet sam <sam@basx.dev> parents: 1231 diff changeset	347 AssignBuffers(renderdata, value.data, uploadData = uploadData)
841e12f33c47 add: text & font rendering, not tested yet sam <sam@basx.dev> parents: 1231 diff changeset	348
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	349 elif typeof(value) is array:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	350 when elementType(value) is GPUValue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	351 for v in value.mitems:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	352 (v.buffer, v.offset) = AllocateGPUData(renderdata, v.bufferType, v.size)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	353
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	354 if uploadData:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	355 UpdateAllGPUBuffers(data, flush = true, allFrames = true)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	356
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	357 proc AssignBuffers*(renderdata: var RenderData, descriptorSet: var DescriptorSet, uploadData = true) =
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	358 AssignBuffers(renderdata, descriptorSet.data, uploadData = uploadData)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	359
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	360 proc InitRenderData*(descriptorPoolLimit = 1024'u32): RenderData =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	361 # allocate descriptor pools
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	362 var poolSizes = [
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	363 VkDescriptorPoolSize(thetype: VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, descriptorCount: descriptorPoolLimit),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	364 VkDescriptorPoolSize(thetype: VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, descriptorCount: descriptorPoolLimit),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	365 ]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	366 var poolInfo = VkDescriptorPoolCreateInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	367 sType: VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	368 poolSizeCount: poolSizes.len.uint32,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	369 pPoolSizes: poolSizes.ToCPointer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	370 maxSets: descriptorPoolLimit,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	371 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	372 checkVkResult vkCreateDescriptorPool(vulkan.device, addr(poolInfo), nil, addr(result.descriptorPool))
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	373
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	374 proc DestroyRenderData*(renderData: RenderData) =
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	375 vkDestroyDescriptorPool(vulkan.device, renderData.descriptorPool, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	376
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	377 for buffers in renderData.buffers:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	378 for buffer in buffers:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	379 vkDestroyBuffer(vulkan.device, buffer.vk, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	380
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	381 for imageView in renderData.imageViews:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	382 vkDestroyImageView(vulkan.device, imageView, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	383
1201 d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	384 for sampler in renderData.samplers:
d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	385 vkDestroySampler(vulkan.device, sampler, nil)
d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	386
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	387 for image in renderData.images:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	388 vkDestroyImage(vulkan.device, image, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	389
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	390 for memoryBlocks in renderData.memory:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	391 for memory in memoryBlocks:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	392 vkFreeMemory(vulkan.device, memory.vk, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	393
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	394 proc TransitionImageLayout(image: VkImage, oldLayout, newLayout: VkImageLayout) =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	395 var
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	396 barrier = VkImageMemoryBarrier(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	397 sType: VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	398 oldLayout: oldLayout,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	399 newLayout: newLayout,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	400 srcQueueFamilyIndex: VK_QUEUE_FAMILY_IGNORED,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	401 dstQueueFamilyIndex: VK_QUEUE_FAMILY_IGNORED,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	402 image: image,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	403 subresourceRange: VkImageSubresourceRange(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	404 aspectMask: toBits [VK_IMAGE_ASPECT_COLOR_BIT],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	405 baseMipLevel: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	406 levelCount: 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	407 baseArrayLayer: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	408 layerCount: 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	409 ),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	410 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	411 srcStage: VkPipelineStageFlagBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	412 dstStage: VkPipelineStageFlagBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	413
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	414 if oldLayout == VK_IMAGE_LAYOUT_UNDEFINED and newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	415 srcStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	416 barrier.srcAccessMask = VkAccessFlags(0)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	417 dstStage = VK_PIPELINE_STAGE_TRANSFER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	418 barrier.dstAccessMask = [VK_ACCESS_TRANSFER_WRITE_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	419 elif oldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL and newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	420 srcStage = VK_PIPELINE_STAGE_TRANSFER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	421 barrier.srcAccessMask = [VK_ACCESS_TRANSFER_WRITE_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	422 dstStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	423 barrier.dstAccessMask = [VK_ACCESS_SHADER_READ_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	424 else:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	425 raise newException(Exception, "Unsupported layout transition!")
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	426
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	427 WithSingleUseCommandBuffer(commandBuffer):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	428 vkCmdPipelineBarrier(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	429 commandBuffer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	430 srcStageMask = [srcStage].toBits,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	431 dstStageMask = [dstStage].toBits,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	432 dependencyFlags = VkDependencyFlags(0),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	433 memoryBarrierCount = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	434 pMemoryBarriers = nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	435 bufferMemoryBarrierCount = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	436 pBufferMemoryBarriers = nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	437 imageMemoryBarrierCount = 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	438 pImageMemoryBarriers = addr(barrier),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	439 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	440
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	441 proc createSampler(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	442 magFilter = VK_FILTER_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	443 minFilter = VK_FILTER_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	444 addressModeU = VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	445 addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	446 ): VkSampler =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	447
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	448 let samplerInfo = VkSamplerCreateInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	449 sType: VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	450 magFilter: magFilter,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	451 minFilter: minFilter,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	452 addressModeU: addressModeU,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	453 addressModeV: addressModeV,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	454 addressModeW: VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	455 anisotropyEnable: vulkan.anisotropy > 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	456 maxAnisotropy: vulkan.anisotropy,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	457 borderColor: VK_BORDER_COLOR_INT_OPAQUE_BLACK,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	458 unnormalizedCoordinates: VK_FALSE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	459 compareEnable: VK_FALSE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	460 compareOp: VK_COMPARE_OP_ALWAYS,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	461 mipmapMode: VK_SAMPLER_MIPMAP_MODE_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	462 mipLodBias: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	463 minLod: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	464 maxLod: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	465 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	466 checkVkResult vkCreateSampler(vulkan.device, addr(samplerInfo), nil, addr(result))
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	467
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	468 proc createVulkanImage(renderData: var RenderData, image: var Image) =
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	469 assert image.vk == VkImage(0), "Image has already been created"
1214 04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	470 var usage = @[VK_IMAGE_USAGE_TRANSFER_DST_BIT, VK_IMAGE_USAGE_SAMPLED_BIT]
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	471 if image.isRenderTarget:
1214 04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	472 usage.add VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT
1234 841e12f33c47 add: text & font rendering, not tested yet sam <sam@basx.dev> parents: 1231 diff changeset	473 let format = GetVkFormat(grayscale = elementType(image.data) is Gray, usage = usage)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	474
1229 5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	475 image.vk = svkCreate2DImage(image.width, image.height, format, usage, image.samples)
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	476 renderData.images.add image.vk
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	477 image.sampler = createSampler(magFilter = image.interpolation, minFilter = image.interpolation)
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	478 renderData.samplers.add image.sampler
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	479
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	480 let memoryRequirements = image.vk.svkGetImageMemoryRequirements()
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	481 let memoryType = BestMemory(mappable = false, filter = memoryRequirements.memoryTypes)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	482 # check if there is an existing allocated memory block that is large enough to be used
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	483 var selectedBlockI = -1
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	484 for i in 0 ..< renderData.memory[memoryType].len:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	485 let memoryBlock = renderData.memory[memoryType][i]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	486 if memoryBlock.size - alignedTo(memoryBlock.offsetNextFree, memoryRequirements.alignment) >= memoryRequirements.size:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	487 selectedBlockI = i
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	488 break
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	489 # otherwise, allocate a new block of memory and use that
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	490 if selectedBlockI < 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	491 selectedBlockI = renderData.memory[memoryType].len
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	492 renderData.memory[memoryType].add AllocateNewMemoryBlock(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	493 size = max(memoryRequirements.size, MEMORY_BLOCK_ALLOCATION_SIZE),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	494 mType = memoryType
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	495 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	496 let selectedBlock = renderData.memory[memoryType][selectedBlockI]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	497 renderData.memory[memoryType][selectedBlockI].offsetNextFree = alignedTo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	498 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	499 memoryRequirements.alignment,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	500 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	501
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	502 checkVkResult vkBindImageMemory(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	503 vulkan.device,
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	504 image.vk,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	505 selectedBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	506 renderData.memory[memoryType][selectedBlockI].offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	507 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	508 renderData.memory[memoryType][selectedBlockI].offsetNextFree += memoryRequirements.size
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	509
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	510 # imageview can only be created after memory is bound
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	511 image.imageview = svkCreate2DImageView(image.vk, format)
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	512 renderData.imageViews.add image.imageview
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	513
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	514 # data transfer and layout transition
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	515 TransitionImageLayout(image.vk, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
1229 5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	516 if image.data.len > 0:
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	517 WithStagingBuffer(
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	518 (image.vk, image.width, image.height),
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	519 memoryRequirements.size,
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	520 stagingPtr
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	521 ):
5dcb503ef0c0 did: refactor renderpass a bit, enable depth buffering and msaa on offscreen-rendering sam <sam@basx.dev> parents: 1228 diff changeset	522 copyMem(stagingPtr, image.data.ToCPointer, image.size)
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	523 TransitionImageLayout(image.vk, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	524
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	525
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	526 proc UploadImages*(renderdata: var RenderData, descriptorSet: var DescriptorSet) =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	527 for name, value in fieldPairs(descriptorSet.data):
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	528 when typeof(value) is Image:
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	529 renderdata.createVulkanImage(value)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	530 elif typeof(value) is array:
1228 4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	531 when elementType(value) is Image:
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	532 for image in value.mitems:
4e465583ea32 did: rename texture to image sam <sam@basx.dev> parents: 1218 diff changeset	533 renderdata.createVulkanImage(image)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	534
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	535 proc HasGPUValueField[T](name: static string): bool {.compileTime.} =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	536 for fieldname, value in default(T).fieldPairs():
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	537 when typeof(value) is GPUValue and fieldname == name: return true
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	538 return false
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	539
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	540 template WithGPUValueField(obj: object, name: static string, fieldvalue, body: untyped): untyped =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	541 # HasGPUValueField MUST be used to check if this is supported
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	542 for fieldname, value in obj.fieldPairs():
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	543 when fieldname == name:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	544 block:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	545 let `fieldvalue` {.inject.} = value
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	546 body
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	547
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	548 template WithBind*[A, B, C, D](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B], DescriptorSet[C], DescriptorSet[D]), pipeline: Pipeline, body: untyped): untyped =
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	549 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	550 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	551 for dSet in sets.fields:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	552 assert dSet.vk[currentFiF()].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	553 descriptorSets.add dSet.vk[currentFiF()]
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	554 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	555 body
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	556 template WithBind*[A, B, C](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B], DescriptorSet[C]), pipeline: Pipeline, body: untyped): untyped =
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	557 block:
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	558 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	559 for dSet in sets.fields:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	560 assert dSet.vk[currentFiF()].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	561 descriptorSets.add dSet.vk[currentFiF()]
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	562 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	563 body
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	564 template WithBind*[A, B](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B]), pipeline: Pipeline, body: untyped): untyped =
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	565 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	566 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	567 for dSet in sets.fields:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	568 assert dSet.vk[currentFiF()].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	569 descriptorSets.add dSet.vk[currentFiF()]
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	570 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	571 body
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	572 template WithBind*[A](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], ), pipeline: Pipeline, body: untyped): untyped =
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	573 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	574 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	575 for dSet in sets.fields:
1239 69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	576 assert dSet.vk[currentFiF()].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
69489a678141 add: better syncing, better swapchain access, correct font offset, two font-rendering tests sam <sam@basx.dev> parents: 1236 diff changeset	577 descriptorSets.add dSet.vk[currentFiF()]
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	578 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	579 body
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	580
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	581 proc Render*[TShader, TMesh, TInstance](
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	582 commandBuffer: VkCommandBuffer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	583 pipeline: Pipeline[TShader],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	584 mesh: TMesh,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	585 instances: TInstance,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	586 ) =
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	587
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	588 var vertexBuffers: seq[VkBuffer]
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	589 var vertexBuffersOffsets: seq[uint64]
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	590 var elementCount = 0'u32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	591 var instanceCount = 1'u32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	592
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	593 for shaderAttributeName, shaderAttribute in default(TShader).fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	594 when hasCustomPragma(shaderAttribute, VertexAttribute):
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	595 for meshName, meshValue in mesh.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	596 when meshName == shaderAttributeName:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	597 vertexBuffers.add meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	598 vertexBuffersOffsets.add meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	599 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	600 elif hasCustomPragma(shaderAttribute, InstanceAttribute):
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	601 for instanceName, instanceValue in instances.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	602 when instanceName == shaderAttributeName:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	603 vertexBuffers.add instanceValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	604 vertexBuffersOffsets.add instanceValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	605 instanceCount = instanceValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	606
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	607 if vertexBuffers.len > 0:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	608 vkCmdBindVertexBuffers(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	609 commandBuffer = commandBuffer,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	610 firstBinding = 0'u32,
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	611 bindingCount = uint32(vertexBuffers.len),
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	612 pBuffers = vertexBuffers.ToCPointer(),
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	613 pOffsets = vertexBuffersOffsets.ToCPointer()
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	614 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	615
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	616 var indexBuffer: VkBuffer
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	617 var indexBufferOffset: uint64
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	618 var indexType = VK_INDEX_TYPE_NONE_KHR
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	619
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	620 for meshName, meshValue in mesh.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	621 when typeof(meshValue) is GPUArray[uint8, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	622 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	623 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	624 indexType = VK_INDEX_TYPE_UINT8_EXT
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	625 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	626 elif typeof(meshValue) is GPUArray[uint16, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	627 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	628 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	629 indexType = VK_INDEX_TYPE_UINT16
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	630 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	631 elif typeof(meshValue) is GPUArray[uint32, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	632 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	633 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	634 indexType = VK_INDEX_TYPE_UINT32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	635 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	636
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	637 assert elementCount > 0
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	638
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	639 if indexType != VK_INDEX_TYPE_NONE_KHR:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	640 vkCmdBindIndexBuffer(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	641 commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	642 indexBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	643 indexBufferOffset,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	644 indexType,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	645 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	646 vkCmdDrawIndexed(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	647 commandBuffer = commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	648 indexCount = elementCount,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	649 instanceCount = instanceCount,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	650 firstIndex = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	651 vertexOffset = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	652 firstInstance = 0
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	653 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	654 else:
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	655 vkCmdDraw(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	656 commandBuffer = commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	657 vertexCount = elementCount,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	658 instanceCount = instanceCount,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	659 firstVertex = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	660 firstInstance = 0
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	661 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	662
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	663 type EMPTY = object
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	664
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	665 proc Render*[TShader, TMesh](
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	666 commandBuffer: VkCommandBuffer,
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	667 pipeline: Pipeline[TShader],
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	668 mesh: TMesh,
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	669 ) =
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	670 Render(commandBuffer, pipeline, mesh, EMPTY())
1203 6360c8d17ce0 did: preprations to add rendering tests sam <sam@basx.dev> parents: 1202 diff changeset	671
6360c8d17ce0 did: preprations to add rendering tests sam <sam@basx.dev> parents: 1202 diff changeset	672 proc asGPUArray*[T](data: openArray[T], bufferType: static BufferType): auto =
6360c8d17ce0 did: preprations to add rendering tests sam <sam@basx.dev> parents: 1202 diff changeset	673 GPUArray[T, bufferType](data: @data)
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	674
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	675 proc asGPUValue*[T](data: T, bufferType: static BufferType): auto =
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	676 GPUValue[T, bufferType](data: data)
1209 e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	677
e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	678 proc asDescriptorSet*[T](data: T): auto =
e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	679 DescriptorSet[T](data: data)

Mercurial > games > semicongine

annotate semiconginev2/rendering/renderer.nim @ 1239:69489a678141