From eca762d831e099b549dafa0be896eac82b3fceb9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 5 Aug 2011 19:18:31 -0700 Subject: [PATCH] i965/vs: Fix support for zero uniforms in use. We were looking for attributes in the wrong place, and pointlessly doing the work on gen6 at all. --- src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 1f2853e1118..be089369bcf 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -94,7 +94,7 @@ vec4_visitor::setup_uniforms(int reg) /* The pre-gen6 VS requires that some push constants get loaded no * matter what, or the GPU would hang. */ - if (this->uniforms == 0) { + if (intel->gen < 6 && this->uniforms == 0) { this->uniform_size[this->uniforms] = 1; for (unsigned int i = 0; i < 4; i++) { @@ -105,6 +105,7 @@ vec4_visitor::setup_uniforms(int reg) } this->uniforms++; + reg++; } else { reg += ALIGN(uniforms, 2) / 2; } -- 2.30.2