From: Eric Anholt Date: Fri, 30 Aug 2013 17:45:00 +0000 (-0700) Subject: i965/vs: Fix regression on pre-gen6 with no VS uniforms in use. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09e2df5961cfe04925bdd820e6ea59af3ba783f6;p=mesa.git i965/vs: Fix regression on pre-gen6 with no VS uniforms in use. df06745c5adb524e15d157f976c08f1718f08efa made it so that we didn't allocate extra uniform space for unused clip planes, which also incidentally made us not allocate any space at all, which we were relying on for this no-uniforms case. Instead of putting the knowledge of this special HW exception into the thing that normally preallocates prog_data for us, just allocate it here. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68766 Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index ae836d31ef1..ab472b009ec 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1271,6 +1271,7 @@ vec4_visitor::setup_uniforms(int reg) if (brw->gen < 6 && this->uniforms == 0) { this->uniform_vector_size[this->uniforms] = 1; + prog_data->param = reralloc(NULL, prog_data->param, const float *, 4); for (unsigned int i = 0; i < 4; i++) { unsigned int slot = this->uniforms * 4 + i; static float zero = 0.0;