From: Ian Romanick Date: Wed, 26 Feb 2014 20:32:29 +0000 (-0800) Subject: i915: Only allow 8 vertex texture units X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ba157006fe98bca96b79bea1394b0c33ddf4ad3;p=mesa.git i915: Only allow 8 vertex texture units There's no reason to have more vertex texture units than fragment texture units on this hardware. Since increasing the default maximum number of texture units from 16 to 32, this has triggered some segfault in i915 driver. There's probably some array or bitfield that isn't properly sized now. This really papers over the bug, but I don't think I'll lose any sleep over that. Signed-off-by: Ian Romanick Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74071 Cc: "10.1" Reviewed-by: Matt Turner --- diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 7378fc3aef5..ebcab9477f3 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -193,6 +193,7 @@ i915CreateContext(int api, ctx->Const.MaxTextureUnits = I915_TEX_UNITS; ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = I915_TEX_UNITS; + ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = I915_TEX_UNITS; ctx->Const.MaxTextureCoordUnits = I915_TEX_UNITS; ctx->Const.MaxVarying = I915_TEX_UNITS; ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents =