vk/0.132: Rename bool32_t -> VkBool32

sed -i 's/bool32_t/VkBool32/g' \
  $(git ls-files src/vulkan include/vulkan)

diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h
index 162ec06092efa8dc20785cae1a0f5d7b70febf47..7ba8d77b875ee23ba3da19a2e2467f193f8c231f 100644 (file)
--- a/include/vulkan/vk_platform.h
+++ b/include/vulkan/vk_platform.h
@@ -68,7 +68,7 @@ extern "C"
 #endif // !defined(VK_NO_STDINT_H)
 
 typedef uint64_t   VkDeviceSize;
-typedef uint32_t   bool32_t;
+typedef uint32_t   VkBool32;
 
 typedef uint32_t   VkSampleMask;
 typedef uint32_t   VkFlags;

diff --git a/include/vulkan/vk_wsi_lunarg.h b/include/vulkan/vk_wsi_lunarg.h
index a439012e2cbe9bf5fcabcb9b84fdea526638ad7f..c1af9f50fb067f2ecb802014ed9b73da0aa91586 100644 (file)
--- a/include/vulkan/vk_wsi_lunarg.h
+++ b/include/vulkan/vk_wsi_lunarg.h
@@ -158,7 +158,7 @@ typedef struct VkSwapChainImageInfoWSI_
 
 typedef struct VkPhysicalDeviceQueuePresentPropertiesWSI_
 {
-    bool32_t                                supportsPresent;    // Tells whether the queue supports presenting
+    VkBool32                                supportsPresent;    // Tells whether the queue supports presenting
 } VkPhysicalDeviceQueuePresentPropertiesWSI;
 
 typedef struct VkPresentInfoWSI_

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index bb78cae9c7941381b6c6266ce76fed9e6937fab8..5070134b2cf8cefaefa2d55e8510ccd34b5a007b 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1125,47 +1125,47 @@ typedef struct {
 } VkInstanceCreateInfo;
 
 typedef struct {
-    bool32_t                                    robustBufferAccess;
-    bool32_t                                    fullDrawIndexUint32;
-    bool32_t                                    imageCubeArray;
-    bool32_t                                    independentBlend;
-    bool32_t                                    geometryShader;
-    bool32_t                                    tessellationShader;
-    bool32_t                                    sampleRateShading;
-    bool32_t                                    dualSourceBlend;
-    bool32_t                                    logicOp;
-    bool32_t                                    instancedDrawIndirect;
-    bool32_t                                    depthClip;
-    bool32_t                                    depthBiasClamp;
-    bool32_t                                    fillModeNonSolid;
-    bool32_t                                    depthBounds;
-    bool32_t                                    wideLines;
-    bool32_t                                    largePoints;
-    bool32_t                                    textureCompressionETC2;
-    bool32_t                                    textureCompressionASTC_LDR;
-    bool32_t                                    textureCompressionBC;
-    bool32_t                                    pipelineStatisticsQuery;
-    bool32_t                                    vertexSideEffects;
-    bool32_t                                    tessellationSideEffects;
-    bool32_t                                    geometrySideEffects;
-    bool32_t                                    fragmentSideEffects;
-    bool32_t                                    shaderTessellationPointSize;
-    bool32_t                                    shaderGeometryPointSize;
-    bool32_t                                    shaderTextureGatherExtended;
-    bool32_t                                    shaderStorageImageExtendedFormats;
-    bool32_t                                    shaderStorageImageMultisample;
-    bool32_t                                    shaderStorageBufferArrayConstantIndexing;
-    bool32_t                                    shaderStorageImageArrayConstantIndexing;
-    bool32_t                                    shaderUniformBufferArrayDynamicIndexing;
-    bool32_t                                    shaderSampledImageArrayDynamicIndexing;
-    bool32_t                                    shaderStorageBufferArrayDynamicIndexing;
-    bool32_t                                    shaderStorageImageArrayDynamicIndexing;
-    bool32_t                                    shaderClipDistance;
-    bool32_t                                    shaderCullDistance;
-    bool32_t                                    shaderFloat64;
-    bool32_t                                    shaderInt64;
-    bool32_t                                    shaderFloat16;
-    bool32_t                                    shaderInt16;
+    VkBool32                                    robustBufferAccess;
+    VkBool32                                    fullDrawIndexUint32;
+    VkBool32                                    imageCubeArray;
+    VkBool32                                    independentBlend;
+    VkBool32                                    geometryShader;
+    VkBool32                                    tessellationShader;
+    VkBool32                                    sampleRateShading;
+    VkBool32                                    dualSourceBlend;
+    VkBool32                                    logicOp;
+    VkBool32                                    instancedDrawIndirect;
+    VkBool32                                    depthClip;
+    VkBool32                                    depthBiasClamp;
+    VkBool32                                    fillModeNonSolid;
+    VkBool32                                    depthBounds;
+    VkBool32                                    wideLines;
+    VkBool32                                    largePoints;
+    VkBool32                                    textureCompressionETC2;
+    VkBool32                                    textureCompressionASTC_LDR;
+    VkBool32                                    textureCompressionBC;
+    VkBool32                                    pipelineStatisticsQuery;
+    VkBool32                                    vertexSideEffects;
+    VkBool32                                    tessellationSideEffects;
+    VkBool32                                    geometrySideEffects;
+    VkBool32                                    fragmentSideEffects;
+    VkBool32                                    shaderTessellationPointSize;
+    VkBool32                                    shaderGeometryPointSize;
+    VkBool32                                    shaderTextureGatherExtended;
+    VkBool32                                    shaderStorageImageExtendedFormats;
+    VkBool32                                    shaderStorageImageMultisample;
+    VkBool32                                    shaderStorageBufferArrayConstantIndexing;
+    VkBool32                                    shaderStorageImageArrayConstantIndexing;
+    VkBool32                                    shaderUniformBufferArrayDynamicIndexing;
+    VkBool32                                    shaderSampledImageArrayDynamicIndexing;
+    VkBool32                                    shaderStorageBufferArrayDynamicIndexing;
+    VkBool32                                    shaderStorageImageArrayDynamicIndexing;
+    VkBool32                                    shaderClipDistance;
+    VkBool32                                    shaderCullDistance;
+    VkBool32                                    shaderFloat64;
+    VkBool32                                    shaderInt64;
+    VkBool32                                    shaderFloat16;
+    VkBool32                                    shaderInt16;
 } VkPhysicalDeviceFeatures;
 
 typedef struct {
@@ -1226,7 +1226,7 @@ typedef struct {
     uint32_t                                    mipmapPrecisionBits;
     uint32_t                                    maxDrawIndexedIndexValue;
     uint32_t                                    maxDrawIndirectInstanceCount;
-    bool32_t                                    primitiveRestartForPatches;
+    VkBool32                                    primitiveRestartForPatches;
     float                                       maxSamplerLodBias;
     uint32_t                                    maxSamplerAnisotropy;
     uint32_t                                    maxViewports;
@@ -1280,7 +1280,7 @@ typedef struct {
 typedef struct {
     VkQueueFlags                                queueFlags;
     uint32_t                                    queueCount;
-    bool32_t                                    supportsTimestamps;
+    VkBool32                                    supportsTimestamps;
 } VkPhysicalDeviceQueueProperties;
 
 typedef struct {
@@ -1549,7 +1549,7 @@ typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
     VkPrimitiveTopology                         topology;
-    bool32_t                                    primitiveRestartEnable;
+    VkBool32                                    primitiveRestartEnable;
 } VkPipelineIaStateCreateInfo;
 
 typedef struct {
@@ -1567,8 +1567,8 @@ typedef struct {
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
-    bool32_t                                    depthClipEnable;
-    bool32_t                                    rasterizerDiscardEnable;
+    VkBool32                                    depthClipEnable;
+    VkBool32                                    rasterizerDiscardEnable;
     VkFillMode                                  fillMode;
     VkCullMode                                  cullMode;
     VkFrontFace                                 frontFace;
@@ -1578,7 +1578,7 @@ typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
     uint32_t                                    rasterSamples;
-    bool32_t                                    sampleShadingEnable;
+    VkBool32                                    sampleShadingEnable;
     float                                       minSampleShading;
     VkSampleMask                                sampleMask;
 } VkPipelineMsStateCreateInfo;
@@ -1594,17 +1594,17 @@ typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
     VkFormat                                    format;
-    bool32_t                                    depthTestEnable;
-    bool32_t                                    depthWriteEnable;
+    VkBool32                                    depthTestEnable;
+    VkBool32                                    depthWriteEnable;
     VkCompareOp                                 depthCompareOp;
-    bool32_t                                    depthBoundsEnable;
-    bool32_t                                    stencilTestEnable;
+    VkBool32                                    depthBoundsEnable;
+    VkBool32                                    stencilTestEnable;
     VkStencilOpState                            front;
     VkStencilOpState                            back;
 } VkPipelineDsStateCreateInfo;
 
 typedef struct {
-    bool32_t                                    blendEnable;
+    VkBool32                                    blendEnable;
     VkFormat                                    format;
     VkBlend                                     srcBlendColor;
     VkBlend                                     destBlendColor;
@@ -1618,8 +1618,8 @@ typedef struct {
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
-    bool32_t                                    alphaToCoverageEnable;
-    bool32_t                                    logicOpEnable;
+    VkBool32                                    alphaToCoverageEnable;
+    VkBool32                                    logicOpEnable;
     VkLogicOp                                   logicOp;
     uint32_t                                    attachmentCount;
     const VkPipelineCbAttachmentState*          pAttachments;
@@ -1680,7 +1680,7 @@ typedef struct {
     VkTexAddress                                addressW;
     float                                       mipLodBias;
     uint32_t                                    maxAnisotropy;
-    bool32_t                                    compareEnable;
+    VkBool32                                    compareEnable;
     VkCompareOp                                 compareOp;
     float                                       minLod;
     float                                       maxLod;
@@ -2013,7 +2013,7 @@ typedef VkResult (VKAPI *PFN_vkQueueBindSparseImageMemory)(VkQueue queue, VkImag
 typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, VkFence* pFence);
 typedef VkResult (VKAPI *PFN_vkResetFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences);
 typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence);
-typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, bool32_t waitAll, uint64_t timeout);
+typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout);
 typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, VkSemaphore* pSemaphore);
 typedef VkResult (VKAPI *PFN_vkQueueSignalSemaphore)(VkQueue queue, VkSemaphore semaphore);
 typedef VkResult (VKAPI *PFN_vkQueueWaitSemaphore)(VkQueue queue, VkSemaphore semaphore);
@@ -2275,7 +2275,7 @@ VkResult VKAPI vkWaitForFences(
     VkDevice                                    device,
     uint32_t                                    fenceCount,
     const VkFence*                              pFences,
-    bool32_t                                    waitAll,
+    VkBool32                                    waitAll,
     uint64_t                                    timeout);
 
 VkResult VKAPI vkCreateSemaphore(

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 43202a0867ffe0d6b86b543ab548621c8794183b..9173d6d5e587ff74454959bff277805eb55c44ca 100644 (file)
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -1461,7 +1461,7 @@ VkResult anv_WaitForFences(
     VkDevice                                    _device,
     uint32_t                                    fenceCount,
     const VkFence*                              pFences,
-    bool32_t                                    waitAll,
+    VkBool32                                    waitAll,
     uint64_t                                    timeout)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);

diff --git a/src/vulkan/pipeline.c b/src/vulkan/pipeline.c
index 8fc6b0daef6275837234cfb325793dc7b44d75c2..6396e6cc0f625bbde9079a3c2aa40973dffe62b0 100644 (file)
--- a/src/vulkan/pipeline.c
+++ b/src/vulkan/pipeline.c
@@ -256,7 +256,7 @@ emit_rs_state(struct anv_pipeline *pipeline,
       .PointWidth = 1.0,
    };
 
-   /* FINISHME: bool32_t rasterizerDiscardEnable; */
+   /* FINISHME: VkBool32 rasterizerDiscardEnable; */
 
    GEN8_3DSTATE_SF_pack(NULL, pipeline->state_sf, &sf);
 
@@ -412,7 +412,7 @@ emit_ds_state(struct anv_pipeline *pipeline,
       return;
    }
 
-   /* bool32_t depthBoundsEnable;          // optional (depth_bounds_test) */
+   /* VkBool32 depthBoundsEnable;          // optional (depth_bounds_test) */
 
    struct GEN8_3DSTATE_WM_DEPTH_STENCIL wm_depth_stencil = {
       .DepthTestEnable = info->depthTestEnable,