claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #730 from hbina/small_change_in_vkdevice

Browse source 
Use explicit ctor, remove unreachable code, and make functions const
This commit is contained in:
Sascha Willems 2020-07-30 21:02:14 +02:00 • committed by GitHub
commit 011109020b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
base/VulkanDevice.hpp
View file

@ -53,14 +53,14 @@ namespace vks
} queueFamilyIndices;
/** @brief Typecast to VkDevice */
operator VkDevice() { return logicalDevice; };
operator VkDevice() const { return logicalDevice; };
/**
* Default constructor
*
* @param physicalDevice Physical device that is to be used
*/
VulkanDevice(VkPhysicalDevice physicalDevice)
explicit VulkanDevice(VkPhysicalDevice physicalDevice)
{
assert(physicalDevice);
this->physicalDevice = physicalDevice;
@ -123,7 +123,7 @@ namespace vks
*
* @throw Throws an exception if memTypeFound is null and no memory type could be found that supports the requested properties
*/
uint32_t getMemoryType(uint32_t typeBits, VkMemoryPropertyFlags properties, VkBool32 *memTypeFound = nullptr)
uint32_t getMemoryType(uint32_t typeBits, VkMemoryPropertyFlags properties, VkBool32 *memTypeFound = nullptr) const
{
for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; i++)
{
@ -161,7 +161,7 @@ namespace vks
*
* @throw Throws an exception if no queue family index could be found that supports the requested flags
*/
uint32_t getQueueFamilyIndex(VkQueueFlagBits queueFlags)
uint32_t getQueueFamilyIndex(VkQueueFlagBits queueFlags) const
{
// Dedicated queue for compute
// Try to find a queue family index that supports compute but not graphics
@ -172,7 +172,6 @@ namespace vks
if ((queueFamilyProperties[i].queueFlags & queueFlags) && ((queueFamilyProperties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) == 0))
{
return i;
break;
}
}
}
@ -186,7 +185,6 @@ namespace vks
if ((queueFamilyProperties[i].queueFlags & queueFlags) && ((queueFamilyProperties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) == 0) && ((queueFamilyProperties[i].queueFlags & VK_QUEUE_COMPUTE_BIT) == 0))
{
return i;
break;
}
}
}
@ -197,7 +195,6 @@ namespace vks
if (queueFamilyProperties[i].queueFlags & queueFlags)
{
return i;
break;
}
}