projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-master-merge'
[mesa.git]
/
src
/
mesa
/
swrast
/
s_drawpix.c
diff --git
a/src/mesa/swrast/s_drawpix.c
b/src/mesa/swrast/s_drawpix.c
index 09ff96fd3279fdd40d1d5802862c88717f833414..700f76d4bc461152046a37024af0dfdc624f3251 100644
(file)
--- a/
src/mesa/swrast/s_drawpix.c
+++ b/
src/mesa/swrast/s_drawpix.c
@@
-23,18
+23,17
@@
*/
*/
-#include "glheader.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "convolve.h"
-#include "image.h"
-#include "macros.h"
-#include "imports.h"
-#include "pixel.h"
-#include "state.h"
+#include "
main/
glheader.h"
+#include "
main/
bufferobj.h"
+#include "
main/
context.h"
+#include "
main/
convolve.h"
+#include "
main/
image.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
imports.h"
+#include "
main/
pixel.h"
+#include "
main/
state.h"
#include "s_context.h"
#include "s_context.h"
-#include "s_drawpix.h"
#include "s_span.h"
#include "s_stencil.h"
#include "s_zoom.h"
#include "s_span.h"
#include "s_stencil.h"
#include "s_zoom.h"
@@
-831,7
+830,7
@@
_swrast_DrawPixels( GLcontext *ctx,
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
RENDER_START(swrast,
ctx);
+
swrast_render_start(
ctx);
if (ctx->NewState)
_mesa_update_state(ctx);
if (ctx->NewState)
_mesa_update_state(ctx);
@@
-839,10
+838,11
@@
_swrast_DrawPixels( GLcontext *ctx,
if (swrast->NewState)
_swrast_validate_derived( ctx );
if (swrast->NewState)
_swrast_validate_derived( ctx );
- pixels = _mesa_
validate_and_map_drawpix_pbo(ctx, width, height,
- format, type, unpack, pixels);
- if (!pixels)
+ pixels = _mesa_
map_drawpix_pbo(ctx, unpack, pixels);
+ if (!pixels) {
+ swrast_render_finish(ctx);
return;
return;
+ }
switch (format) {
case GL_STENCIL_INDEX:
switch (format) {
case GL_STENCIL_INDEX:
@@
-879,9
+879,9
@@
_swrast_DrawPixels( GLcontext *ctx,
/* don't return yet, clean-up */
}
/* don't return yet, clean-up */
}
-
RENDER_FINISH(swrast,
ctx);
+
swrast_render_finish(
ctx);
- _mesa_unmap_drapix_pbo(ctx, unpack);
+ _mesa_unmap_dra
w
pix_pbo(ctx, unpack);
}
}
@@
-904,7
+904,7
@@
_swrast_DrawDepthPixelsMESA( GLcontext *ctx,
if (swrast->NewState)
_swrast_validate_derived( ctx );
if (swrast->NewState)
_swrast_validate_derived( ctx );
-
RENDER_START(swrast,
ctx);
+
swrast_render_start(
ctx);
switch (colorFormat) {
case GL_COLOR_INDEX:
switch (colorFormat) {
case GL_COLOR_INDEX:
@@
-933,6
+933,6
@@
_swrast_DrawDepthPixelsMESA( GLcontext *ctx,
_mesa_problem(ctx, "unexpected format in glDrawDepthPixelsMESA");
}
_mesa_problem(ctx, "unexpected format in glDrawDepthPixelsMESA");
}
-
RENDER_FINISH(swrast,
ctx);
+
swrast_render_finish(
ctx);
}
#endif
}
#endif