xlib: remove MESA_GLX_VISUAL_HACK

[mesa.git] / src / mesa / drivers / x11 / xm_tri.c

diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index a2dbf572dc1efadb932c5ccb392670ae0f279d1f..da26235ff045460042b2d7c22f26e9c9ed58dd32 100644 (file)
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -30,6 +30,8 @@
  */
 
 
+#include <stdio.h>
+#include "c99_math.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
 #include "glxheader.h"
@@ -43,7 +45,7 @@
 
 
 #define GET_XRB(XRB)  struct xmesa_renderbuffer *XRB = \
-   xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped)
+   xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0])
 
 
 /**********************************************************************/
@@ -1015,7 +1017,7 @@ get_triangle_func(struct gl_context *ctx)
       return (swrast_tri_func) NULL;
    if (ctx->Polygon.SmoothFlag)
       return (swrast_tri_func) NULL;
-   if (ctx->Texture._EnabledUnits)
+   if (ctx->Texture._MaxEnabledTexImageUnit != -1)
       return (swrast_tri_func) NULL;
    if (swrast->_RasterMask & MULTI_DRAW_BIT)
       return (swrast_tri_func) NULL;
@@ -1023,7 +1025,7 @@ get_triangle_func(struct gl_context *ctx)
        ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
       return (swrast_tri_func) NULL;
 
-   xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped);
+   xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
 
    if (xrb->ximage) {
       if (   ctx->Light.ShadeModel==GL_SMOOTH