aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/register_allocate.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-20 08:18:11 +0200
committermarha <marha@users.sourceforge.net>2012-09-20 08:18:11 +0200
commit06d4ea68085558b94d8e9c937091e7b7fcc5d95a (patch)
tree01ff2f6a8d6ae430a526282d98eede21c7cfffd0 /mesalib/src/mesa/program/register_allocate.h
parent52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff)
downloadvcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.gz
vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.bz2
vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.zip
libxcb xserver pixman mesa git update 20 sep 2012
libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
Diffstat (limited to 'mesalib/src/mesa/program/register_allocate.h')
-rw-r--r--mesalib/src/mesa/program/register_allocate.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/register_allocate.h b/mesalib/src/mesa/program/register_allocate.h
index 00b851ec2..2a9d61191 100644
--- a/mesalib/src/mesa/program/register_allocate.h
+++ b/mesalib/src/mesa/program/register_allocate.h
@@ -43,7 +43,9 @@ void ra_add_reg_conflict(struct ra_regs *regs,
void ra_add_transitive_reg_conflict(struct ra_regs *regs,
unsigned int base_reg, unsigned int reg);
void ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int reg);
-void ra_set_finalize(struct ra_regs *regs);
+void ra_set_num_conflicts(struct ra_regs *regs, unsigned int class_a,
+ unsigned int class_b, unsigned int num_conflicts);
+void ra_set_finalize(struct ra_regs *regs, unsigned int **conflicts);
/** @} */
/** @{ Interference graph setup.