Skip to content

Commit fca09db

Browse files
whitebelyashartdeell
authored andcommitted
Rebase on new feature query implementation
1 parent bd8245a commit fca09db

4 files changed

Lines changed: 3 additions & 14 deletions

File tree

src/main/java/git/artdeell/artvk/Vk11Backend.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,6 @@ private static String getDeviceName(final VkPhysicalDevice vkPhysicalDevice) {
201201
private static VkDevice createVkDevice(final Vk11PhysicalDevice physicalDevice) throws BackendCreationException {
202202
try (MemoryStack stack = MemoryStack.stackPush()) {
203203

204-
// Enable MultiDrawEXT if present
205-
VkPhysicalDeviceMultiDrawFeaturesEXT multiDrawFeatures = VkPhysicalDeviceMultiDrawFeaturesEXT.calloc(stack).sType$Default();
206-
multiDrawFeatures.multiDraw(true);
207-
vk11Features.pNext(multiDrawFeatures.address());
208-
209204
Int2IntMap queuesToCreate = physicalDevice.queueFamilyCreateInfoMap();
210205
Buffer queueCreationInfo = VkDeviceQueueCreateInfo.calloc(queuesToCreate.size(), stack);
211206

src/main/java/git/artdeell/artvk/Vk11Device.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Vk11Device(
9393
Integer.MAX_VALUE,
9494
properties.maxColorAttachments()
9595
),
96-
new DeviceFeatures(true, features.multiDraw(), false, features.multiDrawIndirect(), true, true, true),
96+
new DeviceFeatures(true, features.multiDraw(), false, true, true, true, true),
9797
Collections.emptySet(), // TODO: maybe implement this?
9898
new HintsAndWorkarounds(false, false),
9999
physicalDevice.deviceType()

src/main/java/git/artdeell/artvk/Vk11Features.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/git/artdeell/artvk/Vk11RenderPass.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public void drawIndexedIndirect(final @NotNull GpuBufferSlice commands, final in
231231
if (pipeline != null && pipeline.isValid()) {
232232
pushDescriptors();
233233
long buf = ((Vk11GpuBuffer)commands.buffer()).vkBuffer();
234-
if(device.realFeatures().multiDrawIndirect())
234+
if(device.features.multiDrawIndirect())
235235
VK10.vkCmdDrawIndexedIndirect(
236236
commandBuffer(), buf, commands.offset(), drawCount, VkDrawIndexedIndirectCommand.SIZEOF
237237
);
@@ -300,7 +300,7 @@ public void drawIndirect(final @NotNull GpuBufferSlice commands, final int drawC
300300
if (pipeline != null && pipeline.isValid()) {
301301
pushDescriptors();
302302
long buf = ((Vk11GpuBuffer)commands.buffer()).vkBuffer();
303-
if(device.realFeatures().multiDrawIndirect())
303+
if(device.features.multiDrawIndirect())
304304
VK10.vkCmdDrawIndirect(commandBuffer(), buf, commands.offset(), drawCount, VkDrawIndirectCommand.SIZEOF);
305305
else {
306306
long offset = commands.offset();

0 commit comments

Comments
 (0)