From 541cb60e7ed8543cd7f791a35f106115884f4a53 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 24 Jul 2018 15:04:39 -0700 Subject: [PATCH] iris: export get_shader_info --- src/gallium/drivers/iris/iris_context.h | 4 ++++ src/gallium/drivers/iris/iris_program.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index c0420ef397a..3c3c1bd65d0 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -402,6 +402,10 @@ uint32_t iris_upload_border_color(struct iris_context *ice, void gen9_init_state(struct iris_context *ice); void gen10_init_state(struct iris_context *ice); +/* iris_program.c */ +const struct shader_info *iris_get_shader_info(const struct iris_context *ice, + gl_shader_stage stage); + /* iris_program_cache.c */ void iris_init_program_cache(struct iris_context *ice); diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index c147d9ead4e..6f24acc1cce 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -345,8 +345,8 @@ iris_update_compiled_vs(struct iris_context *ice) UNUSED bool success = iris_compile_vs(ice, ish, &key); } -static const struct shader_info * -get_shader_info(const struct iris_context *ice, gl_shader_stage stage) +const struct shader_info * +iris_get_shader_info(const struct iris_context *ice, gl_shader_stage stage) { const struct iris_uncompiled_shader *ish = ice->shaders.uncompiled[stage]; @@ -374,8 +374,10 @@ get_unified_tess_slots(const struct iris_context *ice, uint64_t *per_vertex_slots, uint32_t *per_patch_slots) { - const struct shader_info *tcs = get_shader_info(ice, MESA_SHADER_TESS_CTRL); - const struct shader_info *tes = get_shader_info(ice, MESA_SHADER_TESS_EVAL); + const struct shader_info *tcs = + iris_get_shader_info(ice, MESA_SHADER_TESS_CTRL); + const struct shader_info *tes = + iris_get_shader_info(ice, MESA_SHADER_TESS_EVAL); *per_vertex_slots = tes->inputs_read; *per_patch_slots = tes->patch_inputs_read; @@ -441,7 +443,7 @@ iris_update_compiled_tcs(struct iris_context *ice) return; const struct shader_info *tes_info = - get_shader_info(ice, MESA_SHADER_TESS_EVAL); + iris_get_shader_info(ice, MESA_SHADER_TESS_EVAL); struct brw_tcs_prog_key key = { .program_string_id = tcs->program_id, .tes_primitive_mode = tes_info->tess.primitive_mode, -- 2.30.2