fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

etnaviv: fix standalone compiler to work without a tgsi backend

Browse source 
Signed-off-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17810>
This commit is contained in:
Italo Nicola 2022-07-29 17:34:02 -03:00 • committed by Marge Bot
parent b85544db19
commit 1f6bd6ece9
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c
View file

@ -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");