fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: fix glClear with multiple colorbuffers and different formats

Browse source 
Cc: 10.0 9.2 9.1 <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Marek Olšák 2013-12-04 00:39:52 +01:00
parent 03d848ea10
commit 0612005aa6
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/state_tracker/st_cb_clear.c
View file

@ -224,7 +224,6 @@ clear_with_quad(struct gl_context *ctx,
const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax / fb_width * 2.0f - 1.0f;
const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin / fb_height * 2.0f - 1.0f;
const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax / fb_height * 2.0f - 1.0f;
union pipe_color_union clearColor;
unsigned num_layers =
util_framebuffer_get_num_layers(&st->state.framebuffer);
@ -333,19 +332,13 @@ clear_with_quad(struct gl_context *ctx,
else
set_vertex_shader(st);
if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {
struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];
GLboolean is_integer = _mesa_is_enum_format_integer(rb->InternalFormat);
st_translate_color(&ctx->Color.ClearColor,
&clearColor,
ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,
is_integer);
}
/* We can't translate the clear color to the colorbuffer format,
* because different colorbuffers may have different formats.
*/
/* draw quad matching scissor rect */
draw_quad(st, x0, y0, x1, y1, (GLfloat) ctx->Depth.Clear, num_layers,
&clearColor);
(union pipe_color_union*)&ctx->Color.ClearColor);
/* Restore pipe state */
cso_restore_blend(st->cso_context);
@ -476,19 +469,11 @@ st_Clear(struct gl_context *ctx, GLbitfield mask)
quad_buffers & PIPE_CLEAR_DEPTH,
quad_buffers & PIPE_CLEAR_STENCIL);
} else if (clear_buffers) {
union pipe_color_union clearColor;
if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {
struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];
GLboolean is_integer = _mesa_is_enum_format_integer(rb->InternalFormat);
st_translate_color(&ctx->Color.ClearColor,
&clearColor,
ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,
is_integer);
}
st->pipe->clear(st->pipe, clear_buffers, &clearColor,
/* We can't translate the clear color to the colorbuffer format,
* because different colorbuffers may have different formats.
*/
st->pipe->clear(st->pipe, clear_buffers,
(union pipe_color_union*)&ctx->Color.ClearColor,
ctx->Depth.Clear, ctx->Stencil.Clear);
}
if (mask & BUFFER_BIT_ACCUM)