Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vulkan2021/vkcv-framework
1 result
Show changes
...@@ -51,12 +51,6 @@ namespace vkcv ...@@ -51,12 +51,6 @@ namespace vkcv
* @return vk flag of the DescriptorType * @return vk flag of the DescriptorType
*/ */
static vk::DescriptorType convertDescriptorTypeFlag(DescriptorType type); static vk::DescriptorType convertDescriptorTypeFlag(DescriptorType type);
/**
* Converts the flags of the shader stages from VulkanCV (vkcv) to Vulkan (vk).
* @param[in] vkcv flag of the ShaderStage (see ShaderProgram.hpp)
* @return vk flag of the ShaderStage
*/
static vk::ShaderStageFlagBits convertShaderStageFlag(ShaderStage stage);
/** /**
* Destroys a specific resource description * Destroys a specific resource description
......
...@@ -52,8 +52,6 @@ namespace vkcv { ...@@ -52,8 +52,6 @@ namespace vkcv {
} }
} }
struct MeshShaderFunctions struct MeshShaderFunctions
{ {
PFN_vkCmdDrawMeshTasksNV cmdDrawMeshTasks = nullptr; PFN_vkCmdDrawMeshTasksNV cmdDrawMeshTasks = nullptr;
......
This diff is collapsed.
This diff is collapsed.
...@@ -387,7 +387,7 @@ namespace vkcv { ...@@ -387,7 +387,7 @@ namespace vkcv {
const size_t max_size = std::min(size, image_size); const size_t max_size = std::min(size, image_size);
BufferHandle bufferHandle = m_bufferManager.createBuffer( BufferHandle bufferHandle = m_bufferManager.createBuffer(
BufferType::STAGING, max_size, BufferMemoryType::HOST_VISIBLE BufferType::STAGING, max_size, BufferMemoryType::HOST_VISIBLE, false
); );
m_bufferManager.fillBuffer(bufferHandle, data, max_size, 0); m_bufferManager.fillBuffer(bufferHandle, data, max_size, 0);
......
...@@ -44,7 +44,7 @@ namespace vkcv { ...@@ -44,7 +44,7 @@ namespace vkcv {
std::vector<int> prios; std::vector<int> prios;
for(auto flag: queueFlags) { for(auto flag: queueFlags) {
int prioCount = 0; int prioCount = 0;
for (int i = 0; i < qFamilyProperties.size(); i++) { for (size_t i = 0; i < qFamilyProperties.size(); i++) {
prioCount += (static_cast<uint32_t>(flag & qFamilyProperties[i].queueFlags) != 0) * qFamilyProperties[i].queueCount; prioCount += (static_cast<uint32_t>(flag & qFamilyProperties[i].queueFlags) != 0) * qFamilyProperties[i].queueCount;
} }
prios.push_back(prioCount); prios.push_back(prioCount);
...@@ -65,10 +65,14 @@ namespace vkcv { ...@@ -65,10 +65,14 @@ namespace vkcv {
std::vector<std::vector<int>> queueFamilyStatus, initialQueueFamilyStatus; std::vector<std::vector<int>> queueFamilyStatus, initialQueueFamilyStatus;
for (auto qFamily : qFamilyProperties) { for (auto qFamily : qFamilyProperties) {
int graphicsCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eGraphics) != 0) * qFamily.queueCount; auto graphicsCount = static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eGraphics) != 0? qFamily.queueCount : 0;
int computeCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eCompute) != 0) * qFamily.queueCount; auto computeCount = static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eCompute) != 0? qFamily.queueCount : 0;
int transferCount = int(static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eTransfer) != 0) * qFamily.queueCount; auto transferCount = static_cast<uint32_t>(qFamily.queueFlags & vk::QueueFlagBits::eTransfer) != 0? qFamily.queueCount : 0;
queueFamilyStatus.push_back({graphicsCount, computeCount, transferCount}); queueFamilyStatus.push_back({
static_cast<int>(graphicsCount),
static_cast<int>(computeCount),
static_cast<int>(transferCount)
});
} }
initialQueueFamilyStatus = queueFamilyStatus; initialQueueFamilyStatus = queueFamilyStatus;
......
This diff is collapsed.
This diff is collapsed.