fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 17:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: move radv_shader_{layout,stage} to radv_shader.h

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28526>
This commit is contained in:
Samuel Pitoiset 2024-04-02 15:13:45 +02:00 • committed by Marge Bot
parent 0df9270997
commit bcfac61468
2 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/amd/vulkan/radv_private.h
View file

@ -2427,57 +2427,9 @@ RADV_DECL_PIPELINE_DOWNCAST(graphics_lib, RADV_PIPELINE_GRAPHICS_LIB)
RADV_DECL_PIPELINE_DOWNCAST(compute, RADV_PIPELINE_COMPUTE)
RADV_DECL_PIPELINE_DOWNCAST(ray_tracing, RADV_PIPELINE_RAY_TRACING)
struct radv_shader_layout {
uint32_t num_sets;
struct {
struct radv_descriptor_set_layout *layout;
uint32_t dynamic_offset_start;
} set[MAX_SETS];
uint32_t push_constant_size;
uint32_t dynamic_offset_count;
bool use_dynamic_descriptors;
};
struct radv_shader_stage {
gl_shader_stage stage;
gl_shader_stage next_stage;
struct {
const struct vk_object_base *object;
const char *data;
uint32_t size;
} spirv;
const char *entrypoint;
const VkSpecializationInfo *spec_info;
unsigned char shader_sha1[20];
nir_shader *nir;
nir_shader *internal_nir; /* meta shaders */
struct radv_shader_info info;
struct radv_shader_args args;
struct radv_shader_stage_key key;
VkPipelineCreationFeedback feedback;
struct radv_shader_layout layout;
};
void radv_shader_layout_init(const struct radv_pipeline_layout *pipeline_layout, gl_shader_stage stage,
struct radv_shader_layout *layout);
static inline bool
radv_is_last_vgt_stage(const struct radv_shader_stage *stage)
{
return (stage->info.stage == MESA_SHADER_VERTEX || stage->info.stage == MESA_SHADER_TESS_EVAL ||
stage->info.stage == MESA_SHADER_GEOMETRY || stage->info.stage == MESA_SHADER_MESH) &&
(stage->info.next_stage == MESA_SHADER_FRAGMENT || stage->info.next_stage == MESA_SHADER_NONE);
}
static inline bool
radv_pipeline_has_stage(const struct radv_graphics_pipeline *pipeline, gl_shader_stage stage)
{

48
src/amd/vulkan/radv_shader.h
View file

@ -464,6 +464,54 @@ struct radv_shader_info {
struct gfx10_ngg_info ngg_info;
};
struct radv_shader_layout {
uint32_t num_sets;
struct {
struct radv_descriptor_set_layout *layout;
uint32_t dynamic_offset_start;
} set[MAX_SETS];
uint32_t push_constant_size;
uint32_t dynamic_offset_count;
bool use_dynamic_descriptors;
};
struct radv_shader_stage {
gl_shader_stage stage;
gl_shader_stage next_stage;
struct {
const struct vk_object_base *object;
const char *data;
uint32_t size;
} spirv;
const char *entrypoint;
const VkSpecializationInfo *spec_info;
unsigned char shader_sha1[20];
nir_shader *nir;
nir_shader *internal_nir; /* meta shaders */
struct radv_shader_info info;
struct radv_shader_args args;
struct radv_shader_stage_key key;
VkPipelineCreationFeedback feedback;
struct radv_shader_layout layout;
};
static inline bool
radv_is_last_vgt_stage(const struct radv_shader_stage *stage)
{
return (stage->info.stage == MESA_SHADER_VERTEX || stage->info.stage == MESA_SHADER_TESS_EVAL ||
stage->info.stage == MESA_SHADER_GEOMETRY || stage->info.stage == MESA_SHADER_MESH) &&
(stage->info.next_stage == MESA_SHADER_FRAGMENT || stage->info.next_stage == MESA_SHADER_NONE);
}
struct radv_vs_input_state {
uint32_t attribute_mask;