Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa...

[mesa.git] / src / mesa / drivers / dri / i965 / brw_urb.c

diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c
index b4293046474bc325578a0e01631326453947131e..64f5904ac687cd157aa9f9d66c9d5bd8655f27a5 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -53,9 +53,9 @@ static const struct {
    GLuint min_entry_size;
    GLuint max_entry_size;
 } limits[CS+1] = {
-   { 8, 24, 1, 5 },                    /* vs */
+   { 8, 32, 1, 5 },                    /* vs */
    { 4, 8,  1, 5 },                    /* gs */
-   { 6, 12, 1, 5 },                    /* clp */
+   { 6, 8,  1, 5 },                    /* clp */
    { 1, 8,  1, 12 },                   /* sf */
    { 1, 4,  1, 32 }                    /* cs */
 };
@@ -131,7 +131,7 @@ static void recalculate_urb_fence( struct brw_context *brw )
 
         brw->urb.constrained = 1;
         
-        if (check_urb_layout(brw)) {
+        if (!check_urb_layout(brw)) {
            /* This is impossible, given the maximal sizes of urb
             * entries and the values for minimum nr of entries
             * provided above.