Attachment 8015 Details for Bug 9285 – Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().

[patch] Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().

0004-Override-Const.CheckArrayBounds-for-Xserver-in-XMesaCreateContext.txt (text/plain), 1.75 KB, created by George - on 2006-12-08 09:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-12-08 09:25:08 UTC

Size: 1.75 KB

patch

obsolete

>From 5c1886c0c3ef28c0f2204fc927adc11ea304107f Mon Sep 17 00:00:00 2001
>From: George Sapountzis <gsap7@yahoo.gr>
>Date: Wed, 6 Dec 2006 06:54:13 +0200
>Subject: [PATCH] Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().
>
>This leaves one last XFree86Server ifdef in Mesa core.
>---
> src/mesa/drivers/x11/xm_api.c |    7 +++++++
> src/mesa/main/context.c       |    8 +-------
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
>index c3739da..baca87f 100644
>--- a/src/mesa/drivers/x11/xm_api.c
>+++ b/src/mesa/drivers/x11/xm_api.c
>@@ -1528,6 +1528,13 @@ #if ENABLE_EXT_timer_query
>     _mesa_enable_extension(mesaCtx, "GL_EXT_timer_query");
> #endif
> 
>+#ifdef XFree86Server
>+   /* If we're running in the X server, do bounds checking to prevent
>+    * segfaults and server crashes!
>+    */
>+   mesaCtx->Const.CheckArrayBounds = GL_TRUE;
>+#endif
>+
>    /* finish up xmesa context initializations */
>    c->swapbytes = CHECK_BYTE_ORDER(v) ? GL_FALSE : GL_TRUE;
>    c->xm_visual = v;
>diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
>index b2bd1d8..99f4dc9 100644
>--- a/src/mesa/main/context.c
>+++ b/src/mesa/main/context.c
>@@ -1078,14 +1078,8 @@ #endif
>    ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
>    ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
> 
>-   /* If we're running in the X server, do bounds checking to prevent
>-    * segfaults and server crashes!
>-    */
>-#if defined(XFree86Server)
>-   ctx->Const.CheckArrayBounds = GL_TRUE;
>-#else
>+   /* CheckArrayBounds is overriden by drivers/x11 for X server */
>    ctx->Const.CheckArrayBounds = GL_FALSE;
>-#endif
> 
>    /* GL_ARB_draw_buffers */
>    ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS;
>-- 
>1.4.0-dirty
>

Actions: View | Splinter Review

Attachments on bug 9285: 8013 | 8014 | 8015 | 8506 | 9377

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.