From: Paul Berry <stereotype441@gmail.com>
Date: Thu, 8 Sep 2011 01:24:00 +0000 (-0700)
Subject: Hardcode the default value of ctx->Const.MaxClipPlanes to 6.
X-Git-Tag: android-x86-4.4-r1~9867
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2dfa33a5e9325bfe9adb3a15aba466e3f15eb2c5;p=android-x86%2Fexternal-mesa.git

Hardcode the default value of ctx->Const.MaxClipPlanes to 6.

Previously this value was set to MAX_CLIP_PLANES, which is defined to
be 6.  But MAX_CLIP_PLANES needs to be increased to 8 to support
GLSL-1.30-compliant drivers.  This patch hard-codes the default value
of ctx->Const.MaxClipPlanes to 6, so that when MAX_CLIP_PLANES is
increased, it won't affect drivers that do not support 8 clip planes.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0cf794735bb..b20063c33b2 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -582,7 +582,7 @@ _mesa_init_constants(struct gl_context *ctx)
    ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
    ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;
    ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
-   ctx->Const.MaxClipPlanes = MAX_CLIP_PLANES;
+   ctx->Const.MaxClipPlanes = 6;
    ctx->Const.MaxLights = MAX_LIGHTS;
    ctx->Const.MaxShininess = 128.0;
    ctx->Const.MaxSpotExponent = 128.0;