diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-22 15:47:21 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-26 16:24:10 -0600 |
| commit | da0b0d7eedb33c0f7093c7092f0fdc963315668d (patch) | |
| tree | 2a892911cad8e97dc94676f81eaeb81f892befd7 | |
| parent | d0be967d32a242a09d769902b7e4b79b3e326e2e (diff) | |
| download | usermoji-da0b0d7eedb33c0f7093c7092f0fdc963315668d.tar.xz | |
Bug 14789: Clean up limit structure
| -rw-r--r-- | demos/vulkaninfo.c | 9 | ||||
| -rw-r--r-- | include/vulkan.h | 17 |
2 files changed, 13 insertions, 13 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index a1f17168..482f27ae 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -818,13 +818,12 @@ static void app_dump_limits(const VkPhysicalDeviceLimits *limits) printf("\t\tmaxImageDimensionCube = 0x%" PRIxLEAST32 "\n", limits->maxImageDimensionCube ); printf("\t\tmaxImageArrayLayers = 0x%" PRIxLEAST32 "\n", limits->maxImageArrayLayers ); printf("\t\tmaxTexelBufferSize = 0x%" PRIxLEAST32 "\n", limits->maxTexelBufferSize ); - printf("\t\tmaxUniformBufferSize = 0x%" PRIxLEAST32 "\n", limits->maxUniformBufferSize ); - printf("\t\tmaxStorageBufferSize = 0x%" PRIxLEAST32 "\n", limits->maxStorageBufferSize ); + printf("\t\tmaxUniformBufferRange = 0x%" PRIxLEAST32 "\n", limits->maxUniformBufferRange ); + printf("\t\tmaxStorageBufferRange = 0x%" PRIxLEAST32 "\n", limits->maxStorageBufferRange ); printf("\t\tmaxPushConstantsSize = 0x%" PRIxLEAST32 "\n", limits->maxPushConstantsSize ); printf("\t\tmaxMemoryAllocationCount = 0x%" PRIxLEAST32 "\n", limits->maxMemoryAllocationCount ); printf("\t\tbufferImageGranularity = 0x%" PRIxLEAST64 "\n", limits->bufferImageGranularity ); printf("\t\tmaxBoundDescriptorSets = 0x%" PRIxLEAST32 "\n", limits->maxBoundDescriptorSets ); - printf("\t\tmaxDescriptorSets = 0x%" PRIxLEAST32 "\n", limits->maxDescriptorSets ); printf("\t\tmaxPerStageDescriptorSamplers = 0x%" PRIxLEAST32 "\n", limits->maxPerStageDescriptorSamplers ); printf("\t\tmaxPerStageDescriptorUniformBuffers = 0x%" PRIxLEAST32 "\n", limits->maxPerStageDescriptorUniformBuffers ); printf("\t\tmaxPerStageDescriptorStorageBuffers = 0x%" PRIxLEAST32 "\n", limits->maxPerStageDescriptorStorageBuffers ); @@ -853,8 +852,8 @@ static void app_dump_limits(const VkPhysicalDeviceLimits *limits) printf("\t\tmaxGeometryOutputVertices = 0x%" PRIxLEAST32 "\n", limits->maxGeometryOutputVertices ); printf("\t\tmaxGeometryTotalOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxGeometryTotalOutputComponents ); printf("\t\tmaxFragmentInputComponents = 0x%" PRIxLEAST32 "\n", limits->maxFragmentInputComponents ); - printf("\t\tmaxFragmentOutputBuffers = 0x%" PRIxLEAST32 "\n", limits->maxFragmentOutputBuffers ); - printf("\t\tmaxFragmentDualSourceBuffers = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSourceBuffers ); + printf("\t\tmaxFragmentOutputAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentOutputAttachments ); + printf("\t\tmaxFragmentDualSourceAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSourceAttachments ); printf("\t\tmaxFragmentCombinedOutputResources = 0x%" PRIxLEAST32 "\n", limits->maxFragmentCombinedOutputResources ); printf("\t\tmaxComputeSharedMemorySize = 0x%" PRIxLEAST32 "\n", limits->maxComputeSharedMemorySize ); printf("\t\tmaxComputeWorkGroupCount[0] = 0x%" PRIxLEAST32 "\n", limits->maxComputeWorkGroupCount[0] ); diff --git a/include/vulkan.h b/include/vulkan.h index dc530098..ceac03a6 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1125,6 +1125,9 @@ typedef struct { VkBool32 depthBounds; VkBool32 wideLines; VkBool32 largePoints; + VkBool32 alphaToOne; + VkBool32 multiViewport; + VkBool32 samplerAnisotropy; VkBool32 textureCompressionETC2; VkBool32 textureCompressionASTC_LDR; VkBool32 textureCompressionBC; @@ -1150,7 +1153,6 @@ typedef struct { VkBool32 shaderInt16; VkBool32 shaderResourceResidency; VkBool32 shaderResourceMinLOD; - VkBool32 alphaToOne; VkBool32 sparseBinding; VkBool32 sparseResidencyBuffer; VkBool32 sparseResidencyImage2D; @@ -1190,14 +1192,13 @@ typedef struct { uint32_t maxImageArrayLayers; VkSampleCountFlags sampleCounts; uint32_t maxTexelBufferSize; - uint32_t maxUniformBufferSize; - uint32_t maxStorageBufferSize; + uint32_t maxUniformBufferRange; + uint32_t maxStorageBufferRange; uint32_t maxPushConstantsSize; uint32_t maxMemoryAllocationCount; VkDeviceSize bufferImageGranularity; VkDeviceSize sparseAddressSpaceSize; uint32_t maxBoundDescriptorSets; - uint32_t maxDescriptorSets; uint32_t maxPerStageDescriptorSamplers; uint32_t maxPerStageDescriptorUniformBuffers; uint32_t maxPerStageDescriptorStorageBuffers; @@ -1229,8 +1230,8 @@ typedef struct { uint32_t maxGeometryOutputVertices; uint32_t maxGeometryTotalOutputComponents; uint32_t maxFragmentInputComponents; - uint32_t maxFragmentOutputBuffers; - uint32_t maxFragmentDualSourceBuffers; + uint32_t maxFragmentOutputAttachments; + uint32_t maxFragmentDualSourceAttachments; uint32_t maxFragmentCombinedOutputResources; uint32_t maxComputeSharedMemorySize; uint32_t maxComputeWorkGroupCount[3]; @@ -1252,9 +1253,9 @@ typedef struct { uint32_t minTexelBufferOffsetAlignment; uint32_t minUniformBufferOffsetAlignment; uint32_t minStorageBufferOffsetAlignment; - uint32_t minTexelOffset; + int32_t minTexelOffset; uint32_t maxTexelOffset; - uint32_t minTexelGatherOffset; + int32_t minTexelGatherOffset; uint32_t maxTexelGatherOffset; float minInterpolationOffset; float maxInterpolationOffset; |