[Mesa-dev] [PATCH 1/5] mesa: Update clipping code to use ctx->Const.MaxClipPlanes.

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/14/2011 12:49 PM, Paul Berry wrote:
> To support GLSL 1.30, we will need to increase MAX_CLIP_PLANES to
> 8. To avoid breaking drivers that do not yet support 8 clip planes,
> this patch modifies the Mesa core code that pertains to clipping to
> use ctx->Const.MaxClipPlanes rather than MAX_CLIP_PLANES, since 
> ctx->Const.MaxClipPlanes will remain 6 for drivers that only
> support 6 clip planes.

For the series,

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> --- src/mesa/main/attrib.c |    4 ++-- src/mesa/main/matrix.c |
> 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index
> 9767740..d38a1a4 100644 --- a/src/mesa/main/attrib.c +++
> b/src/mesa/main/attrib.c @@ -493,7 +493,7 @@
> pop_enable_group(struct gl_context *ctx, const struct
> gl_enable_attrib *enable) } }
> 
> -   for (i=0;i<MAX_CLIP_PLANES;i++) { +   for
> (i=0;i<ctx->Const.MaxClipPlanes;i++) { const GLuint mask = 1 << i; 
> if ((ctx->Transform.ClipPlanesEnabled & mask) !=
> (enable->ClipPlanes & mask)) _mesa_set_enable(ctx, (GLenum)
> (GL_CLIP_PLANE0 + i), @@ -1247,7 +1247,7 @@ _mesa_PopAttrib(void) 
> _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
> 
> /* restore clip planes */ -               for (i = 0; i <
> MAX_CLIP_PLANES; i++) { +               for (i = 0; i <
> ctx->Const.MaxClipPlanes; i++) { const GLuint mask = 1 << i; const
> GLfloat *eyePlane = xform->EyeUserPlane[i]; 
> COPY_4V(ctx->Transform.EyeUserPlane[i], eyePlane); diff --git
> a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index
> 5697366..f479a22 100644 --- a/src/mesa/main/matrix.c +++
> b/src/mesa/main/matrix.c @@ -776,7 +776,7 @@ void
> _mesa_init_transform( struct gl_context *ctx ) 
> ctx->Transform.Normalize = GL_FALSE; ctx->Transform.RescaleNormals
> = GL_FALSE; ctx->Transform.RasterPositionUnclipped = GL_FALSE; -
> for (i=0;i<MAX_CLIP_PLANES;i++) { +   for
> (i=0;i<ctx->Const.MaxClipPlanes;i++) { ASSIGN_4V(
> ctx->Transform.EyeUserPlane[i], 0.0, 0.0, 0.0, 0.0 ); } 
> ctx->Transform.ClipPlanesEnabled = 0;

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk53gZEACgkQX1gOwKyEAw/c8ACfQhg31KnOgPXbKLtUh9fP1PyM
jM8AnjetoifaQ52s8YPMj4KHvhyR7XTf
=3agF
-----END PGP SIGNATURE-----