From 8fa6b363dbed32f4e18b4b83866658c62fba8d39 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 6 Nov 2000 15:52:48 +0000
Subject: added buffer test to xmesa_choose_point(), fixes X protocol error

---
 src/mesa/drivers/x11/xm_line.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/x11/xm_line.c')

diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c
index 00e9df68f3..2a09dd85c6 100644
--- a/src/mesa/drivers/x11/xm_line.c
+++ b/src/mesa/drivers/x11/xm_line.c
@@ -1,4 +1,4 @@
-/* $Id: xm_line.c,v 1.6 2000/11/05 18:26:12 keithw Exp $ */
+/* $Id: xm_line.c,v 1.7 2000/11/06 15:52:48 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -92,11 +92,13 @@ static void draw_points_ANY_pixmap( GLcontext *ctx, SWvertex *vert )
  */
 void xmesa_choose_point( GLcontext *ctx )
 {
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
-   if (ctx->Point.Size==1.0F && !ctx->Point.SmoothFlag 
-       && swrast->_RasterMask==0
-       && !ctx->Texture._ReallyEnabled) {
+   if (ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag 
+       && swrast->_RasterMask == 0
+       && !ctx->Texture._ReallyEnabled
+       && xmesa->xm_buffer->buffer != XIMAGE) {
       swrast->Point = draw_points_ANY_pixmap;
    }
    else { 
-- 
cgit v1.2.3