X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Frender2.c;h=3dfee7c4651ac69778e5a0d0df4020e77e7b189b;hb=7076e9f116c2060a7f28680178d96c188c7177df;hp=762950f4ac4027a452c9664b71e1d09fdd0d5aee;hpb=6e8897ff9f90601ebf6eed500ad942c11b54d1f7;p=mesa.git

diff --git a/src/glx/render2.c b/src/glx/render2.c
index 762950f4ac4..3dfee7c4651 100644
--- a/src/glx/render2.c
+++ b/src/glx/render2.c
@@ -28,6 +28,8 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef GLX_USE_APPLEGL
+
 #include "packrender.h"
 #include "indirect.h"
 #include "indirect_size.h"
@@ -89,14 +91,14 @@ __indirect_glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,
       if (stride != k) {
          GLubyte *buf;
 
-         buf = (GLubyte *) Xmalloc(compsize);
+         buf = malloc(compsize);
          if (!buf) {
             __glXSetError(gc, GL_OUT_OF_MEMORY);
             return;
          }
          __glFillMap1d(k, order, stride, pnts, buf);
          __glXSendLargeCommand(gc, pc, 32, buf, compsize);
-         Xfree((char *) buf);
+         free((char *) buf);
       }
       else {
          /* Data is already packed.  Just send it out */
@@ -152,14 +154,14 @@ __indirect_glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,
       if (stride != k) {
          GLubyte *buf;
 
-         buf = (GLubyte *) Xmalloc(compsize);
+         buf = malloc(compsize);
          if (!buf) {
             __glXSetError(gc, GL_OUT_OF_MEMORY);
             return;
          }
          __glFillMap1f(k, order, stride, pnts, buf);
          __glXSendLargeCommand(gc, pc, 24, buf, compsize);
-         Xfree((char *) buf);
+         free((char *) buf);
       }
       else {
          /* Data is already packed.  Just send it out */
@@ -227,7 +229,7 @@ __indirect_glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr,
       if ((vstr != k) || (ustr != k * vord)) {
          GLdouble *buf;
 
-         buf = (GLdouble *) Xmalloc(compsize);
+         buf = malloc(compsize);
          if (!buf) {
             __glXSetError(gc, GL_OUT_OF_MEMORY);
             return;
@@ -237,7 +239,7 @@ __indirect_glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustr,
           */
          __glFillMap2d(k, uord, vord, ustr, vstr, pnts, buf);
          __glXSendLargeCommand(gc, pc, 52, buf, compsize);
-         Xfree((char *) buf);
+         free((char *) buf);
       }
       else {
          /* Data is already packed.  Just send it out */
@@ -303,7 +305,7 @@ __indirect_glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustr,
       if ((vstr != k) || (ustr != k * vord)) {
          GLfloat *buf;
 
-         buf = (GLfloat *) Xmalloc(compsize);
+         buf = malloc(compsize);
          if (!buf) {
             __glXSetError(gc, GL_OUT_OF_MEMORY);
             return;
@@ -313,7 +315,7 @@ __indirect_glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustr,
           */
          __glFillMap2f(k, uord, vord, ustr, vstr, pnts, buf);
          __glXSendLargeCommand(gc, pc, 36, buf, compsize);
-         Xfree((char *) buf);
+         free((char *) buf);
       }
       else {
          /* Data is already packed.  Just send it out */
@@ -379,3 +381,5 @@ __indirect_glDisable(GLenum cap)
    __GLX_PUT_LONG(4, cap);
    __GLX_END(8);
 }
+
+#endif