diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
| commit | 4095d7af9f50126361eb7b0aeba6869786f63d5c (patch) | |
| tree | 949709675ee9efb10c9c65dc55615444d469e63a /mesalib/src/mesa/state_tracker/st_cb_clear.c | |
| parent | a0fc33d46dfe59745f22decb93fe147292335602 (diff) | |
| parent | 4420369d700d9db1563f8647e1889c6a0972ea2c (diff) | |
| download | vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.gz vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.bz2 vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_clear.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_clear.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 117000ba7..a4799e3cc 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -323,9 +323,9 @@ clear_with_quad(struct gl_context *ctx, set_vertex_shader(st); if (ctx->DrawBuffer->_ColorDrawBuffers[0]) { - st_translate_color(ctx->Color.ClearColorUnclamped, - ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat, - clearColor); + st_translate_color(ctx->Color.ClearColor.f, + ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat, + clearColor); } /* draw quad matching scissor rect */ @@ -582,12 +582,12 @@ st_Clear(struct gl_context *ctx, GLbitfield mask) clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL; if (ctx->DrawBuffer->_ColorDrawBuffers[0]) { - st_translate_color(ctx->Color.ClearColor, - ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat, - clearColor); + st_translate_color(ctx->Color.ClearColor.f, + ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat, + clearColor); } - st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColorUnclamped, + st->pipe->clear(st->pipe, clear_buffers, clearColor, ctx->Depth.Clear, ctx->Stencil.Clear); } if (mask & BUFFER_BIT_ACCUM) |