Mesa (master): i965: Consolidate is_3src() functions.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Nov 12 19:41:53 UTC 2015
Module: Mesa
Branch: master
Commit: 903050694bd42b658145b96e501c803c3c21127e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=903050694bd42b658145b96e501c803c3c21127e
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Oct 8 14:19:10 2015 -0700
i965: Consolidate is_3src() functions.
Otherwise I'll have to add another later in this series.
---
src/mesa/drivers/dri/i965/brw_eu.h | 6 ++++++
src/mesa/drivers/dri/i965/brw_eu_compact.c | 7 -------
src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index 0ac1ad9..1345db7 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -533,6 +533,12 @@ next_offset(const struct brw_device_info *devinfo, void *store, int offset)
return offset + 16;
}
+static inline bool
+is_3src(enum opcode opcode)
+{
+ return opcode_descs[opcode].nsrc == 3;
+}
+
#ifdef __cplusplus
}
#endif
diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 07ace6b..bca8a84 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -954,13 +954,6 @@ is_compactable_immediate(unsigned imm)
return imm == 0 || imm == 0xfffff000;
}
-/* Returns whether an opcode takes three sources. */
-static bool
-is_3src(uint32_t op)
-{
- return opcode_descs[op].nsrc == 3;
-}
-
/**
* Tries to compact instruction src into dst.
*
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index a6b57c3..481b69c 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -782,7 +782,7 @@ backend_instruction::is_commutative() const
bool
backend_instruction::is_3src() const
{
- return opcode < ARRAY_SIZE(opcode_descs) && opcode_descs[opcode].nsrc == 3;
+ return ::is_3src(opcode);
}
bool
More information about the mesa-commit
mailing list