diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
| commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
| tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/src/mesa/swrast/s_context.c | |
| parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_context.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_context.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c index 06824ea2c..14cb9b180 100644 --- a/mesalib/src/mesa/swrast/s_context.c +++ b/mesalib/src/mesa/swrast/s_context.c @@ -752,9 +752,6 @@ _swrast_CreateContext( struct gl_context *ctx ) swrast->Driver.SpanRenderStart = _swrast_span_render_start; swrast->Driver.SpanRenderFinish = _swrast_span_render_finish; - ctx->Driver.MapTexture = _swrast_map_texture; - ctx->Driver.UnmapTexture = _swrast_unmap_texture; - for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) swrast->TextureSample[i] = NULL; @@ -872,10 +869,11 @@ void _swrast_render_finish( struct gl_context *ctx ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); - if (swrast->Driver.SpanRenderFinish) - swrast->Driver.SpanRenderFinish( ctx ); _swrast_flush(ctx); + + if (swrast->Driver.SpanRenderFinish) + swrast->Driver.SpanRenderFinish( ctx ); } |