From: Paul Berry <stereotype441@gmail.com>
Date: Tue, 22 May 2012 23:16:43 +0000 (-0700)
Subject: i965/blorp: Set the dynamic state upper bound.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de9752a4e59e869e905cb898c4a0dbe539c43c8d;p=mesa.git

i965/blorp: Set the dynamic state upper bound.

We know from previous bug fixes (commits
c25e5300cba7628b58df93ead14ebc3cc32f338c and
b2ace06cbbbb1021e2d7ace12a985c6406821939) that texture border color
doesn't work if the dynamic state upper bound is set to 0.  Although
the blorp engine doesn't make use of texture borders, it seems like we
ought to err on the safe side and set this value properly.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
index 4e21ddfe4ca..601bc9bbcd0 100644
--- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
@@ -136,7 +136,12 @@ gen6_blorp_emit_state_base_address(struct brw_context *brw,
       OUT_BATCH(1); /* InstructionBaseAddress */
    }
    OUT_BATCH(1); /* GeneralStateUpperBound */
-   OUT_BATCH(1); /* DynamicStateUpperBound */
+   /* Dynamic state upper bound.  Although the documentation says that
+    * programming it to zero will cause it to be ignored, that is a lie.
+    * If this isn't programmed to a real bound, the sampler border color
+    * pointer is rejected, causing border color to mysteriously fail.
+    */
+   OUT_BATCH(0xfffff001);
    OUT_BATCH(1); /* IndirectObjectUpperBound*/
    OUT_BATCH(1); /* InstructionAccessUpperBound */
    ADVANCE_BATCH();