From f2328ffdc80d0ea817b2f3f802dae6b2210fbfe2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 31 Jan 2015 17:17:05 +0100 Subject: [PATCH] tgsi: add tgsi_get_processor_type helper from radeon Reviewed-by: Glenn Kennard Reviewed-by: Brian Paul --- src/gallium/auxiliary/tgsi/tgsi_parse.c | 12 ++++++++++++ src/gallium/auxiliary/tgsi/tgsi_parse.h | 2 ++ src/gallium/drivers/radeon/r600_pipe_common.c | 11 ----------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.c b/src/gallium/auxiliary/tgsi/tgsi_parse.c index f2370ed7a06..9cc83830fdc 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_parse.c +++ b/src/gallium/auxiliary/tgsi/tgsi_parse.c @@ -315,3 +315,15 @@ tgsi_dump_tokens(const struct tgsi_token *tokens) debug_printf("0x%08x,\n", dwords[i]); debug_printf("};\n"); } + +unsigned +tgsi_get_processor_type(const struct tgsi_token *tokens) +{ + struct tgsi_parse_context parse; + + if (tgsi_parse_init( &parse, tokens ) != TGSI_PARSE_OK) { + debug_printf("tgsi_parse_init() failed in %s:%i!\n", __func__, __LINE__); + return ~0; + } + return parse.FullHeader.Processor.Processor; +} diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.h b/src/gallium/auxiliary/tgsi/tgsi_parse.h index bfcca484576..cd4b2afdb8b 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_parse.h +++ b/src/gallium/auxiliary/tgsi/tgsi_parse.h @@ -153,6 +153,8 @@ tgsi_alloc_tokens(unsigned num_tokens); void tgsi_free_tokens(const struct tgsi_token *tokens); +unsigned +tgsi_get_processor_type(const struct tgsi_token *tokens); #if defined __cplusplus } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index ddb4142d18f..ee4cda796c9 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -883,17 +883,6 @@ void r600_destroy_common_screen(struct r600_common_screen *rscreen) FREE(rscreen); } -static unsigned tgsi_get_processor_type(const struct tgsi_token *tokens) -{ - struct tgsi_parse_context parse; - - if (tgsi_parse_init( &parse, tokens ) != TGSI_PARSE_OK) { - debug_printf("tgsi_parse_init() failed in %s:%i!\n", __func__, __LINE__); - return ~0; - } - return parse.FullHeader.Processor.Processor; -} - bool r600_can_dump_shader(struct r600_common_screen *rscreen, const struct tgsi_token *tokens) { -- 2.30.2