From e7a614c60c21a961d88f8cfd78969052fa7a2685 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 20 Sep 2014 08:32:39 -0600 Subject: gallium: replace pipe_type enum with tgsi_return_type enum The only place the enum pipe_type was used is for the TGSI sampler view return type. So make it a TGSI type. Note: it appears this part of TGSI isn't used by anyone so it may be removed in the future. v2: the new name is tgsi_return_type, not tgsi_type. This means we can drop the previously posted tgsi_type -> tgsi_opcode_type patch. Reviewed-by: Roland Scheidegger --- src/gallium/auxiliary/tgsi/tgsi_build.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/auxiliary/tgsi/tgsi_build.c') diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index bef5c75ac76..39a4296a3a1 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_build.c +++ b/src/gallium/auxiliary/tgsi/tgsi_build.c @@ -297,10 +297,10 @@ tgsi_default_declaration_sampler_view(void) struct tgsi_declaration_sampler_view dsv; dsv.Resource = TGSI_TEXTURE_BUFFER; - dsv.ReturnTypeX = PIPE_TYPE_UNORM; - dsv.ReturnTypeY = PIPE_TYPE_UNORM; - dsv.ReturnTypeZ = PIPE_TYPE_UNORM; - dsv.ReturnTypeW = PIPE_TYPE_UNORM; + dsv.ReturnTypeX = TGSI_RETURN_TYPE_UNORM; + dsv.ReturnTypeY = TGSI_RETURN_TYPE_UNORM; + dsv.ReturnTypeZ = TGSI_RETURN_TYPE_UNORM; + dsv.ReturnTypeW = TGSI_RETURN_TYPE_UNORM; return dsv; } -- cgit v1.2.3