summaryrefslogtreecommitdiffstats
path: root/src/video_core/vulkan_common
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/vulkan_common')
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp139
-rw-r--r--src/video_core/vulkan_common/vulkan_device.h74
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.cpp14
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.h78
4 files changed, 276 insertions, 29 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index c4d31681a..5c5bfa18d 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -350,8 +350,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
.sampleRateShading = true,
.dualSrcBlend = true,
.logicOp = true,
- .multiDrawIndirect = false,
- .drawIndirectFirstInstance = false,
+ .multiDrawIndirect = true,
+ .drawIndirectFirstInstance = true,
.depthClamp = true,
.depthBiasClamp = true,
.fillModeNonSolid = true,
@@ -569,6 +569,67 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state");
}
+ VkPhysicalDeviceExtendedDynamicState2FeaturesEXT dynamic_state_2;
+ if (ext_extended_dynamic_state_2) {
+ dynamic_state_2 = {
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT,
+ .pNext = nullptr,
+ .extendedDynamicState2 = VK_TRUE,
+ .extendedDynamicState2LogicOp = ext_extended_dynamic_state_2_extra ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState2PatchControlPoints = VK_FALSE,
+ };
+ SetNext(next, dynamic_state_2);
+ } else {
+ LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state 2");
+ }
+
+ VkPhysicalDeviceExtendedDynamicState3FeaturesEXT dynamic_state_3;
+ if (ext_extended_dynamic_state_3) {
+ dynamic_state_3 = {
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT,
+ .pNext = nullptr,
+ .extendedDynamicState3TessellationDomainOrigin = VK_FALSE,
+ .extendedDynamicState3DepthClampEnable =
+ ext_extended_dynamic_state_3_enables ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState3PolygonMode = VK_FALSE,
+ .extendedDynamicState3RasterizationSamples = VK_FALSE,
+ .extendedDynamicState3SampleMask = VK_FALSE,
+ .extendedDynamicState3AlphaToCoverageEnable = VK_FALSE,
+ .extendedDynamicState3AlphaToOneEnable = VK_FALSE,
+ .extendedDynamicState3LogicOpEnable =
+ ext_extended_dynamic_state_3_enables ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState3ColorBlendEnable =
+ ext_extended_dynamic_state_3_blend ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState3ColorBlendEquation =
+ ext_extended_dynamic_state_3_blend ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState3ColorWriteMask =
+ ext_extended_dynamic_state_3_blend ? VK_TRUE : VK_FALSE,
+ .extendedDynamicState3RasterizationStream = VK_FALSE,
+ .extendedDynamicState3ConservativeRasterizationMode = VK_FALSE,
+ .extendedDynamicState3ExtraPrimitiveOverestimationSize = VK_FALSE,
+ .extendedDynamicState3DepthClipEnable = VK_FALSE,
+ .extendedDynamicState3SampleLocationsEnable = VK_FALSE,
+ .extendedDynamicState3ColorBlendAdvanced = VK_FALSE,
+ .extendedDynamicState3ProvokingVertexMode = VK_FALSE,
+ .extendedDynamicState3LineRasterizationMode = VK_FALSE,
+ .extendedDynamicState3LineStippleEnable = VK_FALSE,
+ .extendedDynamicState3DepthClipNegativeOneToOne = VK_FALSE,
+ .extendedDynamicState3ViewportWScalingEnable = VK_FALSE,
+ .extendedDynamicState3ViewportSwizzle = VK_FALSE,
+ .extendedDynamicState3CoverageToColorEnable = VK_FALSE,
+ .extendedDynamicState3CoverageToColorLocation = VK_FALSE,
+ .extendedDynamicState3CoverageModulationMode = VK_FALSE,
+ .extendedDynamicState3CoverageModulationTableEnable = VK_FALSE,
+ .extendedDynamicState3CoverageModulationTable = VK_FALSE,
+ .extendedDynamicState3CoverageReductionMode = VK_FALSE,
+ .extendedDynamicState3RepresentativeFragmentTestEnable = VK_FALSE,
+ .extendedDynamicState3ShadingRateImageEnable = VK_FALSE,
+ };
+ SetNext(next, dynamic_state_3);
+ } else {
+ LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state 3");
+ }
+
VkPhysicalDeviceLineRasterizationFeaturesEXT line_raster;
if (ext_line_rasterization) {
line_raster = {
@@ -695,6 +756,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
CollectToolingInfo();
if (driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR) {
+ const u32 nv_major_version = (properties.driverVersion >> 22) & 0x3ff;
+
const auto arch = GetNvidiaArchitecture(physical, supported_extensions);
switch (arch) {
case NvidiaArchitecture::AmpereOrNewer:
@@ -704,11 +767,13 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
case NvidiaArchitecture::Turing:
break;
case NvidiaArchitecture::VoltaOrOlder:
- LOG_WARNING(Render_Vulkan, "Blacklisting Volta and older from VK_KHR_push_descriptor");
- khr_push_descriptor = false;
+ if (nv_major_version < 527) {
+ LOG_WARNING(Render_Vulkan,
+ "Blacklisting Volta and older from VK_KHR_push_descriptor");
+ khr_push_descriptor = false;
+ }
break;
}
- const u32 nv_major_version = (properties.driverVersion >> 22) & 0x3ff;
if (nv_major_version >= 510) {
LOG_WARNING(Render_Vulkan, "NVIDIA Drivers >= 510 do not support MSAA image blits");
cant_blit_msaa = true;
@@ -735,6 +800,16 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
ext_vertex_input_dynamic_state = false;
}
}
+ if (ext_extended_dynamic_state_2 && is_radv) {
+ const u32 version = (properties.driverVersion << 3) >> 3;
+ if (version < VK_MAKE_API_VERSION(0, 22, 3, 1)) {
+ LOG_WARNING(
+ Render_Vulkan,
+ "RADV versions older than 22.3.1 have broken VK_EXT_extended_dynamic_state2");
+ ext_extended_dynamic_state_2 = false;
+ ext_extended_dynamic_state_2_extra = false;
+ }
+ }
sets_per_pool = 64;
const bool is_amd =
@@ -763,8 +838,11 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
const bool is_intel_windows = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS;
const bool is_intel_anv = driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA;
if (ext_vertex_input_dynamic_state && is_intel_windows) {
- LOG_WARNING(Render_Vulkan, "Blacklisting Intel for VK_EXT_vertex_input_dynamic_state");
- ext_vertex_input_dynamic_state = false;
+ const u32 version = (properties.driverVersion << 3) >> 3;
+ if (version < VK_MAKE_API_VERSION(27, 20, 100, 0)) {
+ LOG_WARNING(Render_Vulkan, "Blacklisting Intel for VK_EXT_vertex_input_dynamic_state");
+ ext_vertex_input_dynamic_state = false;
+ }
}
if (is_float16_supported && is_intel_windows) {
// Intel's compiler crashes when using fp16 on Astral Chain, disable it for the time being.
@@ -1024,6 +1102,8 @@ void Device::CheckSuitability(bool requires_swapchain) const {
std::make_pair(features.vertexPipelineStoresAndAtomics, "vertexPipelineStoresAndAtomics"),
std::make_pair(features.imageCubeArray, "imageCubeArray"),
std::make_pair(features.independentBlend, "independentBlend"),
+ std::make_pair(features.multiDrawIndirect, "multiDrawIndirect"),
+ std::make_pair(features.drawIndirectFirstInstance, "drawIndirectFirstInstance"),
std::make_pair(features.depthClamp, "depthClamp"),
std::make_pair(features.samplerAnisotropy, "samplerAnisotropy"),
std::make_pair(features.largePoints, "largePoints"),
@@ -1089,6 +1169,8 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
bool has_ext_transform_feedback{};
bool has_ext_custom_border_color{};
bool has_ext_extended_dynamic_state{};
+ bool has_ext_extended_dynamic_state_2{};
+ bool has_ext_extended_dynamic_state_3{};
bool has_ext_shader_atomic_int64{};
bool has_ext_provoking_vertex{};
bool has_ext_vertex_input_dynamic_state{};
@@ -1117,6 +1199,7 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
test(khr_spirv_1_4, VK_KHR_SPIRV_1_4_EXTENSION_NAME, true);
test(khr_push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, true);
test(has_khr_shader_float16_int8, VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, false);
+ test(khr_draw_indirect_count, VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, true);
test(ext_depth_range_unrestricted, VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME, true);
test(ext_index_type_uint8, VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME, true);
test(has_ext_primitive_topology_list_restart,
@@ -1132,6 +1215,10 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
test(has_ext_transform_feedback, VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, false);
test(has_ext_custom_border_color, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME, false);
test(has_ext_extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, false);
+ test(has_ext_extended_dynamic_state_2, VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME,
+ false);
+ test(has_ext_extended_dynamic_state_3, VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME,
+ false);
test(has_ext_subgroup_size_control, VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME, true);
test(has_ext_provoking_vertex, VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME, false);
test(has_ext_vertex_input_dynamic_state, VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME,
@@ -1281,6 +1368,44 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
ext_extended_dynamic_state = true;
}
}
+ if (has_ext_extended_dynamic_state_2) {
+ VkPhysicalDeviceExtendedDynamicState2FeaturesEXT extended_dynamic_state_2;
+ extended_dynamic_state_2.sType =
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT;
+ extended_dynamic_state_2.pNext = nullptr;
+ features.pNext = &extended_dynamic_state_2;
+ physical.GetFeatures2(features);
+
+ if (extended_dynamic_state_2.extendedDynamicState2) {
+ extensions.push_back(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
+ ext_extended_dynamic_state_2 = true;
+ ext_extended_dynamic_state_2_extra =
+ extended_dynamic_state_2.extendedDynamicState2LogicOp;
+ }
+ }
+ if (has_ext_extended_dynamic_state_3) {
+ VkPhysicalDeviceExtendedDynamicState3FeaturesEXT extended_dynamic_state_3;
+ extended_dynamic_state_3.sType =
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT;
+ extended_dynamic_state_3.pNext = nullptr;
+ features.pNext = &extended_dynamic_state_3;
+ physical.GetFeatures2(features);
+
+ ext_extended_dynamic_state_3_blend =
+ extended_dynamic_state_3.extendedDynamicState3ColorBlendEnable &&
+ extended_dynamic_state_3.extendedDynamicState3ColorBlendEquation &&
+ extended_dynamic_state_3.extendedDynamicState3ColorWriteMask;
+
+ ext_extended_dynamic_state_3_enables =
+ extended_dynamic_state_3.extendedDynamicState3DepthClampEnable &&
+ extended_dynamic_state_3.extendedDynamicState3LogicOpEnable;
+
+ ext_extended_dynamic_state_3 =
+ ext_extended_dynamic_state_3_blend || ext_extended_dynamic_state_3_enables;
+ if (ext_extended_dynamic_state_3) {
+ extensions.push_back(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
+ }
+ }
if (has_ext_line_rasterization) {
VkPhysicalDeviceLineRasterizationFeaturesEXT line_raster;
line_raster.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT;
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index 6a26c4e6e..920a8f4e3 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -286,6 +286,30 @@ public:
return ext_extended_dynamic_state;
}
+ /// Returns true if the device supports VK_EXT_extended_dynamic_state2.
+ bool IsExtExtendedDynamicState2Supported() const {
+ return ext_extended_dynamic_state_2;
+ }
+
+ bool IsExtExtendedDynamicState2ExtrasSupported() const {
+ return ext_extended_dynamic_state_2_extra;
+ }
+
+ /// Returns true if the device supports VK_EXT_extended_dynamic_state3.
+ bool IsExtExtendedDynamicState3Supported() const {
+ return ext_extended_dynamic_state_3;
+ }
+
+ /// Returns true if the device supports VK_EXT_extended_dynamic_state3.
+ bool IsExtExtendedDynamicState3BlendingSupported() const {
+ return ext_extended_dynamic_state_3_blend;
+ }
+
+ /// Returns true if the device supports VK_EXT_extended_dynamic_state3.
+ bool IsExtExtendedDynamicState3EnablesSupported() const {
+ return ext_extended_dynamic_state_3_enables;
+ }
+
/// Returns true if the device supports VK_EXT_line_rasterization.
bool IsExtLineRasterizationSupported() const {
return ext_line_rasterization;
@@ -451,6 +475,7 @@ private:
bool nv_viewport_swizzle{}; ///< Support for VK_NV_viewport_swizzle.
bool nv_viewport_array2{}; ///< Support for VK_NV_viewport_array2.
bool nv_geometry_shader_passthrough{}; ///< Support for VK_NV_geometry_shader_passthrough.
+ bool khr_draw_indirect_count{}; ///< Support for VK_KHR_draw_indirect_count.
bool khr_uniform_buffer_standard_layout{}; ///< Support for scalar uniform buffer layouts.
bool khr_spirv_1_4{}; ///< Support for VK_KHR_spirv_1_4.
bool khr_workgroup_memory_explicit_layout{}; ///< Support for explicit workgroup layouts.
@@ -461,28 +486,33 @@ private:
bool ext_sampler_filter_minmax{}; ///< Support for VK_EXT_sampler_filter_minmax.
bool ext_depth_clip_control{}; ///< Support for VK_EXT_depth_clip_control
bool ext_depth_range_unrestricted{}; ///< Support for VK_EXT_depth_range_unrestricted.
- bool ext_shader_viewport_index_layer{}; ///< Support for VK_EXT_shader_viewport_index_layer.
- bool ext_tooling_info{}; ///< Support for VK_EXT_tooling_info.
- bool ext_subgroup_size_control{}; ///< Support for VK_EXT_subgroup_size_control.
- bool ext_transform_feedback{}; ///< Support for VK_EXT_transform_feedback.
- bool ext_custom_border_color{}; ///< Support for VK_EXT_custom_border_color.
- bool ext_extended_dynamic_state{}; ///< Support for VK_EXT_extended_dynamic_state.
- bool ext_line_rasterization{}; ///< Support for VK_EXT_line_rasterization.
- bool ext_vertex_input_dynamic_state{}; ///< Support for VK_EXT_vertex_input_dynamic_state.
- bool ext_shader_stencil_export{}; ///< Support for VK_EXT_shader_stencil_export.
- bool ext_shader_atomic_int64{}; ///< Support for VK_KHR_shader_atomic_int64.
- bool ext_conservative_rasterization{}; ///< Support for VK_EXT_conservative_rasterization.
- bool ext_provoking_vertex{}; ///< Support for VK_EXT_provoking_vertex.
- bool ext_memory_budget{}; ///< Support for VK_EXT_memory_budget.
- bool nv_device_diagnostics_config{}; ///< Support for VK_NV_device_diagnostics_config.
- bool has_broken_cube_compatibility{}; ///< Has broken cube compatiblity bit
- bool has_renderdoc{}; ///< Has RenderDoc attached
- bool has_nsight_graphics{}; ///< Has Nsight Graphics attached
- bool supports_d24_depth{}; ///< Supports D24 depth buffers.
- bool cant_blit_msaa{}; ///< Does not support MSAA<->MSAA blitting.
- bool must_emulate_bgr565{}; ///< Emulates BGR565 by swizzling RGB565 format.
- u32 max_vertex_input_attributes{}; ///< Max vertex input attributes in pipeline
- u32 max_vertex_input_bindings{}; ///< Max vertex input buffers in pipeline
+ bool ext_shader_viewport_index_layer{}; ///< Support for VK_EXT_shader_viewport_index_layer.
+ bool ext_tooling_info{}; ///< Support for VK_EXT_tooling_info.
+ bool ext_subgroup_size_control{}; ///< Support for VK_EXT_subgroup_size_control.
+ bool ext_transform_feedback{}; ///< Support for VK_EXT_transform_feedback.
+ bool ext_custom_border_color{}; ///< Support for VK_EXT_custom_border_color.
+ bool ext_extended_dynamic_state{}; ///< Support for VK_EXT_extended_dynamic_state.
+ bool ext_extended_dynamic_state_2{}; ///< Support for VK_EXT_extended_dynamic_state2.
+ bool ext_extended_dynamic_state_2_extra{}; ///< Support for VK_EXT_extended_dynamic_state2.
+ bool ext_extended_dynamic_state_3{}; ///< Support for VK_EXT_extended_dynamic_state3.
+ bool ext_extended_dynamic_state_3_blend{}; ///< Support for VK_EXT_extended_dynamic_state3.
+ bool ext_extended_dynamic_state_3_enables{}; ///< Support for VK_EXT_extended_dynamic_state3.
+ bool ext_line_rasterization{}; ///< Support for VK_EXT_line_rasterization.
+ bool ext_vertex_input_dynamic_state{}; ///< Support for VK_EXT_vertex_input_dynamic_state.
+ bool ext_shader_stencil_export{}; ///< Support for VK_EXT_shader_stencil_export.
+ bool ext_shader_atomic_int64{}; ///< Support for VK_KHR_shader_atomic_int64.
+ bool ext_conservative_rasterization{}; ///< Support for VK_EXT_conservative_rasterization.
+ bool ext_provoking_vertex{}; ///< Support for VK_EXT_provoking_vertex.
+ bool ext_memory_budget{}; ///< Support for VK_EXT_memory_budget.
+ bool nv_device_diagnostics_config{}; ///< Support for VK_NV_device_diagnostics_config.
+ bool has_broken_cube_compatibility{}; ///< Has broken cube compatiblity bit
+ bool has_renderdoc{}; ///< Has RenderDoc attached
+ bool has_nsight_graphics{}; ///< Has Nsight Graphics attached
+ bool supports_d24_depth{}; ///< Supports D24 depth buffers.
+ bool cant_blit_msaa{}; ///< Does not support MSAA<->MSAA blitting.
+ bool must_emulate_bgr565{}; ///< Emulates BGR565 by swizzling RGB565 format.
+ u32 max_vertex_input_attributes{}; ///< Max vertex input attributes in pipeline
+ u32 max_vertex_input_bindings{}; ///< Max vertex input buffers in pipeline
// Telemetry parameters
std::string vendor_name; ///< Device's driver name.
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp
index 7dca7341c..861767c13 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp
+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp
@@ -94,6 +94,10 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {
X(vkCmdDispatch);
X(vkCmdDraw);
X(vkCmdDrawIndexed);
+ X(vkCmdDrawIndirect);
+ X(vkCmdDrawIndexedIndirect);
+ X(vkCmdDrawIndirectCountKHR);
+ X(vkCmdDrawIndexedIndirectCountKHR);
X(vkCmdEndQuery);
X(vkCmdEndRenderPass);
X(vkCmdEndTransformFeedbackEXT);
@@ -118,12 +122,22 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {
X(vkCmdSetDepthCompareOpEXT);
X(vkCmdSetDepthTestEnableEXT);
X(vkCmdSetDepthWriteEnableEXT);
+ X(vkCmdSetPrimitiveRestartEnableEXT);
+ X(vkCmdSetRasterizerDiscardEnableEXT);
+ X(vkCmdSetDepthBiasEnableEXT);
+ X(vkCmdSetLogicOpEnableEXT);
+ X(vkCmdSetDepthClampEnableEXT);
X(vkCmdSetFrontFaceEXT);
+ X(vkCmdSetLogicOpEXT);
+ X(vkCmdSetPatchControlPointsEXT);
X(vkCmdSetLineWidth);
X(vkCmdSetPrimitiveTopologyEXT);
X(vkCmdSetStencilOpEXT);
X(vkCmdSetStencilTestEnableEXT);
X(vkCmdSetVertexInputEXT);
+ X(vkCmdSetColorWriteMaskEXT);
+ X(vkCmdSetColorBlendEnableEXT);
+ X(vkCmdSetColorBlendEquationEXT);
X(vkCmdResolveImage);
X(vkCreateBuffer);
X(vkCreateBufferView);
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h
index 8bd4fd4d9..accfad8c1 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.h
+++ b/src/video_core/vulkan_common/vulkan_wrapper.h
@@ -213,6 +213,10 @@ struct DeviceDispatch : InstanceDispatch {
PFN_vkCmdDispatch vkCmdDispatch{};
PFN_vkCmdDraw vkCmdDraw{};
PFN_vkCmdDrawIndexed vkCmdDrawIndexed{};
+ PFN_vkCmdDrawIndirect vkCmdDrawIndirect{};
+ PFN_vkCmdDrawIndexedIndirect vkCmdDrawIndexedIndirect{};
+ PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR{};
+ PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR{};
PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT{};
PFN_vkCmdEndQuery vkCmdEndQuery{};
PFN_vkCmdEndRenderPass vkCmdEndRenderPass{};
@@ -230,8 +234,15 @@ struct DeviceDispatch : InstanceDispatch {
PFN_vkCmdSetDepthCompareOpEXT vkCmdSetDepthCompareOpEXT{};
PFN_vkCmdSetDepthTestEnableEXT vkCmdSetDepthTestEnableEXT{};
PFN_vkCmdSetDepthWriteEnableEXT vkCmdSetDepthWriteEnableEXT{};
+ PFN_vkCmdSetPrimitiveRestartEnableEXT vkCmdSetPrimitiveRestartEnableEXT{};
+ PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT{};
+ PFN_vkCmdSetDepthBiasEnableEXT vkCmdSetDepthBiasEnableEXT{};
+ PFN_vkCmdSetLogicOpEnableEXT vkCmdSetLogicOpEnableEXT{};
+ PFN_vkCmdSetDepthClampEnableEXT vkCmdSetDepthClampEnableEXT{};
PFN_vkCmdSetEvent vkCmdSetEvent{};
PFN_vkCmdSetFrontFaceEXT vkCmdSetFrontFaceEXT{};
+ PFN_vkCmdSetPatchControlPointsEXT vkCmdSetPatchControlPointsEXT{};
+ PFN_vkCmdSetLogicOpEXT vkCmdSetLogicOpEXT{};
PFN_vkCmdSetLineWidth vkCmdSetLineWidth{};
PFN_vkCmdSetPrimitiveTopologyEXT vkCmdSetPrimitiveTopologyEXT{};
PFN_vkCmdSetScissor vkCmdSetScissor{};
@@ -242,6 +253,9 @@ struct DeviceDispatch : InstanceDispatch {
PFN_vkCmdSetStencilWriteMask vkCmdSetStencilWriteMask{};
PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT{};
PFN_vkCmdSetViewport vkCmdSetViewport{};
+ PFN_vkCmdSetColorWriteMaskEXT vkCmdSetColorWriteMaskEXT{};
+ PFN_vkCmdSetColorBlendEnableEXT vkCmdSetColorBlendEnableEXT{};
+ PFN_vkCmdSetColorBlendEquationEXT vkCmdSetColorBlendEquationEXT{};
PFN_vkCmdWaitEvents vkCmdWaitEvents{};
PFN_vkCreateBuffer vkCreateBuffer{};
PFN_vkCreateBufferView vkCreateBufferView{};
@@ -1019,6 +1033,29 @@ public:
first_instance);
}
+ void DrawIndirect(VkBuffer src_buffer, VkDeviceSize src_offset, u32 draw_count,
+ u32 stride) const noexcept {
+ dld->vkCmdDrawIndirect(handle, src_buffer, src_offset, draw_count, stride);
+ }
+
+ void DrawIndexedIndirect(VkBuffer src_buffer, VkDeviceSize src_offset, u32 draw_count,
+ u32 stride) const noexcept {
+ dld->vkCmdDrawIndexedIndirect(handle, src_buffer, src_offset, draw_count, stride);
+ }
+
+ void DrawIndirectCount(VkBuffer src_buffer, VkDeviceSize src_offset, VkBuffer count_buffer,
+ VkDeviceSize count_offset, u32 draw_count, u32 stride) const noexcept {
+ dld->vkCmdDrawIndirectCountKHR(handle, src_buffer, src_offset, count_buffer, count_offset,
+ draw_count, stride);
+ }
+
+ void DrawIndexedIndirectCount(VkBuffer src_buffer, VkDeviceSize src_offset,
+ VkBuffer count_buffer, VkDeviceSize count_offset, u32 draw_count,
+ u32 stride) const noexcept {
+ dld->vkCmdDrawIndexedIndirectCountKHR(handle, src_buffer, src_offset, count_buffer,
+ count_offset, draw_count, stride);
+ }
+
void ClearAttachments(Span<VkClearAttachment> attachments,
Span<VkClearRect> rects) const noexcept {
dld->vkCmdClearAttachments(handle, attachments.size(), attachments.data(), rects.size(),
@@ -1192,10 +1229,51 @@ public:
dld->vkCmdSetDepthWriteEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
}
+ void SetPrimitiveRestartEnableEXT(bool enable) const noexcept {
+ dld->vkCmdSetPrimitiveRestartEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
+ }
+
+ void SetRasterizerDiscardEnableEXT(bool enable) const noexcept {
+ dld->vkCmdSetRasterizerDiscardEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
+ }
+
+ void SetDepthBiasEnableEXT(bool enable) const noexcept {
+ dld->vkCmdSetDepthBiasEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
+ }
+
+ void SetLogicOpEnableEXT(bool enable) const noexcept {
+ dld->vkCmdSetLogicOpEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
+ }
+
+ void SetDepthClampEnableEXT(bool enable) const noexcept {
+ dld->vkCmdSetDepthClampEnableEXT(handle, enable ? VK_TRUE : VK_FALSE);
+ }
+
void SetFrontFaceEXT(VkFrontFace front_face) const noexcept {
dld->vkCmdSetFrontFaceEXT(handle, front_face);
}
+ void SetLogicOpEXT(VkLogicOp logic_op) const noexcept {
+ dld->vkCmdSetLogicOpEXT(handle, logic_op);
+ }
+
+ void SetPatchControlPointsEXT(uint32_t patch_control_points) const noexcept {
+ dld->vkCmdSetPatchControlPointsEXT(handle, patch_control_points);
+ }
+
+ void SetColorWriteMaskEXT(u32 first, Span<VkColorComponentFlags> masks) const noexcept {
+ dld->vkCmdSetColorWriteMaskEXT(handle, first, masks.size(), masks.data());
+ }
+
+ void SetColorBlendEnableEXT(u32 first, Span<VkBool32> enables) const noexcept {
+ dld->vkCmdSetColorBlendEnableEXT(handle, first, enables.size(), enables.data());
+ }
+
+ void SetColorBlendEquationEXT(u32 first,
+ Span<VkColorBlendEquationEXT> equations) const noexcept {
+ dld->vkCmdSetColorBlendEquationEXT(handle, first, equations.size(), equations.data());
+ }
+
void SetLineWidth(float line_width) const noexcept {
dld->vkCmdSetLineWidth(handle, line_width);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:23:01 +0200