diff options
| author | brianp <brianp> | 2002-10-31 00:38:59 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2002-10-31 00:38:59 +0000 |
| commit | 0677ebc4dc34e3c83020b7eb959a02f1a424711d (patch) | |
| tree | 036e5a6ea9377c03ad65be21c6d77ae059232c04 /xc | |
| parent | 0335d6e12c78cfbd628dc8da5a594165cd909103 (diff) | |
sync with latest Mesa 4.0.4 updates
Diffstat (limited to 'xc')
| -rw-r--r-- | xc/extras/Mesa/src/swrast/s_context.c | 1 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/swrast/s_tritemp.h | 2 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/texstore.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/xc/extras/Mesa/src/swrast/s_context.c b/xc/extras/Mesa/src/swrast/s_context.c index 4cdb4f87f..dc1e3792e 100644 --- a/xc/extras/Mesa/src/swrast/s_context.c +++ b/xc/extras/Mesa/src/swrast/s_context.c @@ -539,6 +539,7 @@ void _swrast_render_finish( GLcontext *ctx ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); + _mesa_flush_pb(ctx); if (swrast->Driver.SpanRenderFinish) swrast->Driver.SpanRenderFinish( ctx ); } diff --git a/xc/extras/Mesa/src/swrast/s_tritemp.h b/xc/extras/Mesa/src/swrast/s_tritemp.h index 95e40dc61..e5ad19443 100644 --- a/xc/extras/Mesa/src/swrast/s_tritemp.h +++ b/xc/extras/Mesa/src/swrast/s_tritemp.h @@ -211,7 +211,7 @@ if (area * bf < 0.0) return; - if (area == 0.0F || IS_INF_OR_NAN(area)) + if (IS_INF_OR_NAN(area) || area == 0.0F) return; oneOverArea = 1.0F / area; diff --git a/xc/extras/Mesa/src/texstore.c b/xc/extras/Mesa/src/texstore.c index 634f719be..a0a50123c 100644 --- a/xc/extras/Mesa/src/texstore.c +++ b/xc/extras/Mesa/src/texstore.c @@ -264,7 +264,6 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions, + dstYoffset * (dstRowStride / sizeof(GLushort)) + dstXoffset * texComponents; ASSERT(ctx->Extensions.MESA_ycbcr_texture); - printf("copy ycbcr\n"); for (img = 0; img < srcDepth; img++) { GLushort *destRow = dest; for (row = 0; row < srcHeight; row++) { |