fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 12:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Need to emit a hardware scissor rectangle even if scissor is disabled.

Browse source 
Just make it cover the whole framebuffer in that case. Otherwise the kernel CS
checker may complain, e.g. running progs/demos/gearbox. That runs fast now
here, but doesn't look right yet.
This commit is contained in:
Michel Dänzer 2009-12-05 17:48:00 +01:00 • committed by Michel Dänzer
parent 01537a84df
commit 56a4342a04
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/r300/r300_context.h
View file

@ -101,6 +101,8 @@ struct r300_sampler_state {
struct r300_scissor_state {
uint32_t scissor_top_left; /* R300_SC_SCISSORS_TL: 0x43e0 */
uint32_t scissor_bottom_right; /* R300_SC_SCISSORS_BR: 0x43e4 */
uint32_t no_scissor_top_left; /* R300_SC_SCISSORS_TL: 0x43e0 */
uint32_t no_scissor_bottom_right; /* R300_SC_SCISSORS_BR: 0x43e4 */
};
struct r300_texture_state {

9
src/gallium/drivers/r300/r300_emit.c
View file

@ -570,8 +570,13 @@ void r300_emit_scissor_state(struct r300_context* r300,
BEGIN_CS(3);
OUT_CS_REG_SEQ(R300_SC_SCISSORS_TL, 2);
OUT_CS(scissor->scissor_top_left);
OUT_CS(scissor->scissor_bottom_right);
if (r300->rs_state->rs.scissor) {
OUT_CS(scissor->scissor_top_left);
OUT_CS(scissor->scissor_bottom_right);
} else {
OUT_CS(scissor->no_scissor_top_left);
OUT_CS(scissor->no_scissor_bottom_right);
}
END_CS;
}

19
src/gallium/drivers/r300/r300_state.c
View file

@ -302,6 +302,25 @@ static void
r300->framebuffer_state = *state;
r300->dirty_state |= R300_NEW_FRAMEBUFFERS;
if (r300_screen(r300->context.screen)->caps->is_r500) {
r300->scissor_state->no_scissor_top_left =
(0 << R300_SCISSORS_X_SHIFT) |
(0 << R300_SCISSORS_Y_SHIFT);
r300->scissor_state->no_scissor_bottom_right =
((state->width - 1) << R300_SCISSORS_X_SHIFT) |
((state->height - 1) << R300_SCISSORS_Y_SHIFT);
} else {
/* Offset of 1440 in non-R500 chipsets. */
r300->scissor_state->no_scissor_top_left =
((0 + 1440) << R300_SCISSORS_X_SHIFT) |
((0 + 1440) << R300_SCISSORS_Y_SHIFT);
r300->scissor_state->no_scissor_bottom_right =
(((state->width - 1) + 1440) << R300_SCISSORS_X_SHIFT) |
(((state->height - 1) + 1440) << R300_SCISSORS_Y_SHIFT);
}
r300->dirty_state |= R300_NEW_SCISSOR;
}
/* Create fragment shader state. */