projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swrast: use ASSIGN_4V() macro
[mesa.git]
/
src
/
mesa
/
swrast
/
s_bitmap.c
diff --git
a/src/mesa/swrast/s_bitmap.c
b/src/mesa/swrast/s_bitmap.c
index 35b34e654ff45c8f6441f576173e9489e1b915ec..5e7822cf3231576c662aa617048cc79654e1ae43 100644
(file)
--- a/
src/mesa/swrast/s_bitmap.c
+++ b/
src/mesa/swrast/s_bitmap.c
@@
-50,7
+50,6
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
const struct gl_pixelstore_attrib *unpack,
const GLubyte *bitmap )
{
const struct gl_pixelstore_attrib *unpack,
const GLubyte *bitmap )
{
- SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint row, col;
GLuint count = 0;
SWspan span;
GLint row, col;
GLuint count = 0;
SWspan span;
@@
-61,7
+60,7
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
if (!bitmap)
return;
if (!bitmap)
return;
-
RENDER_START(swrast,
ctx);
+
swrast_render_start(
ctx);
if (SWRAST_CONTEXT(ctx)->NewState)
_swrast_validate_derived( ctx );
if (SWRAST_CONTEXT(ctx)->NewState)
_swrast_validate_derived( ctx );
@@
-132,7
+131,7
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
}
}
}
-
RENDER_FINISH(swrast,
ctx);
+
swrast_render_finish(
ctx);
_mesa_unmap_bitmap_pbo(ctx, unpack);
}
_mesa_unmap_bitmap_pbo(ctx, unpack);
}
@@
-157,7
+156,7
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
ASSERT(ctx->RenderMode == GL_RENDER);
ASSERT(bitmap);
ASSERT(ctx->RenderMode == GL_RENDER);
ASSERT(bitmap);
-
RENDER_START(swrast,
ctx);
+
swrast_render_start(
ctx);
if (SWRAST_CONTEXT(ctx)->NewState)
_swrast_validate_derived( ctx );
if (SWRAST_CONTEXT(ctx)->NewState)
_swrast_validate_derived( ctx );
@@
-224,6
+223,6
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
}
}
}
-
RENDER_FINISH(swrast,
ctx);
+
swrast_render_finish(
ctx);
}
#endif
}
#endif