Module: Mesa Branch: main Commit: 1f6bd6ece99c92a492b896713799bba642b687cd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f6bd6ece99c92a492b896713799bba642b687cd
Author: Italo Nicola <[email protected]> Date: Fri Jul 29 17:34:02 2022 -0300 etnaviv: fix standalone compiler to work without a tgsi backend Signed-off-by: Italo Nicola <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17810> --- .../drivers/etnaviv/etnaviv_compiler_cmdline.c | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c index 0bfb39efca3..202147d0f59 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c @@ -35,6 +35,8 @@ #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_text.h" +#include "nir/tgsi_to_nir.h" + #include "etnaviv_compiler.h" #include "etnaviv_debug.h" #include "etnaviv_internal.h" @@ -102,17 +104,10 @@ main(int argc, char **argv) const char *filename; struct tgsi_token toks[65536]; struct tgsi_parse_context parse; - struct etna_shader s = {}; struct etna_shader_key key = {}; void *ptr; size_t size; - struct etna_shader_variant *v = CALLOC_STRUCT(etna_shader_variant); - if (!v) { - fprintf(stderr, "malloc failed!\n"); - return 1; - } - etna_mesa_debug = ETNA_DBG_MSGS | ETNA_DBG_NOCACHE; while (n < argc) { @@ -152,11 +147,19 @@ main(int argc, char **argv) tgsi_parse_init(&parse, toks); - s.specs = &specs_gc2000; - s.tokens = toks; + struct etna_compiler *compiler = etna_compiler_create(NULL, &specs_gc2000); - v->shader = &s; - v->key = key; + struct etna_shader shader = {}; + shader.nir = tgsi_to_nir_noscreen(toks, &compiler->options); + shader.specs = &specs_gc2000; + shader.compiler = compiler; + + struct util_debug_callback debug = {}; // TODO: proper debug callback + struct etna_shader_variant *v = etna_shader_variant(&shader, key, &debug); + if (!v) { + fprintf(stderr, "shader variant creation failed!\n"); + return 1; + } if (!etna_compile_shader(v)) { fprintf(stderr, "compiler failed!\n");
