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

annotate semicongine/rendering/renderer.nim @ 1214:04e446a7eb2b compiletime-tests

add: multipass renderer, finish tets for now

author	sam <sam@basx.dev>
date	Wed, 17 Jul 2024 20:11:55 +0700
parents	518a952eccbf
children

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]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	7 of VertexBufferMapped: @[VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
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]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	9 of IndexBufferMapped: @[VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
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]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	11 of UniformBufferMapped: @[VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT]
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
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	62 func size(texture: Texture): uint64 =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	63 texture.data.len.uint64 * sizeof(elementType(texture.data)).uint64
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
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	86 elif typeof(value) is Texture:
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:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	91 when elementType(value) is Texture:
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 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	138 elif typeof(fieldValue) is Texture:
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:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	155 when elementType(fieldValue) is Texture:
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	156 for texture in fieldValue:
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	157 imageWrites.add VkDescriptorImageInfo(
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	158 sampler: texture.sampler,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	159 imageView: texture.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
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	219 proc FlushAllMemory*(renderData: RenderData) =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	220 var flushRegions = newSeq[VkMappedMemoryRange]()
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	221 for memoryBlocks in renderData.memory:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	222 for memoryBlock in memoryBlocks:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	223 if memoryBlock.rawPointer != nil and memoryBlock.offsetNextFree > 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	224 flushRegions.add VkMappedMemoryRange(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	225 sType: VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	226 memory: memoryBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	227 size: alignedTo(memoryBlock.offsetNextFree, svkGetPhysicalDeviceProperties().limits.nonCoherentAtomSize),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	228 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	229 if flushRegions.len > 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	230 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	231
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	232 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	233 result = Buffer(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	234 vk: svkCreateBuffer(size, bufferType.usage),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	235 size: size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	236 rawPointer: nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	237 offsetNextFree: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	238 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	239 let memoryRequirements = svkGetBufferMemoryRequirements(result.vk)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	240 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	241
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	242 # 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	243 var selectedBlockI = -1
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	244 for i in 0 ..< renderData.memory[memoryType].len:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	245 let memoryBlock = renderData.memory[memoryType][i]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	246 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	247 selectedBlockI = i
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	248 break
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	249 # 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	250 if selectedBlockI < 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	251 selectedBlockI = renderData.memory[memoryType].len
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	252 renderData.memory[memoryType].add AllocateNewMemoryBlock(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	253 size = max(memoryRequirements.size, MEMORY_BLOCK_ALLOCATION_SIZE),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	254 mType = memoryType
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	255 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	256
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	257 let selectedBlock = renderData.memory[memoryType][selectedBlockI]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	258 renderData.memory[memoryType][selectedBlockI].offsetNextFree = alignedTo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	259 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	260 memoryRequirements.alignment,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	261 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	262 checkVkResult vkBindBufferMemory(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	263 vulkan.device,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	264 result.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	265 selectedBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	266 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	267 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	268 result.rawPointer = selectedBlock.rawPointer.pointerAddOffset(selectedBlock.offsetNextFree)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	269 renderData.memory[memoryType][selectedBlockI].offsetNextFree += memoryRequirements.size
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	270
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	271 proc UpdateGPUBuffer*(gpuData: GPUData) =
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	272 if gpuData.size == 0:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	273 return
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	274 when NeedsMapping(gpuData):
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	275 copyMem(pointerAddOffset(gpuData.buffer.rawPointer, gpuData.offset), gpuData.rawPointer, gpuData.size)
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	276 else:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	277 WithStagingBuffer((gpuData.buffer.vk, gpuData.offset), gpuData.size, stagingPtr):
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	278 copyMem(stagingPtr, gpuData.rawPointer, gpuData.size)
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	279
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	280 proc UpdateAllGPUBuffers*[T](value: T) =
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	281 for name, fieldvalue in value.fieldPairs():
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	282 when typeof(fieldvalue) is GPUData:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	283 UpdateGPUBuffer(fieldvalue)
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	284 when typeof(fieldvalue) is array:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	285 when elementType(fieldvalue) is GPUData:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	286 for entry in fieldvalue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	287 UpdateGPUBuffer(entry)
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	288
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	289 proc AssignGPUData(renderdata: var RenderData, value: var GPUData) =
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	290 # find buffer that has space
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	291 var selectedBufferI = -1
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	292
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	293 for i in 0 ..< renderData.buffers[value.bufferType].len:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	294 let buffer = renderData.buffers[value.bufferType][i]
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	295 if buffer.size - alignedTo(buffer.offsetNextFree, BUFFER_ALIGNMENT) >= value.size:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	296 selectedBufferI = i
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	297
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	298 # otherwise create new buffer
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	299 if selectedBufferI < 0:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	300 selectedBufferI = renderdata.buffers[value.bufferType].len
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	301 renderdata.buffers[value.bufferType].add renderdata.AllocateNewBuffer(
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	302 size = max(value.size, BUFFER_ALLOCATION_SIZE),
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	303 bufferType = value.bufferType,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	304 )
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	305
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	306 # assigne value
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	307 let selectedBuffer = renderdata.buffers[value.bufferType][selectedBufferI]
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	308 renderdata.buffers[value.bufferType][selectedBufferI].offsetNextFree = alignedTo(
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	309 selectedBuffer.offsetNextFree,
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	310 BUFFER_ALIGNMENT
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	311 )
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	312 value.buffer = selectedBuffer
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	313 value.offset = renderdata.buffers[value.bufferType][selectedBufferI].offsetNextFree
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	314 renderdata.buffers[value.bufferType][selectedBufferI].offsetNextFree += value.size
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	315
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	316 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	317 for name, value in fieldPairs(data):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	318
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	319 when typeof(value) is GPUData:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	320 AssignGPUData(renderdata, value)
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	321 elif typeof(value) is array:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	322 when elementType(value) is GPUValue:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	323 for v in value.mitems:
570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	324 AssignGPUData(renderdata, v)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	325
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	326 if uploadData:
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	327 UpdateAllGPUBuffers(data)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	328
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	329 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	330 AssignBuffers(renderdata, descriptorSet.data, uploadData = uploadData)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	331
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	332 proc InitRenderData*(descriptorPoolLimit = 1024'u32): RenderData =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	333 # allocate descriptor pools
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	334 var poolSizes = [
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	335 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	336 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	337 ]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	338 var poolInfo = VkDescriptorPoolCreateInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	339 sType: VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	340 poolSizeCount: poolSizes.len.uint32,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	341 pPoolSizes: poolSizes.ToCPointer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	342 maxSets: descriptorPoolLimit,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	343 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	344 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	345
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	346 proc DestroyRenderData*(renderData: RenderData) =
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	347 vkDestroyDescriptorPool(vulkan.device, renderData.descriptorPool, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	348
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	349 for buffers in renderData.buffers:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	350 for buffer in buffers:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	351 vkDestroyBuffer(vulkan.device, buffer.vk, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	352
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	353 for imageView in renderData.imageViews:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	354 vkDestroyImageView(vulkan.device, imageView, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	355
1201 d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	356 for sampler in renderData.samplers:
d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	357 vkDestroySampler(vulkan.device, sampler, nil)
d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	358
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	359 for image in renderData.images:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	360 vkDestroyImage(vulkan.device, image, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	361
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	362 for memoryBlocks in renderData.memory:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	363 for memory in memoryBlocks:
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	364 vkFreeMemory(vulkan.device, memory.vk, nil)
5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	365
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	366 proc TransitionImageLayout(image: VkImage, oldLayout, newLayout: VkImageLayout) =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	367 var
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	368 barrier = VkImageMemoryBarrier(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	369 sType: VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	370 oldLayout: oldLayout,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	371 newLayout: newLayout,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	372 srcQueueFamilyIndex: VK_QUEUE_FAMILY_IGNORED,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	373 dstQueueFamilyIndex: VK_QUEUE_FAMILY_IGNORED,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	374 image: image,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	375 subresourceRange: VkImageSubresourceRange(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	376 aspectMask: toBits [VK_IMAGE_ASPECT_COLOR_BIT],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	377 baseMipLevel: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	378 levelCount: 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	379 baseArrayLayer: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	380 layerCount: 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	381 ),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	382 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	383 srcStage: VkPipelineStageFlagBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	384 dstStage: VkPipelineStageFlagBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	385
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	386 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	387 srcStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	388 barrier.srcAccessMask = VkAccessFlags(0)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	389 dstStage = VK_PIPELINE_STAGE_TRANSFER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	390 barrier.dstAccessMask = [VK_ACCESS_TRANSFER_WRITE_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	391 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	392 srcStage = VK_PIPELINE_STAGE_TRANSFER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	393 barrier.srcAccessMask = [VK_ACCESS_TRANSFER_WRITE_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	394 dstStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	395 barrier.dstAccessMask = [VK_ACCESS_SHADER_READ_BIT].toBits
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	396 else:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	397 raise newException(Exception, "Unsupported layout transition!")
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	398
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	399 WithSingleUseCommandBuffer(commandBuffer):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	400 vkCmdPipelineBarrier(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	401 commandBuffer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	402 srcStageMask = [srcStage].toBits,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	403 dstStageMask = [dstStage].toBits,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	404 dependencyFlags = VkDependencyFlags(0),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	405 memoryBarrierCount = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	406 pMemoryBarriers = nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	407 bufferMemoryBarrierCount = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	408 pBufferMemoryBarriers = nil,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	409 imageMemoryBarrierCount = 1,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	410 pImageMemoryBarriers = addr(barrier),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	411 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	412
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	413 proc createSampler(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	414 magFilter = VK_FILTER_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	415 minFilter = VK_FILTER_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	416 addressModeU = VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	417 addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	418 ): VkSampler =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	419
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	420 let samplerInfo = VkSamplerCreateInfo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	421 sType: VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	422 magFilter: magFilter,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	423 minFilter: minFilter,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	424 addressModeU: addressModeU,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	425 addressModeV: addressModeV,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	426 addressModeW: VK_SAMPLER_ADDRESS_MODE_REPEAT,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	427 anisotropyEnable: vulkan.anisotropy > 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	428 maxAnisotropy: vulkan.anisotropy,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	429 borderColor: VK_BORDER_COLOR_INT_OPAQUE_BLACK,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	430 unnormalizedCoordinates: VK_FALSE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	431 compareEnable: VK_FALSE,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	432 compareOp: VK_COMPARE_OP_ALWAYS,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	433 mipmapMode: VK_SAMPLER_MIPMAP_MODE_LINEAR,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	434 mipLodBias: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	435 minLod: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	436 maxLod: 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	437 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	438 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	439
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	440 proc createTextureImage(renderData: var RenderData, texture: var Texture) =
1212 518a952eccbf did: increase texture format compatability sam <sam@basx.dev> parents: 1210 diff changeset	441 assert texture.vk == VkImage(0), "Texture has already been created"
1214 04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	442 var usage = @[VK_IMAGE_USAGE_TRANSFER_DST_BIT, VK_IMAGE_USAGE_SAMPLED_BIT]
04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	443 if texture.isRenderTarget:
04e446a7eb2b add: multipass renderer, finish tets for now sam <sam@basx.dev> parents: 1212 diff changeset	444 usage.add VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT
1212 518a952eccbf did: increase texture format compatability sam <sam@basx.dev> parents: 1210 diff changeset	445 let format = GetVkFormat(elementType(texture.data) is TVec1[uint8], usage = usage)
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	446
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	447 texture.vk = svkCreate2DImage(texture.width, texture.height, format, usage)
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	448 renderData.images.add texture.vk
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	449 texture.sampler = createSampler(magFilter = texture.interpolation, minFilter = texture.interpolation)
1201 d4a206b5e5b0 add: rest of the cleanup stuff sam <sam@basx.dev> parents: 1200 diff changeset	450 renderData.samplers.add texture.sampler
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	451
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	452 let memoryRequirements = texture.vk.svkGetImageMemoryRequirements()
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	453 let memoryType = BestMemory(mappable = false, filter = memoryRequirements.memoryTypes)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	454 # 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	455 var selectedBlockI = -1
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	456 for i in 0 ..< renderData.memory[memoryType].len:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	457 let memoryBlock = renderData.memory[memoryType][i]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	458 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	459 selectedBlockI = i
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	460 break
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	461 # 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	462 if selectedBlockI < 0:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	463 selectedBlockI = renderData.memory[memoryType].len
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	464 renderData.memory[memoryType].add AllocateNewMemoryBlock(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	465 size = max(memoryRequirements.size, MEMORY_BLOCK_ALLOCATION_SIZE),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	466 mType = memoryType
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	467 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	468 let selectedBlock = renderData.memory[memoryType][selectedBlockI]
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	469 renderData.memory[memoryType][selectedBlockI].offsetNextFree = alignedTo(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	470 selectedBlock.offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	471 memoryRequirements.alignment,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	472 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	473
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	474 checkVkResult vkBindImageMemory(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	475 vulkan.device,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	476 texture.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	477 selectedBlock.vk,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	478 renderData.memory[memoryType][selectedBlockI].offsetNextFree,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	479 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	480 renderData.memory[memoryType][selectedBlockI].offsetNextFree += memoryRequirements.size
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	481
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	482 # imageview can only be created after memory is bound
1194 397c681f9c0c swapchain and stuff sam <sam@basx.dev> parents: 1192 diff changeset	483 texture.imageview = svkCreate2DImageView(texture.vk, format)
1200 5c6491f28dcd did: simplify some swapchain stuff, add many destructor calls sam <sam@basx.dev> parents: 1199 diff changeset	484 renderData.imageViews.add texture.imageview
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	485
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	486 # data transfer and layout transition
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	487 TransitionImageLayout(texture.vk, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	488 WithStagingBuffer(
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	489 (texture.vk, texture.width, texture.height),
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	490 memoryRequirements.size,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	491 stagingPtr
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	492 ):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	493 copyMem(stagingPtr, texture.data.ToCPointer, texture.size)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	494 TransitionImageLayout(texture.vk, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
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
1192 90bf0cab1d02 did: so many, many things sam <sam@basx.dev> parents: 1190 diff changeset	497 proc UploadTextures*(renderdata: var RenderData, descriptorSet: var DescriptorSet) =
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	498 for name, value in fieldPairs(descriptorSet.data):
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	499 when typeof(value) is Texture:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	500 renderdata.createTextureImage(value)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	501 elif typeof(value) is array:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	502 when elementType(value) is Texture:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	503 for texture in value.mitems:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	504 renderdata.createTextureImage(texture)
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	505
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	506 proc HasGPUValueField[T](name: static string): bool {.compileTime.} =
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	507 for fieldname, value in default(T).fieldPairs():
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	508 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	509 return false
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	510
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	511 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	512 # 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	513 for fieldname, value in obj.fieldPairs():
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	514 when fieldname == name:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	515 block:
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	516 let `fieldvalue` {.inject.} = value
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	517 body
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	518
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	519 template WithBind*[A, B, C, D](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B], DescriptorSet[C], DescriptorSet[D]), pipeline: Pipeline, currentFiF: int, body: untyped): untyped =
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	520 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	521 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	522 for dSet in sets.fields:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	523 assert dSet.vk[currentFiF].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	524 descriptorSets.add dSet.vk[currentFiF]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	525 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	526 body
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	527 template WithBind*[A, B, C](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B], DescriptorSet[C]), pipeline: Pipeline, currentFiF: int, body: untyped): untyped =
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	528 block:
1205 f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	529 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	530 for dSet in sets.fields:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	531 assert dSet.vk[currentFiF].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	532 descriptorSets.add dSet.vk[currentFiF]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	533 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	534 body
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	535 template WithBind*[A, B](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], DescriptorSet[B]), pipeline: Pipeline, currentFiF: int, body: untyped): untyped =
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	536 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	537 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	538 for dSet in sets.fields:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	539 assert dSet.vk[currentFiF].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	540 descriptorSets.add dSet.vk[currentFiF]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	541 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	542 body
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	543 template WithBind*[A](commandBuffer: VkCommandBuffer, sets: (DescriptorSet[A], ), pipeline: Pipeline, currentFiF: int, body: untyped): untyped =
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	544 block:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	545 var descriptorSets: seq[VkDescriptorSet]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	546 for dSet in sets.fields:
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	547 assert dSet.vk[currentFiF].Valid, "DescriptorSet not initialized, maybe forgot to call InitDescriptorSet"
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	548 descriptorSets.add dSet.vk[currentFiF]
f7530247a21f did: improve descriptor-set handling, add simple descriptor set test sam <sam@basx.dev> parents: 1204 diff changeset	549 svkCmdBindDescriptorSets(commandBuffer, descriptorSets, pipeline.layout)
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	550 body
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	551
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	552 proc Render*[TShader, TMesh, TInstance](
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	553 commandBuffer: VkCommandBuffer,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	554 pipeline: Pipeline[TShader],
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	555 mesh: TMesh,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	556 instances: TInstance,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	557 ) =
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	558
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	559 var vertexBuffers: seq[VkBuffer]
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	560 var vertexBuffersOffsets: seq[uint64]
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	561 var elementCount = 0'u32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	562 var instanceCount = 1'u32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	563
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	564 for shaderAttributeName, shaderAttribute in default(TShader).fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	565 when hasCustomPragma(shaderAttribute, VertexAttribute):
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	566 for meshName, meshValue in mesh.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	567 when meshName == shaderAttributeName:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	568 vertexBuffers.add meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	569 vertexBuffersOffsets.add meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	570 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	571 elif hasCustomPragma(shaderAttribute, InstanceAttribute):
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	572 for instanceName, instanceValue in instances.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	573 when instanceName == shaderAttributeName:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	574 vertexBuffers.add instanceValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	575 vertexBuffersOffsets.add instanceValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	576 instanceCount = instanceValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	577
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	578 if vertexBuffers.len > 0:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	579 vkCmdBindVertexBuffers(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	580 commandBuffer = commandBuffer,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	581 firstBinding = 0'u32,
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	582 bindingCount = uint32(vertexBuffers.len),
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	583 pBuffers = vertexBuffers.ToCPointer(),
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	584 pOffsets = vertexBuffersOffsets.ToCPointer()
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	585 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	586
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	587 var indexBuffer: VkBuffer
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	588 var indexBufferOffset: uint64
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	589 var indexType = VK_INDEX_TYPE_NONE_KHR
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	590
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	591 for meshName, meshValue in mesh.fieldPairs:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	592 when typeof(meshValue) is GPUArray[uint8, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	593 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	594 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	595 indexType = VK_INDEX_TYPE_UINT8_EXT
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	596 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	597 elif typeof(meshValue) is GPUArray[uint16, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	598 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	599 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	600 indexType = VK_INDEX_TYPE_UINT16
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	601 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	602 elif typeof(meshValue) is GPUArray[uint32, IndexBuffer]:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	603 indexBuffer = meshValue.buffer.vk
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	604 indexBufferOffset = meshValue.offset
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	605 indexType = VK_INDEX_TYPE_UINT32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	606 elementCount = meshValue.data.len.uint32
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	607
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	608 assert elementCount > 0
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	609
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	610 if indexType != VK_INDEX_TYPE_NONE_KHR:
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	611 vkCmdBindIndexBuffer(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	612 commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	613 indexBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	614 indexBufferOffset,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	615 indexType,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	616 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	617 vkCmdDrawIndexed(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	618 commandBuffer = commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	619 indexCount = elementCount,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	620 instanceCount = instanceCount,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	621 firstIndex = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	622 vertexOffset = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	623 firstInstance = 0
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	624 )
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	625 else:
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	626 vkCmdDraw(
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	627 commandBuffer = commandBuffer,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	628 vertexCount = elementCount,
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	629 instanceCount = instanceCount,
1190 a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	630 firstVertex = 0,
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	631 firstInstance = 0
a3eb305bcac2 start of complete and total refactoring: the ULTIMATE sam <sam@basx.dev> parents: diff changeset	632 )
1202 a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	633
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	634 type EMPTY = object
a8864fe6fe6e add: descriptor sets binding n stuff sam <sam@basx.dev> parents: 1201 diff changeset	635
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	636 proc Render*[TShader, TMesh](
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	637 commandBuffer: VkCommandBuffer,
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	638 pipeline: Pipeline[TShader],
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	639 mesh: TMesh,
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	640 ) =
1210 570ac1620fb6 fix: make uniform-block-arrays working sam <sam@basx.dev> parents: 1209 diff changeset	641 Render(commandBuffer, pipeline, mesh, EMPTY())
1203 6360c8d17ce0 did: preprations to add rendering tests sam <sam@basx.dev> parents: 1202 diff changeset	642
6360c8d17ce0 did: preprations to add rendering tests sam <sam@basx.dev> parents: 1202 diff changeset	643 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	644 GPUArray[T, bufferType](data: @data)
1204 e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	645
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	646 proc asGPUValue*[T](data: T, bufferType: static BufferType): auto =
e2901100a596 add: tests, some fixes, some helpers sam <sam@basx.dev> parents: 1203 diff changeset	647 GPUValue[T, bufferType](data: data)
1209 e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	648
e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	649 proc asDescriptorSet*[T](data: T): auto =
e177336cac3f sync to notebook in bedroom sam <sam@basx.dev> parents: 1205 diff changeset	650 DescriptorSet[T](data: data)

Mercurial > games > semicongine

annotate semicongine/rendering/renderer.nim @ 1214:04e446a7eb2b compiletime-tests