From: "Lonnberg, Toni" <toni.lonnb...@intel.com>
Pre-work for shader disassembly label support.
---
src/mesa/drivers/dri/i965/brw_disasm.c | 12 ++++++------
src/mesa/drivers/dri/i965/brw_eu.h | 2 ++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
b/src/mesa/drivers/dri/i965/brw_disasm.c
index cd553b3..458e0db 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -30,8 +30,8 @@
#include "brw_inst.h"
#include "brw_eu.h"
-static bool
-has_jip(const struct gen_device_info *devinfo, enum opcode opcode)
+bool
+brw_has_jip(const struct gen_device_info *devinfo, enum opcode opcode)
{
if (devinfo->gen < 6)
return false;
@@ -45,8 +45,8 @@ has_jip(const struct gen_device_info *devinfo, enum opcode
opcode)
opcode == BRW_OPCODE_HALT;
}
-static bool
-has_uip(const struct gen_device_info *devinfo, enum opcode opcode)
+bool
+brw_has_uip(const struct gen_device_info *devinfo, enum opcode opcode)
{
if (devinfo->gen < 6)
return false;
@@ -1289,13 +1289,13 @@ brw_disassemble_inst(FILE *file, const struct
gen_device_info *devinfo,
if (opcode == BRW_OPCODE_SEND && devinfo->gen < 6)
format(file, " %"PRIu64, brw_inst_base_mrf(devinfo, inst));
- if (has_uip(devinfo, opcode)) {
+ if (brw_has_uip(devinfo, opcode)) {
/* Instructions that have UIP also have JIP. */
pad(file, 16);
format(file, "JIP: %d", brw_inst_jip(devinfo, inst));
pad(file, 32);
format(file, "UIP: %d", brw_inst_uip(devinfo, inst));
- } else if (has_jip(devinfo, opcode)) {
+ } else if (brw_has_jip(devinfo, opcode)) {
pad(file, 16);
if (devinfo->gen >= 7) {
format(file, "JIP: %d", brw_inst_jip(devinfo, inst));
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h
b/src/mesa/drivers/dri/i965/brw_eu.h
index c44896b..fbf9123 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -114,6 +114,8 @@ void brw_set_default_acc_write_control(struct brw_codegen
*p, unsigned value);
void brw_init_codegen(const struct gen_device_info *, struct brw_codegen *p,
void *mem_ctx);
+bool brw_has_jip(const struct gen_device_info *devinfo, enum opcode opcode);
+bool brw_has_uip(const struct gen_device_info *devinfo, enum opcode opcode);
void brw_disassemble(const struct gen_device_info *devinfo, void *assembly,
int start, int end, FILE *out);
const unsigned *brw_get_program( struct brw_codegen *p, unsigned *sz );
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
