* Authors:
* Kevin E. Martin <martin@valinux.com>
* Gareth Hughes <gareth@valinux.com>
- * Keith Whitwell <keith@tungstengraphics.com>
+ * Keith Whitwell <keithw@vmware.com>
*
*/
#include "main/glheader.h"
#include "main/texformat.h"
#include "main/renderbuffer.h"
+#include "main/samplerobj.h"
#include "swrast/swrast.h"
#include "swrast/s_renderbuffer.h"
rrb->base.Map = map;
rrb->base.RowStride = stride;
/* No floating point color buffers, use GLubytes */
- rrb->Base.ColorType = GL_UNSIGNED_BYTE;
+ rrb->base.ColorType = GL_UNSIGNED_BYTE;
}
static void
static void radeonSpanRenderStart(struct gl_context * ctx)
{
radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
- int i;
radeon_firevertices(rmesa);
- for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
- if (ctx->Texture.Unit[i]._ReallyEnabled) {
- radeon_validate_texture_miptree(ctx, ctx->Texture.Unit[i]._Current);
- radeon_swrast_map_texture_images(ctx, ctx->Texture.Unit[i]._Current);
- }
- }
-
+ _swrast_map_textures(ctx);
+
radeon_map_framebuffer(ctx, ctx->DrawBuffer);
if (ctx->ReadBuffer != ctx->DrawBuffer)
radeon_map_framebuffer(ctx, ctx->ReadBuffer);
static void radeonSpanRenderFinish(struct gl_context * ctx)
{
- int i;
-
_swrast_flush(ctx);
-
- for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++)
- if (ctx->Texture.Unit[i]._ReallyEnabled)
- radeon_swrast_unmap_texture_images(ctx, ctx->Texture.Unit[i]._Current);
+ _swrast_unmap_textures(ctx);
radeon_unmap_framebuffer(ctx, ctx->DrawBuffer);
if (ctx->ReadBuffer != ctx->DrawBuffer)