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 17f639fd5578ee3c0c93008fa5c5d53970942f15..5e7822cf3231576c662aa617048cc79654e1ae43 100644
(file)
--- a/
src/mesa/swrast/s_bitmap.c
+++ b/
src/mesa/swrast/s_bitmap.c
@@
-28,11
+28,11
@@
* \author Brian Paul
*/
* \author Brian Paul
*/
-#include "glheader.h"
-#include "bufferobj.h"
-#include "image.h"
-#include "macros.h"
-#include "pixel.h"
+#include "
main/
glheader.h"
+#include "
main/
bufferobj.h"
+#include "
main/
image.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
pixel.h"
#include "s_context.h"
#include "s_span.h"
#include "s_context.h"
#include "s_span.h"
@@
-50,20
+50,17
@@
_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;
ASSERT(ctx->RenderMode == GL_RENDER);
GLint row, col;
GLuint count = 0;
SWspan span;
ASSERT(ctx->RenderMode == GL_RENDER);
- bitmap = _mesa_validate_and_map_bitmap_pbo(ctx, width, height,
- unpack, bitmap);
- if (!bitmap) {
- return NULL;
- }
+ bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+ 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 );
@@
-134,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);
}
@@
-159,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 );
@@
-226,6
+223,6
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
}
}
}
-
RENDER_FINISH(swrast,
ctx);
+
swrast_render_finish(
ctx);
}
#endif
}
#endif