fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: delete zink_shader_stage()

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18051>
This commit is contained in:
Mike Blumenkrantz 2022-08-04 12:34:57 -04:00
parent b988b8c84b
commit 6ac64fcb6b
5 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/zink/zink_context.c
View file

@ -3396,20 +3396,6 @@ zink_resource_needs_barrier(struct zink_resource *res, VkImageLayout layout, VkA
return zink_resource_image_needs_barrier(res, layout, flags, pipeline);
}
VkShaderStageFlagBits
zink_shader_stage(gl_shader_stage type)
{
VkShaderStageFlagBits stages[] = {
[MESA_SHADER_VERTEX] = VK_SHADER_STAGE_VERTEX_BIT,
[MESA_SHADER_FRAGMENT] = VK_SHADER_STAGE_FRAGMENT_BIT,
[MESA_SHADER_GEOMETRY] = VK_SHADER_STAGE_GEOMETRY_BIT,
[MESA_SHADER_TESS_CTRL] = VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
[MESA_SHADER_TESS_EVAL] = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
[MESA_SHADER_COMPUTE] = VK_SHADER_STAGE_COMPUTE_BIT,
};
return stages[type];
}
static void
zink_flush(struct pipe_context *pctx,
struct pipe_fence_handle **pfence,

3
src/gallium/drivers/zink/zink_context.h
View file

@ -159,9 +159,6 @@ zink_tc_context_unwrap(struct pipe_context *pctx);
VkPipelineStageFlags
zink_pipeline_flags_from_stage(VkShaderStageFlagBits stage);
VkShaderStageFlagBits
zink_shader_stage(gl_shader_stage type);
struct pipe_context *
zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags);

4
src/gallium/drivers/zink/zink_descriptors.c
View file

@ -208,7 +208,7 @@ init_push_binding(VkDescriptorSetLayoutBinding *binding, unsigned i, VkDescripto
binding->binding = i;
binding->descriptorType = type;
binding->descriptorCount = 1;
binding->stageFlags = zink_shader_stage(i);
binding->stageFlags = mesa_to_vk_shader_stage(i);
binding->pImmutableSamplers = NULL;
}
@ -412,7 +412,7 @@ zink_descriptor_program_init(struct zink_context *ctx, struct zink_program *pg)
continue;
gl_shader_stage stage = shader->nir->info.stage;
VkShaderStageFlagBits stage_flags = zink_shader_stage(stage);
VkShaderStageFlagBits stage_flags = mesa_to_vk_shader_stage(stage);
for (int j = 0; j < ZINK_DESCRIPTOR_TYPES; j++) {
unsigned desc_set = screen->desc_set_id[j] - 1;
for (int k = 0; k < shader->num_bindings[j]; k++) {

4
src/gallium/drivers/zink/zink_pipeline.c
View file

@ -363,7 +363,7 @@ zink_create_gfx_pipeline(struct zink_screen *screen,
VkPipelineShaderStageCreateInfo stage = {0};
stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stage.stage = zink_shader_stage(i);
stage.stage = mesa_to_vk_shader_stage(i);
stage.module = prog->modules[i]->shader;
stage.pName = "main";
shader_stages[num_stages++] = stage;
@ -771,7 +771,7 @@ zink_create_gfx_pipeline_library(struct zink_screen *screen, struct zink_gfx_pro
VkPipelineShaderStageCreateInfo stage = {0};
stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stage.stage = zink_shader_stage(i);
stage.stage = mesa_to_vk_shader_stage(i);
stage.module = prog->modules[i]->shader;
stage.pName = "main";
shader_stages[num_stages++] = stage;

2
src/gallium/drivers/zink/zink_types.h
View file

@ -54,6 +54,8 @@
#include "util/u_transfer.h"
#include "util/u_vertex_state_cache.h"
#include "vulkan/util/vk_util.h"
#include "zink_device_info.h"
#include "zink_instance.h"
#include "zink_shader_keys.h"