summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-12-05 20:40:48 -0700
committerBrian Paul <brianp@vmware.com>2011-12-08 08:56:30 -0700
commitd0dc75c000d5af92648c7de901756400672b8447 (patch)
treeb24277323119309015a3d8a2e3aea266d09b4299 /src/mesa/drivers/x11
parentb85284f45e8b05ba9a0dac8dd95a9c078e4a635e (diff)
mesa/drivers: use new swrast renderbuffer functions
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/xm_api.c15
-rw-r--r--src/mesa/drivers/x11/xm_buffer.c7
2 files changed, 12 insertions, 10 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 7d602801ab..81b2459376 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -73,6 +73,7 @@
#include "main/teximage.h"
#include "glapi/glthread.h"
#include "swrast/swrast.h"
+#include "swrast/s_renderbuffer.h"
#include "swrast_setup/swrast_setup.h"
#include "vbo/vbo.h"
#include "tnl/tnl.h"
@@ -331,13 +332,13 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type,
/*
* Other renderbuffer (depth, stencil, etc)
*/
- _mesa_add_soft_renderbuffers(&b->mesa_buffer,
- GL_FALSE, /* color */
- vis->mesa_visual.haveDepthBuffer,
- vis->mesa_visual.haveStencilBuffer,
- vis->mesa_visual.haveAccumBuffer,
- GL_FALSE, /* software alpha buffer */
- vis->mesa_visual.numAuxBuffers > 0 );
+ _swrast_add_soft_renderbuffers(&b->mesa_buffer,
+ GL_FALSE, /* color */
+ vis->mesa_visual.haveDepthBuffer,
+ vis->mesa_visual.haveStencilBuffer,
+ vis->mesa_visual.haveAccumBuffer,
+ GL_FALSE, /* software alpha buffer */
+ vis->mesa_visual.numAuxBuffers > 0 );
/* GLX_EXT_texture_from_pixmap */
b->TextureTarget = 0;
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 11b7c244ea..84e6fcd795 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -35,6 +35,7 @@
#include "main/formats.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
+#include "swrast/s_renderbuffer.h"
#define XMESA_RENDERBUFFER 0x1234
@@ -481,8 +482,8 @@ xmesa_MapRenderbuffer(struct gl_context *ctx,
}
/* otherwise, this is an ordinary malloc-based renderbuffer */
- _mesa_map_soft_renderbuffer(ctx, rb, x, y, w, h, mode,
- mapOut, rowStrideOut);
+ _swrast_map_soft_renderbuffer(ctx, rb, x, y, w, h, mode,
+ mapOut, rowStrideOut);
}
@@ -528,7 +529,7 @@ xmesa_UnmapRenderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb)
}
/* otherwise, this is an ordinary malloc-based renderbuffer */
- _mesa_unmap_soft_renderbuffer(ctx, rb);
+ _swrast_unmap_soft_renderbuffer(ctx, rb);
}