Skip to content

S
swiftshader
Commit abdfa17a by Chris Forbes
Options

Fix inconsistencies in advertised dimensions vs levels

Level count was off by one for the size. Also change vk::MAX_IMAGE_ARRAY_LAYERS to be the actual value rather than log2 -- this was a bug waiting to happen somewhere. Bug: b/118429780 Change-Id: I783a11571f90c34302a4ead8476009d309880eb6 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26508Tested-by: 's avatarChris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent d2b1d2f9
Showing with 15 additions and 15 deletions
src/Vulkan/VkConfig.h
...@@ -50,7 +50,7 @@ enum ...@@ -50,7 +50,7 @@ enum
MAX_IMAGE_LEVELS_2D = 14, MAX_IMAGE_LEVELS_2D = 14,
MAX_IMAGE_LEVELS_3D = 11, MAX_IMAGE_LEVELS_3D = 11,
MAX_IMAGE_LEVELS_CUBE = 14, MAX_IMAGE_LEVELS_CUBE = 14,
MAX_IMAGE_ARRAY_LAYERS = 11, MAX_IMAGE_ARRAY_LAYERS = 2048,
}; };
enum enum
......
src/Vulkan/VkPhysicalDevice.cpp
...@@ -137,11 +137,11 @@ const VkPhysicalDeviceLimits& PhysicalDevice::getLimits() const ...@@ -137,11 +137,11 @@ const VkPhysicalDeviceLimits& PhysicalDevice::getLimits() const
static const VkPhysicalDeviceLimits limits = static const VkPhysicalDeviceLimits limits =
{ {
(1 << vk::MAX_IMAGE_LEVELS_1D), // maxImageDimension1D 1 << (vk::MAX_IMAGE_LEVELS_1D - 1), // maxImageDimension1D
(1 << vk::MAX_IMAGE_LEVELS_2D), // maxImageDimension2D 1 << (vk::MAX_IMAGE_LEVELS_2D - 1), // maxImageDimension2D
(1 << vk::MAX_IMAGE_LEVELS_3D), // maxImageDimension3D 1 << (vk::MAX_IMAGE_LEVELS_3D - 1), // maxImageDimension3D
(1 << vk::MAX_IMAGE_LEVELS_CUBE), // maxImageDimensionCube 1 << (vk::MAX_IMAGE_LEVELS_CUBE - 1), // maxImageDimensionCube
(1 << vk::MAX_IMAGE_ARRAY_LAYERS), // maxImageArrayLayers vk::MAX_IMAGE_ARRAY_LAYERS, // maxImageArrayLayers
65536, // maxTexelBufferElements 65536, // maxTexelBufferElements
16384, // maxUniformBufferRange 16384, // maxUniformBufferRange
(1ul << 27), // maxStorageBufferRange (1ul << 27), // maxStorageBufferRange
...@@ -607,13 +607,13 @@ void PhysicalDevice::getImageFormatProperties(VkFormat format, VkImageType type, ...@@ -607,13 +607,13 @@ void PhysicalDevice::getImageFormatProperties(VkFormat format, VkImageType type,
VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageUsageFlags usage, VkImageCreateFlags flags,
VkImageFormatProperties* pImageFormatProperties) const VkImageFormatProperties* pImageFormatProperties) const
{ {
pImageFormatProperties->maxArrayLayers = 1 << vk::MAX_IMAGE_ARRAY_LAYERS; pImageFormatProperties->maxArrayLayers = vk::MAX_IMAGE_ARRAY_LAYERS;
switch(type) switch(type)
{ {
case VK_IMAGE_TYPE_1D: case VK_IMAGE_TYPE_1D:
pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_1D; pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_1D;
pImageFormatProperties->maxExtent.width = 1 << vk::MAX_IMAGE_LEVELS_1D; pImageFormatProperties->maxExtent.width = 1 << (vk::MAX_IMAGE_LEVELS_1D - 1);
pImageFormatProperties->maxExtent.height = 1; pImageFormatProperties->maxExtent.height = 1;
pImageFormatProperties->maxExtent.depth = 1; pImageFormatProperties->maxExtent.depth = 1;
break; break;
...@@ -621,23 +621,23 @@ void PhysicalDevice::getImageFormatProperties(VkFormat format, VkImageType type, ...@@ -621,23 +621,23 @@ void PhysicalDevice::getImageFormatProperties(VkFormat format, VkImageType type,
if(flags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) if(flags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT)
{ {
pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_CUBE; pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_CUBE;
pImageFormatProperties->maxExtent.width = 1 << vk::MAX_IMAGE_LEVELS_CUBE; pImageFormatProperties->maxExtent.width = 1 << (vk::MAX_IMAGE_LEVELS_CUBE - 1);
pImageFormatProperties->maxExtent.height = 1 << vk::MAX_IMAGE_LEVELS_CUBE; pImageFormatProperties->maxExtent.height = 1 << (vk::MAX_IMAGE_LEVELS_CUBE - 1);
pImageFormatProperties->maxExtent.depth = 1; pImageFormatProperties->maxExtent.depth = 1;
} }
else else
{ {
pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_2D; pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_2D;
pImageFormatProperties->maxExtent.width = 1 << vk::MAX_IMAGE_LEVELS_2D; pImageFormatProperties->maxExtent.width = 1 << (vk::MAX_IMAGE_LEVELS_2D - 1);
pImageFormatProperties->maxExtent.height = 1 << vk::MAX_IMAGE_LEVELS_2D; pImageFormatProperties->maxExtent.height = 1 << (vk::MAX_IMAGE_LEVELS_2D - 1);
pImageFormatProperties->maxExtent.depth = 1; pImageFormatProperties->maxExtent.depth = 1;
} }
break; break;
case VK_IMAGE_TYPE_3D: case VK_IMAGE_TYPE_3D:
pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_3D; pImageFormatProperties->maxMipLevels = vk::MAX_IMAGE_LEVELS_3D;
pImageFormatProperties->maxExtent.width = 1 << vk::MAX_IMAGE_LEVELS_3D; pImageFormatProperties->maxExtent.width = 1 << (vk::MAX_IMAGE_LEVELS_3D - 1);
pImageFormatProperties->maxExtent.height = 1 << vk::MAX_IMAGE_LEVELS_3D; pImageFormatProperties->maxExtent.height = 1 << (vk::MAX_IMAGE_LEVELS_3D - 1);
pImageFormatProperties->maxExtent.depth = 1 << vk::MAX_IMAGE_LEVELS_3D; pImageFormatProperties->maxExtent.depth = 1 << (vk::MAX_IMAGE_LEVELS_3D - 1);
break; break;
default: default:
UNREACHABLE(type); UNREACHABLE(type);
......
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