Skip to content

S
swiftshader
Commit 131a1ba8 by Alexis Hetu Committed by Alexis Hétu
Options

libVulkan references and deferences structures uselessly

In libVulkan.cpp, many structures are received as pointers, which are dereferenced, only to be references on the next line. We can just take the pointers as is. Bug: b/144943261 Change-Id: I60585ab5e953dc9baf1f6951a3762c890ab95641 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38530 Presubmit-Ready: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 698235ce
Showing with 53 additions and 48 deletions
src/Vulkan/VkDevice.cpp
...@@ -232,6 +232,12 @@ void Device::updateDescriptorSets(uint32_t descriptorWriteCount, const VkWriteDe ...@@ -232,6 +232,12 @@ void Device::updateDescriptorSets(uint32_t descriptorWriteCount, const VkWriteDe
} }
} }
void Device::getRequirements(VkMemoryDedicatedRequirements* requirements) const
{
requirements->prefersDedicatedAllocation = VK_FALSE;
requirements->requiresDedicatedAllocation = VK_FALSE;
}
Device::SamplingRoutineCache* Device::getSamplingRoutineCache() const Device::SamplingRoutineCache* Device::getSamplingRoutineCache() const
{ {
return samplingRoutineCache.get(); return samplingRoutineCache.get();
......
src/Vulkan/VkDevice.hpp
...@@ -56,6 +56,7 @@ public: ...@@ -56,6 +56,7 @@ public:
PhysicalDevice *getPhysicalDevice() const { return physicalDevice; } PhysicalDevice *getPhysicalDevice() const { return physicalDevice; }
void updateDescriptorSets(uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, void updateDescriptorSets(uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites,
uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies); uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies);
void getRequirements(VkMemoryDedicatedRequirements* requirements) const;
const VkPhysicalDeviceFeatures &getEnabledFeatures() const { return enabledFeatures; } const VkPhysicalDeviceFeatures &getEnabledFeatures() const { return enabledFeatures; }
sw::Blitter* getBlitter() const { return blitter.get(); } sw::Blitter* getBlitter() const { return blitter.get(); }
......
src/Vulkan/libVulkan.cpp
...@@ -2448,9 +2448,8 @@ VKAPI_ATTR void VKAPI_CALL vkGetImageMemoryRequirements2(VkDevice device, const ...@@ -2448,9 +2448,8 @@ VKAPI_ATTR void VKAPI_CALL vkGetImageMemoryRequirements2(VkDevice device, const
{ {
case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS: case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS:
{ {
auto& requirements = *reinterpret_cast<VkMemoryDedicatedRequirements*>(extensionRequirements); auto requirements = reinterpret_cast<VkMemoryDedicatedRequirements*>(extensionRequirements);
requirements.prefersDedicatedAllocation = VK_FALSE; vk::Cast(device)->getRequirements(requirements);
requirements.requiresDedicatedAllocation = VK_FALSE;
} }
break; break;
default: default:
...@@ -2481,9 +2480,8 @@ VKAPI_ATTR void VKAPI_CALL vkGetBufferMemoryRequirements2(VkDevice device, const ...@@ -2481,9 +2480,8 @@ VKAPI_ATTR void VKAPI_CALL vkGetBufferMemoryRequirements2(VkDevice device, const
{ {
case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS: case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS:
{ {
auto& requirements = *reinterpret_cast<VkMemoryDedicatedRequirements*>(extensionRequirements); auto requirements = reinterpret_cast<VkMemoryDedicatedRequirements*>(extensionRequirements);
requirements.prefersDedicatedAllocation = VK_FALSE; vk::Cast(device)->getRequirements(requirements);
requirements.requiresDedicatedAllocation = VK_FALSE;
} }
break; break;
default: default:
...@@ -2523,56 +2521,56 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFeatures2(VkPhysicalDevice physica ...@@ -2523,56 +2521,56 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFeatures2(VkPhysicalDevice physica
{ {
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceSamplerYcbcrConversionFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceSamplerYcbcrConversionFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDevice16BitStorageFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDevice16BitStorageFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceVariablePointerFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceVariablePointerFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR:
{ {
auto& features = *reinterpret_cast<VkPhysicalDevice8BitStorageFeaturesKHR*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDevice8BitStorageFeaturesKHR*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceMultiviewFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceMultiviewFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceProtectedMemoryFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceProtectedMemoryFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceShaderDrawParameterFeatures*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceShaderDrawParameterFeatures*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceLineRasterizationFeaturesEXT*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceLineRasterizationFeaturesEXT*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT:
{ {
auto& features = *reinterpret_cast<VkPhysicalDeviceProvokingVertexFeaturesEXT*>(extensionFeatures); auto features = reinterpret_cast<VkPhysicalDeviceProvokingVertexFeaturesEXT*>(extensionFeatures);
vk::Cast(physicalDevice)->getFeatures(&features); vk::Cast(physicalDevice)->getFeatures(features);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT:
...@@ -2610,38 +2608,38 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2(VkPhysicalDevice physi ...@@ -2610,38 +2608,38 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2(VkPhysicalDevice physi
{ {
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceIDProperties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceIDProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceMaintenance3Properties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceMaintenance3Properties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceMultiviewProperties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceMultiviewProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDevicePointClippingProperties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDevicePointClippingProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceProtectedMemoryProperties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceProtectedMemoryProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceSubgroupProperties*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceSubgroupProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT:
...@@ -2655,28 +2653,28 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2(VkPhysicalDevice physi ...@@ -2655,28 +2653,28 @@ VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2(VkPhysicalDevice physi
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceDriverPropertiesKHR*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceDriverPropertiesKHR*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
#ifdef __ANDROID__ #ifdef __ANDROID__
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDevicePresentationPropertiesANDROID*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDevicePresentationPropertiesANDROID*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
#endif #endif
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceLineRasterizationPropertiesEXT*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceLineRasterizationPropertiesEXT*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT:
{ {
auto& properties = *reinterpret_cast<VkPhysicalDeviceProvokingVertexPropertiesEXT*>(extensionProperties); auto properties = reinterpret_cast<VkPhysicalDeviceProvokingVertexPropertiesEXT*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
default: default:
...@@ -2759,14 +2757,14 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2(VkPhysi ...@@ -2759,14 +2757,14 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2(VkPhysi
{ {
case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES: case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkExternalImageFormatProperties*>(extensionProperties); auto properties = reinterpret_cast<VkExternalImageFormatProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(handleType, &properties); vk::Cast(physicalDevice)->getProperties(handleType, properties);
} }
break; break;
case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES: case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES:
{ {
auto& properties = *reinterpret_cast<VkSamplerYcbcrConversionImageFormatProperties*>(extensionProperties); auto properties = reinterpret_cast<VkSamplerYcbcrConversionImageFormatProperties*>(extensionProperties);
vk::Cast(physicalDevice)->getProperties(&properties); vk::Cast(physicalDevice)->getProperties(properties);
} }
break; break;
case VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD: case VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment