projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ca04e71)
nv50/ir/ra: Fix maxGPR calculation for programs with multiple functions.
authorFrancisco Jerez <currojerez@riseup.net>
Mon, 30 Apr 2012 13:22:27 +0000 (15:22 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Tue, 12 Mar 2013 11:55:33 +0000 (12:55 +0100)
src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp patch | blob | history

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
index b74faec1d4f70799caf2295dd4fc715790fce133..dbf43d430398c177902f71c3e1b037c4f8e0e542 100644 (file)
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
@@ -1338,7 +1338,7 @@ GCRA::allocateRegisters(ArrayList& insns)
       if (prog->dbgFlags & NV50_IR_DEBUG_REG_ALLOC)
          func->print();
    } else {
-      prog->maxGPR = regs.getMaxAssigned(FILE_GPR);
+      prog->maxGPR = std::max(prog->maxGPR, regs.getMaxAssigned(FILE_GPR));
    }
 
 out: