diff --git a/src/gallium/frontends/lavapipe/lvp_descriptor_set.c b/src/gallium/frontends/lavapipe/lvp_descriptor_set.c index fa0b4282b95..14c501d20f7 100644 --- a/src/gallium/frontends/lavapipe/lvp_descriptor_set.c +++ b/src/gallium/frontends/lavapipe/lvp_descriptor_set.c @@ -683,8 +683,8 @@ VKAPI_ATTR void VKAPI_CALL lvp_UpdateDescriptorSetWithTemplate(VkDevice _device, &set->layout->binding[entry->dstBinding]; struct lvp_descriptor *desc = &set->descriptors[bind_layout->descriptor_index]; - if (entry->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { - desc->type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + if (entry->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { + desc->type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; memcpy(desc->info.uniform + entry->dstArrayElement, pSrc, entry->descriptorCount); continue; } diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 996f86eaf21..83cda4c0d7b 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -742,9 +742,9 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2( continue; switch (ext->sType) { - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT: { - VkPhysicalDevicePrivateDataFeaturesEXT *features = - (VkPhysicalDevicePrivateDataFeaturesEXT *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES: { + VkPhysicalDevicePrivateDataFeatures *features = + (VkPhysicalDevicePrivateDataFeatures *)ext; features->privateData = true; break; } @@ -872,9 +872,9 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2( features->extendedDynamicState = true; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT: { - VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *features = - (VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES: { + VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *features = + (VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *)ext; features->shaderDemoteToHelperInvocation = true; break; } @@ -941,7 +941,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2( break; } case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES: { - VkPhysicalDeviceImageRobustnessFeaturesEXT *features = (VkPhysicalDeviceImageRobustnessFeaturesEXT *)ext; + VkPhysicalDeviceImageRobustnessFeatures *features = (VkPhysicalDeviceImageRobustnessFeatures *)ext; features->robustImageAccess = true; break; } @@ -963,8 +963,8 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2( features->shaderTerminateInvocation = true; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR: { - VkPhysicalDeviceDynamicRenderingFeaturesKHR *features = (VkPhysicalDeviceDynamicRenderingFeaturesKHR *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES: { + VkPhysicalDeviceDynamicRenderingFeatures *features = (VkPhysicalDeviceDynamicRenderingFeatures *)ext; features->dynamicRendering = VK_TRUE; break; } @@ -1056,8 +1056,8 @@ lvp_get_physical_device_properties_1_2(struct lvp_physical_device *pdevice, .patch = 0, }; - p->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR; - p->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR; + p->denormBehaviorIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL; + p->roundingModeIndependence = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL; p->shaderDenormFlushToZeroFloat16 = false; p->shaderDenormPreserveFloat16 = false; p->shaderRoundingModeRTEFloat16 = true; @@ -1212,9 +1212,9 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties2( properties->transformFeedbackDraw = true; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR: { - VkPhysicalDeviceMaintenance4PropertiesKHR *properties = - (VkPhysicalDeviceMaintenance4PropertiesKHR *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES: { + VkPhysicalDeviceMaintenance4Properties *properties = + (VkPhysicalDeviceMaintenance4Properties *)ext; properties->maxBufferSize = UINT32_MAX; break; } @@ -1268,9 +1268,9 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties2( props->maxMultiDrawCount = 2048; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT: { - VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *properties = - (VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES: { + VkPhysicalDeviceTexelBufferAlignmentProperties *properties = + (VkPhysicalDeviceTexelBufferAlignmentProperties *)ext; int alignment = pdevice->pscreen->get_param(pdevice->pscreen, PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT); properties->storageTexelBufferOffsetAlignmentBytes = alignment; properties->storageTexelBufferOffsetSingleTexelAlignment = true; @@ -2250,9 +2250,9 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlotEXT( VkDevice _device, - const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, + const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, - VkPrivateDataSlotEXT* pPrivateDataSlot) + VkPrivateDataSlot* pPrivateDataSlot) { LVP_FROM_HANDLE(lvp_device, device, _device); return vk_private_data_slot_create(&device->vk, pCreateInfo, pAllocator, @@ -2261,7 +2261,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlotEXT( VKAPI_ATTR void VKAPI_CALL lvp_DestroyPrivateDataSlotEXT( VkDevice _device, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator) { LVP_FROM_HANDLE(lvp_device, device, _device); @@ -2272,7 +2272,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_SetPrivateDataEXT( VkDevice _device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t data) { LVP_FROM_HANDLE(lvp_device, device, _device); @@ -2285,7 +2285,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPrivateDataEXT( VkDevice _device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t* pData) { LVP_FROM_HANDLE(lvp_device, device, _device); diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 66ae9a5f2ce..26a39bbc9f1 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -503,26 +503,26 @@ get_viewport_xform(struct rendering_state *state, VK_DYNAMIC_STATE_LINE_STIPPLE_EXT - VK_DYNAMIC_STATE_CULL_MODE_EXT - VK_DYNAMIC_STATE_FRONT_FACE_EXT - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT - VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT - VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT - VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT - VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT - VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT - VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT - VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT - VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT - VK_DYNAMIC_STATE_STENCIL_OP_EXT + VK_DYNAMIC_STATE_CULL_MODE + VK_DYNAMIC_STATE_FRONT_FACE + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY + VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT + VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE + VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP + VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE + VK_DYNAMIC_STATE_STENCIL_OP VK_DYNAMIC_STATE_VERTEX_INPUT_EXT VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT - VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT - VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT + VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE + VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE VK_DYNAMIC_STATE_LOGIC_OP_EXT - VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT */ @@ -533,19 +533,19 @@ static int conv_dynamic_state_idx(VkDynamicState dyn_state) if (dyn_state == VK_DYNAMIC_STATE_LINE_STIPPLE_EXT) /* this one has a weird id, map after the normal dynamic state ones */ return VK_DYNAMIC_STATE_STENCIL_REFERENCE + 1; - if (dyn_state >= VK_DYNAMIC_STATE_CULL_MODE_EXT && - dyn_state <= VK_DYNAMIC_STATE_STENCIL_OP_EXT) - return dyn_state - VK_DYNAMIC_STATE_CULL_MODE_EXT + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2; + if (dyn_state >= VK_DYNAMIC_STATE_CULL_MODE && + dyn_state <= VK_DYNAMIC_STATE_STENCIL_OP) + return dyn_state - VK_DYNAMIC_STATE_CULL_MODE + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2; if (dyn_state == VK_DYNAMIC_STATE_VERTEX_INPUT_EXT) - return (VK_DYNAMIC_STATE_STENCIL_OP_EXT - VK_DYNAMIC_STATE_CULL_MODE_EXT) + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2 + 1; + return (VK_DYNAMIC_STATE_STENCIL_OP - VK_DYNAMIC_STATE_CULL_MODE) + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2 + 1; if (dyn_state >= VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT && - dyn_state <= VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT) + dyn_state <= VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE) return dyn_state - VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT + - VK_DYNAMIC_STATE_STENCIL_OP_EXT - VK_DYNAMIC_STATE_CULL_MODE_EXT + + VK_DYNAMIC_STATE_STENCIL_OP - VK_DYNAMIC_STATE_CULL_MODE + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2 + 1 + 1; if (dyn_state == VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT) - return VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT - VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT + - VK_DYNAMIC_STATE_STENCIL_OP_EXT - VK_DYNAMIC_STATE_CULL_MODE_EXT + + return VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE - VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT + + VK_DYNAMIC_STATE_STENCIL_OP - VK_DYNAMIC_STATE_CULL_MODE + VK_DYNAMIC_STATE_STENCIL_REFERENCE + 2 + 1 + 1 + 1; assert(0); return -1; @@ -651,7 +651,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, else state->rs_state.depth_clip_near = state->rs_state.depth_clip_far = depth_clip_state->depthClipEnable; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE)]) state->rs_state.rasterizer_discard = rsc->rasterizerDiscardEnable; state->rs_state.line_smooth = pipeline->line_smooth; @@ -673,7 +673,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, state->rs_state.line_stipple_pattern = pipeline->line_stipple_pattern; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE)]) state->depth_bias.enabled = pipeline->graphics_create_info.pRasterizationState->depthBiasEnable; if (!dynamic_states[VK_DYNAMIC_STATE_DEPTH_BIAS]) { state->depth_bias.offset_units = rsc->depthBiasConstantFactor; @@ -681,10 +681,10 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, state->depth_bias.offset_clamp = rsc->depthBiasClamp; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_CULL_MODE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_CULL_MODE)]) state->rs_state.cull_face = vk_cull_to_pipe(rsc->cullMode); - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_FRONT_FACE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_FRONT_FACE)]) state->rs_state.front_ccw = (rsc->frontFace == VK_FRONT_FACE_COUNTER_CLOCKWISE); state->rs_dirty = true; } @@ -692,13 +692,13 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, if (pipeline->graphics_create_info.pDepthStencilState) { const VkPipelineDepthStencilStateCreateInfo *dsa = pipeline->graphics_create_info.pDepthStencilState; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE)]) state->dsa_state.depth_enabled = dsa->depthTestEnable; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE)]) state->dsa_state.depth_writemask = dsa->depthWriteEnable; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP)]) state->dsa_state.depth_func = dsa->depthCompareOp; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE)]) state->dsa_state.depth_bounds_test = dsa->depthBoundsTestEnable; if (!dynamic_states[VK_DYNAMIC_STATE_DEPTH_BOUNDS]) { @@ -706,12 +706,12 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, state->dsa_state.depth_bounds_max = dsa->maxDepthBounds; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE)]) { state->dsa_state.stencil[0].enabled = dsa->stencilTestEnable; state->dsa_state.stencil[1].enabled = dsa->stencilTestEnable; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_STENCIL_OP_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_STENCIL_OP)]) { state->dsa_state.stencil[0].func = dsa->front.compareOp; state->dsa_state.stencil[0].fail_op = vk_conv_stencil_op(dsa->front.failOp); state->dsa_state.stencil[0].zpass_op = vk_conv_stencil_op(dsa->front.passOp); @@ -842,7 +842,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, vk_find_struct_const(vi->pNext, PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT); - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE)]) { for (i = 0; i < vi->vertexBindingDescriptionCount; i++) { state->vb[vi->pVertexBindingDescriptions[i].binding].stride = vi->pVertexBindingDescriptions[i].stride; } @@ -899,11 +899,11 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, { const VkPipelineInputAssemblyStateCreateInfo *ia = pipeline->graphics_create_info.pInputAssemblyState; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY)]) { state->info.mode = vk_conv_topology(ia->topology); state->rs_dirty = true; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT)]) + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE)]) state->info.primitive_restart = ia->primitiveRestartEnable; } @@ -926,17 +926,17 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, const VkPipelineViewportStateCreateInfo *vpi= pipeline->graphics_create_info.pViewportState; int i; - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT)]) { state->num_viewports = vpi->viewportCount; state->vp_dirty = true; } - if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT)]) { + if (!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT)]) { state->num_scissors = vpi->scissorCount; state->scissor_dirty = true; } if (!dynamic_states[VK_DYNAMIC_STATE_VIEWPORT] && - !dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT)]) { + !dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT)]) { for (i = 0; i < vpi->viewportCount; i++) { get_viewport_xform(state, &vpi->pViewports[i], i); set_viewport_depth_xform(state, i); @@ -950,7 +950,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, state->vp_dirty = true; } if (!dynamic_states[VK_DYNAMIC_STATE_SCISSOR] && - !dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT)]) { + !dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT)]) { for (i = 0; i < vpi->scissorCount; i++) { const VkRect2D *ss = &vpi->pScissors[i]; state->scissors[i].minx = ss->offset.x; @@ -1827,8 +1827,8 @@ static void handle_begin_rendering(struct vk_cmd_queue_entry *cmd, struct rendering_state *state) { const VkRenderingInfo *info = cmd->u.begin_rendering.rendering_info; - bool resuming = (info->flags & VK_RENDERING_RESUMING_BIT_KHR) == VK_RENDERING_RESUMING_BIT_KHR; - bool suspending = (info->flags & VK_RENDERING_SUSPENDING_BIT_KHR) == VK_RENDERING_SUSPENDING_BIT_KHR; + bool resuming = (info->flags & VK_RENDERING_RESUMING_BIT) == VK_RENDERING_RESUMING_BIT; + bool suspending = (info->flags & VK_RENDERING_SUSPENDING_BIT) == VK_RENDERING_SUSPENDING_BIT; state->info.view_mask = info->viewMask; state->render_area = info->renderArea; @@ -2688,7 +2688,7 @@ static void handle_event_set2(struct vk_cmd_queue_entry *cmd, { LVP_FROM_HANDLE(lvp_event, event, cmd->u.set_event2.event); - VkPipelineStageFlags2KHR src_stage_mask = 0; + VkPipelineStageFlags2 src_stage_mask = 0; for (uint32_t i = 0; i < cmd->u.set_event2.dependency_info->memoryBarrierCount; i++) src_stage_mask |= cmd->u.set_event2.dependency_info->pMemoryBarriers[i].srcStageMask; diff --git a/src/gallium/frontends/lavapipe/lvp_formats.c b/src/gallium/frontends/lavapipe/lvp_formats.c index 7b31d5eef5e..475a3f22870 100644 --- a/src/gallium/frontends/lavapipe/lvp_formats.c +++ b/src/gallium/frontends/lavapipe/lvp_formats.c @@ -115,7 +115,7 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d PIPE_BUFFER, 0, 0, PIPE_BIND_SHADER_IMAGE)) { buffer_features |= VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT; if (physical_device->pscreen->get_param(physical_device->pscreen, PIPE_CAP_IMAGE_LOAD_FORMATTED)) - buffer_features |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR; + buffer_features |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT; if (physical_device->pscreen->get_param(physical_device->pscreen, PIPE_CAP_IMAGE_STORE_FORMATTED)) buffer_features |= VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT; } @@ -143,7 +143,7 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_SHADER_IMAGE)) { features |= VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT; if (physical_device->pscreen->get_param(physical_device->pscreen, PIPE_CAP_IMAGE_LOAD_FORMATTED)) - features |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR; + features |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT; if (physical_device->pscreen->get_param(physical_device->pscreen, PIPE_CAP_IMAGE_STORE_FORMATTED)) features |= VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT; } diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c index 6bdad66da45..f7d77d5d6ed 100644 --- a/src/gallium/frontends/lavapipe/lvp_image.c +++ b/src/gallium/frontends/lavapipe/lvp_image.c @@ -344,7 +344,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroyBuffer( VKAPI_ATTR VkDeviceAddress VKAPI_CALL lvp_GetBufferDeviceAddress( VkDevice device, - const VkBufferDeviceAddressInfoKHR* pInfo) + const VkBufferDeviceAddressInfo* pInfo) { LVP_FROM_HANDLE(lvp_buffer, buffer, pInfo->buffer); @@ -353,14 +353,14 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL lvp_GetBufferDeviceAddress( VKAPI_ATTR uint64_t VKAPI_CALL lvp_GetBufferOpaqueCaptureAddress( VkDevice device, - const VkBufferDeviceAddressInfoKHR* pInfo) + const VkBufferDeviceAddressInfo* pInfo) { return 0; } VKAPI_ATTR uint64_t VKAPI_CALL lvp_GetDeviceMemoryOpaqueCaptureAddress( VkDevice device, - const VkDeviceMemoryOpaqueCaptureAddressInfoKHR* pInfo) + const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo) { return 0; } diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 12185cb280d..843d673deb2 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -200,26 +200,26 @@ deep_copy_viewport_state(void *mem_ctx, dst->pScissors = NULL; if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_VIEWPORT) && - !dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT)) { + !dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT)) { LVP_PIPELINE_DUP(dst->pViewports, src->pViewports, VkViewport, src->viewportCount); } - if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT)) + if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT)) dst->viewportCount = src->viewportCount; else dst->viewportCount = 0; if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_SCISSOR) && - !dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT)) { + !dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT)) { if (src->pScissors) LVP_PIPELINE_DUP(dst->pScissors, src->pScissors, VkRect2D, src->scissorCount); } - if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT)) + if (!dynamic_state_contains(dyn_state, VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT)) dst->scissorCount = src->scissorCount; else dst->scissorCount = 0; @@ -280,7 +280,7 @@ deep_copy_dynamic_state(void *mem_ctx, VkDynamicState *states = (void*)dst->pDynamicStates; for (unsigned i = 0; i < src->dynamicStateCount; i++) { switch (src->pDynamicStates[i]) { - case VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT: + case VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE: case VK_DYNAMIC_STATE_VERTEX_INPUT_EXT: if (stages & VK_GRAPHICS_PIPELINE_LIBRARY_VERTEX_INPUT_INTERFACE_BIT_EXT) states[dst->dynamicStateCount++] = src->pDynamicStates[i]; @@ -290,25 +290,25 @@ deep_copy_dynamic_state(void *mem_ctx, case VK_DYNAMIC_STATE_SCISSOR: case VK_DYNAMIC_STATE_LINE_WIDTH: case VK_DYNAMIC_STATE_LINE_STIPPLE_EXT: - case VK_DYNAMIC_STATE_CULL_MODE_EXT: - case VK_DYNAMIC_STATE_FRONT_FACE_EXT: - case VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT: - case VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT: - case VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT: + case VK_DYNAMIC_STATE_CULL_MODE: + case VK_DYNAMIC_STATE_FRONT_FACE: + case VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY: + case VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT: + case VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT: case VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT: - case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT: - case VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT: + case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE: + case VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE: if (stages & VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT) states[dst->dynamicStateCount++] = src->pDynamicStates[i]; break; case VK_DYNAMIC_STATE_DEPTH_BIAS: case VK_DYNAMIC_STATE_DEPTH_BOUNDS: - case VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT: - case VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT: - case VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT: - case VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT: - case VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT: + case VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE: + case VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE: + case VK_DYNAMIC_STATE_DEPTH_COMPARE_OP: + case VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE: + case VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE: if (has_depth && (stages & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT)) states[dst->dynamicStateCount++] = src->pDynamicStates[i]; break; @@ -316,8 +316,8 @@ deep_copy_dynamic_state(void *mem_ctx, case VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK: case VK_DYNAMIC_STATE_STENCIL_WRITE_MASK: case VK_DYNAMIC_STATE_STENCIL_REFERENCE: - case VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT: - case VK_DYNAMIC_STATE_STENCIL_OP_EXT: + case VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE: + case VK_DYNAMIC_STATE_STENCIL_OP: if (has_stencil && (stages & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT)) states[dst->dynamicStateCount++] = src->pDynamicStates[i]; break; @@ -397,7 +397,7 @@ deep_copy_graphics_create_info(void *mem_ctx, VkPipelineShaderStageCreateInfo *stages; VkPipelineVertexInputStateCreateInfo *vertex_input; VkPipelineRasterizationStateCreateInfo *rasterization_state; - const VkPipelineRenderingCreateInfoKHR *rp_info = NULL; + const VkPipelineRenderingCreateInfo *rp_info = NULL; dst->sType = src->sType; dst->pNext = NULL; @@ -410,8 +410,8 @@ deep_copy_graphics_create_info(void *mem_ctx, dst->renderPass = src->renderPass; rp_info = vk_get_pipeline_rendering_create_info(src); if (rp_info && !src->renderPass) { - VkPipelineRenderingCreateInfoKHR *r = ralloc(mem_ctx, VkPipelineRenderingCreateInfoKHR); - memcpy(r, rp_info, sizeof(VkPipelineRenderingCreateInfoKHR)); + VkPipelineRenderingCreateInfo *r = ralloc(mem_ctx, VkPipelineRenderingCreateInfo); + memcpy(r, rp_info, sizeof(VkPipelineRenderingCreateInfo)); r->pNext = NULL; dst->pNext = r; } @@ -490,7 +490,7 @@ deep_copy_graphics_create_info(void *mem_ctx, } /* pViewportState */ - rasterization_disabled = !dynamic_state_contains(src->pDynamicState, VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT) && + rasterization_disabled = !dynamic_state_contains(src->pDynamicState, VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE) && src->pRasterizationState->rasterizerDiscardEnable; if (src->pViewportState && !rasterization_disabled) { VkPipelineViewportStateCreateInfo *viewport_state;