From b7b3d449a153dba94449c50ed295f89359240499 Mon Sep 17 00:00:00 2001 From: ahbejarano Date: Sat, 23 Jul 2022 20:34:34 +0200 Subject: [PATCH] Close #36 --- bookcontents/chapter-15/chapter-15.md | 6 ++++-- .../java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java | 6 ++++-- .../java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bookcontents/chapter-15/chapter-15.md b/bookcontents/chapter-15/chapter-15.md index ee3292d7..4feeba2b 100644 --- a/bookcontents/chapter-15/chapter-15.md +++ b/bookcontents/chapter-15/chapter-15.md @@ -371,9 +371,11 @@ public class GuiRenderActivity { rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y))); vkCmdSetScissor(cmdHandle, 0, rect); int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j); - vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0); - offsetIdx += numElements; + vkCmdDrawIndexed(cmdHandle, numElements, 1, + offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j), + offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0); } + offsetIdx += imDrawData.getCmdListIdxBufferSize(i); offsetVtx += imDrawData.getCmdListVtxBufferSize(i); } } diff --git a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java index 7a30a44e..91aa2fb5 100644 --- a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java +++ b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java @@ -185,9 +185,11 @@ public void recordCommandBuffer(Scene scene, CommandBuffer commandBuffer) { rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y))); vkCmdSetScissor(cmdHandle, 0, rect); int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j); - vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0); - offsetIdx += numElements; + vkCmdDrawIndexed(cmdHandle, numElements, 1, + offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j), + offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0); } + offsetIdx += imDrawData.getCmdListIdxBufferSize(i); offsetVtx += imDrawData.getCmdListVtxBufferSize(i); } } diff --git a/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java b/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java index 93e86a8a..902e1e5b 100644 --- a/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java +++ b/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java @@ -185,9 +185,11 @@ public void recordCommandBuffer(Scene scene, CommandBuffer commandBuffer) { rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y))); vkCmdSetScissor(cmdHandle, 0, rect); int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j); - vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0); - offsetIdx += numElements; + vkCmdDrawIndexed(cmdHandle, numElements, 1, + offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j), + offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0); } + offsetIdx += imDrawData.getCmdListIdxBufferSize(i); offsetVtx += imDrawData.getCmdListVtxBufferSize(i); } }