Mesa (master): radeonsi: don't use the emit qt keyword in si_init_atom

Marek Olšák mareko at kemper.freedesktop.org
Sat Aug 29 21:19:01 UTC 2015


Module: Mesa
Branch: master
Commit: 7dc8a3497fdf0fbd8ff4381712a54c2cd94bfbfc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dc8a3497fdf0fbd8ff4381712a54c2cd94bfbfc

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Aug 25 19:21:38 2015 +0200

radeonsi: don't use the emit qt keyword in si_init_atom

It confuses my editor.

---

 src/gallium/drivers/radeonsi/si_state.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index c923ea7..806ab5f 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -35,10 +35,10 @@
 #include "util/u_pstipple.h"
 
 static void si_init_atom(struct r600_atom *atom, struct r600_atom **list_elem,
-			 void (*emit)(struct si_context *ctx, struct r600_atom *state),
+			 void (*emit_func)(struct si_context *ctx, struct r600_atom *state),
 			 unsigned num_dw)
 {
-	atom->emit = (void*)emit;
+	atom->emit = (void*)emit_func;
 	atom->num_dw = num_dw;
 	atom->dirty = false;
 	*list_elem = atom;




More information about the mesa-commit mailing list