daily reminder to self to stop programming after 1 am

devsh · devsh · commit 1913ae755e79 · 2024-10-10T11:24:35.000+02:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 478ed1878d31cda7670a760f03999b5ed52759d1
+Subproject commit 67a4128f9c56aca942dc0c7c98367898b87a0b4c
diff --git a/src/nbl/ext/ImGui/ImGui.cpp b/src/nbl/ext/ImGui/ImGui.cpp
@@ -1301,8 +1301,8 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa
 						memcpy(streamingPtr+geo.indexByteOffset,list->IdxBuffer.Data,list->IdxBuffer.size_in_bytes());
 						memcpy(streamingPtr+geo.vertexByteOffset,list->VtxBuffer.Data,list->VtxBuffer.size_in_bytes());
 						// not writing past the end
-						assert(streamingPtr+geo.indexByteOffset<endByte);
-						assert(streamingPtr+geo.vertexByteOffset<endByte);
+						assert(streamingPtr+geo.indexByteOffset+list->IdxBuffer.size_in_bytes()<=endByte);
+						assert(streamingPtr+geo.vertexByteOffset+list->VtxBuffer.size_in_bytes()<=endByte);
 					}
 				}
 				// the offets were enough and allocation should not overlap
@@ -1334,7 +1334,7 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa
 					{
 						auto mdiBinding = binding;
 						mdiBinding.offset = offsets.drawIndirectByteOffset;
-						commandBuffer->drawIndexedIndirect(binding,drawID,sizeof(VkDrawIndexedIndirectCommand));
+						commandBuffer->drawIndexedIndirect(mdiBinding,drawID,sizeof(VkDrawIndexedIndirectCommand));
 					}
 				}
 
@@ -1349,6 +1349,7 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa
 					// trim the leftover actually used block
 					metaAlloc.memBlockSize = offsets.totalSize;
 				}
+
 				// latch our used chunk free
 				streaming->multi_deallocate(1,&metaAlloc.memBlockOffset,&metaAlloc.memBlockSize,waitInfo);
 				// reset to initial state

Original file line number	Diff line number	Diff line change
`@@ -1301,8 +1301,8 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa`
`1301`	`1301`	`memcpy(streamingPtr+geo.indexByteOffset,list->IdxBuffer.Data,list->IdxBuffer.size_in_bytes());`
`1302`	`1302`	`memcpy(streamingPtr+geo.vertexByteOffset,list->VtxBuffer.Data,list->VtxBuffer.size_in_bytes());`
`1303`	`1303`	`// not writing past the end`
`1304`		`- assert(streamingPtr+geo.indexByteOffset<endByte);`
`1305`		`- assert(streamingPtr+geo.vertexByteOffset<endByte);`
	`1304`	`+ assert(streamingPtr+geo.indexByteOffset+list->IdxBuffer.size_in_bytes()<=endByte);`
	`1305`	`+ assert(streamingPtr+geo.vertexByteOffset+list->VtxBuffer.size_in_bytes()<=endByte);`
`1306`	`1306`	`}`
`1307`	`1307`	`}`
`1308`	`1308`	`// the offets were enough and allocation should not overlap`
`@@ -1334,7 +1334,7 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa`
`1334`	`1334`	`{`
`1335`	`1335`	`auto mdiBinding = binding;`
`1336`	`1336`	`mdiBinding.offset = offsets.drawIndirectByteOffset;`
`1337`		`- commandBuffer->drawIndexedIndirect(binding,drawID,sizeof(VkDrawIndexedIndirectCommand));`
	`1337`	`+ commandBuffer->drawIndexedIndirect(mdiBinding,drawID,sizeof(VkDrawIndexedIndirectCommand));`
`1338`	`1338`	`}`
`1339`	`1339`	`}`
`1340`	`1340`
`@@ -1349,6 +1349,7 @@ bool UI::render(IGPUCommandBuffer* const commandBuffer, ISemaphore::SWaitInfo wa`
`1349`	`1349`	`// trim the leftover actually used block`
`1350`	`1350`	`metaAlloc.memBlockSize = offsets.totalSize;`
`1351`	`1351`	`}`
	`1352`	`+`
`1352`	`1353`	`// latch our used chunk free`
`1353`	`1354`	`streaming->multi_deallocate(1,&metaAlloc.memBlockOffset,&metaAlloc.memBlockSize,waitInfo);`
`1354`	`1355`	`// reset to initial state`