summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-11-07 12:35:58 -0800
committerEric Anholt <[email protected]>2015-02-06 15:50:07 -0800
commitf3dbf3689a9d36d6a290e9311560376cadc14141 (patch)
tree93ef0ad7e30baffcbf9aed2e3064cd8446b7aac7
parent40fa7d44aba923308c30e96fd319b371f99f4545 (diff)
tgsi/ureg: Move ureg_dst_register() to the header.
I wanted to use it for nir-to-tgsi. The equivalent ureg_src_register() is also located here. Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_ureg.c28
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_ureg.h25
2 files changed, 25 insertions, 28 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index f524dfbca5c..88a7c11a9f1 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -241,34 +241,6 @@ static union tgsi_any_token *retrieve_token( struct ureg_program *ureg,
return &ureg->domain[domain].tokens[nr];
}
-
-
-static INLINE struct ureg_dst
-ureg_dst_register( unsigned file,
- unsigned index )
-{
- struct ureg_dst dst;
-
- dst.File = file;
- dst.WriteMask = TGSI_WRITEMASK_XYZW;
- dst.Indirect = 0;
- dst.IndirectFile = TGSI_FILE_NULL;
- dst.IndirectIndex = 0;
- dst.IndirectSwizzle = 0;
- dst.Saturate = 0;
- dst.Predicate = 0;
- dst.PredNegate = 0;
- dst.PredSwizzleX = TGSI_SWIZZLE_X;
- dst.PredSwizzleY = TGSI_SWIZZLE_Y;
- dst.PredSwizzleZ = TGSI_SWIZZLE_Z;
- dst.PredSwizzleW = TGSI_SWIZZLE_W;
- dst.Index = index;
- dst.ArrayID = 0;
-
- return dst;
-}
-
-
void
ureg_property(struct ureg_program *ureg, unsigned name, unsigned value)
{
diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index f254b1eb1a8..b3f47ef63de 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -1137,6 +1137,31 @@ ureg_dst_array_offset( struct ureg_dst reg, int offset )
}
static INLINE struct ureg_dst
+ureg_dst_register( unsigned file,
+ unsigned index )
+{
+ struct ureg_dst dst;
+
+ dst.File = file;
+ dst.WriteMask = TGSI_WRITEMASK_XYZW;
+ dst.Indirect = 0;
+ dst.IndirectFile = TGSI_FILE_NULL;
+ dst.IndirectIndex = 0;
+ dst.IndirectSwizzle = 0;
+ dst.Saturate = 0;
+ dst.Predicate = 0;
+ dst.PredNegate = 0;
+ dst.PredSwizzleX = TGSI_SWIZZLE_X;
+ dst.PredSwizzleY = TGSI_SWIZZLE_Y;
+ dst.PredSwizzleZ = TGSI_SWIZZLE_Z;
+ dst.PredSwizzleW = TGSI_SWIZZLE_W;
+ dst.Index = index;
+ dst.ArrayID = 0;
+
+ return dst;
+}
+
+static INLINE struct ureg_dst
ureg_dst( struct ureg_src src )
{
struct ureg_dst dst;