diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-02-26 12:32:29 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-02-28 15:23:57 -0800 |
| commit | 1b6aad2234f277da1c4e0b2cd6634e8303526d9d (patch) | |
| tree | b2bf3403d5c0afe416f5a6957bb9dbd3af823658 | |
| parent | b34f05f6a778d204d906531837bba53ad245eab6 (diff) | |
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 <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74071
Cc: "10.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit 8ba157006fe98bca96b79bea1394b0c33ddf4ad3)
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 = |