fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 20:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: add polygon mode

Browse source 
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
This commit is contained in:
Marek Olšák 2009-11-04 10:56:44 +01:00 • committed by Corbin Simpson
parent 4671005a43
commit c2e47191d7
5 changed files with 67 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ struct r300_rs_state {
uint32_t line_stipple_config; /* R300_GA_LINE_STIPPLE_CONFIG: 0x4328 */
uint32_t line_stipple_value; /* R300_GA_LINE_STIPPLE_VALUE: 0x4260 */
uint32_t color_control; /* R300_GA_COLOR_CONTROL: 0x4278 */
uint32_t polygon_mode; /* R300_GA_POLY_MODE: 0x4288 */
};
struct r300_rs_block {

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

@ -483,7 +483,7 @@ void r300_emit_rs_state(struct r300_context* r300, struct r300_rs_state* rs)
{
CS_LOCALS(r300);
BEGIN_CS(20);
BEGIN_CS(22);
OUT_CS_REG(R300_VAP_CNTL_STATUS, rs->vap_control_status);
OUT_CS_REG(R300_GA_POINT_SIZE, rs->point_size);
OUT_CS_REG_SEQ(R300_GA_POINT_MINMAX, 2);
@ -499,6 +499,7 @@ void r300_emit_rs_state(struct r300_context* r300, struct r300_rs_state* rs)
OUT_CS_REG(R300_GA_LINE_STIPPLE_CONFIG, rs->line_stipple_config);
OUT_CS_REG(R300_GA_LINE_STIPPLE_VALUE, rs->line_stipple_value);
OUT_CS_REG(R300_GA_COLOR_CONTROL, rs->color_control);
OUT_CS_REG(R300_GA_POLY_MODE, rs->polygon_mode);
END_CS;
}

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

@ -398,25 +398,52 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
rs->line_control = pack_float_16_6x(state->line_width) |
R300_GA_LINE_CNTL_END_TYPE_COMP;
/* XXX I think there is something wrong with the polygon mode,
* XXX re-test when r300g is in a better shape */
/* Enable polygon mode */
if (state->fill_cw != PIPE_POLYGON_MODE_FILL ||
state->fill_ccw != PIPE_POLYGON_MODE_FILL) {
rs->polygon_mode = R300_GA_POLY_MODE_DUAL;
}
/* Radeons don't think in "CW/CCW", they think in "front/back". */
if (state->front_winding == PIPE_WINDING_CW) {
rs->cull_mode = R300_FRONT_FACE_CW;
/* Polygon offset */
if (state->offset_cw) {
rs->polygon_offset_enable |= R300_FRONT_ENABLE;
}
if (state->offset_ccw) {
rs->polygon_offset_enable |= R300_BACK_ENABLE;
}
/* Polygon mode */
if (rs->polygon_mode) {
rs->polygon_mode |=
r300_translate_polygon_mode_front(state->fill_cw);
rs->polygon_mode |=
r300_translate_polygon_mode_back(state->fill_ccw);
}
} else {
rs->cull_mode = R300_FRONT_FACE_CCW;
/* Polygon offset */
if (state->offset_ccw) {
rs->polygon_offset_enable |= R300_FRONT_ENABLE;
}
if (state->offset_cw) {
rs->polygon_offset_enable |= R300_BACK_ENABLE;
}
/* Polygon mode */
if (rs->polygon_mode) {
rs->polygon_mode |=
r300_translate_polygon_mode_front(state->fill_ccw);
rs->polygon_mode |=
r300_translate_polygon_mode_back(state->fill_cw);
}
}
if (state->front_winding & state->cull_mode) {
rs->cull_mode |= R300_CULL_FRONT;

36
src/gallium/drivers/r300/r300_state_inlines.h
View file

@ -504,4 +504,40 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) {
(0xf << R300_WRITE_ENA_SHIFT));
}
static INLINE uint32_t
r300_translate_polygon_mode_front(unsigned mode) {
switch (mode)
{
case PIPE_POLYGON_MODE_FILL:
return R300_GA_POLY_MODE_FRONT_PTYPE_TRI;
case PIPE_POLYGON_MODE_LINE:
return R300_GA_POLY_MODE_FRONT_PTYPE_LINE;
case PIPE_POLYGON_MODE_POINT:
return R300_GA_POLY_MODE_FRONT_PTYPE_POINT;
default:
debug_printf("r300: Bad polygon mode %i in %s\n", mode,
__FUNCTION__);
return R300_GA_POLY_MODE_FRONT_PTYPE_TRI;
}
}
static INLINE uint32_t
r300_translate_polygon_mode_back(unsigned mode) {
switch (mode)
{
case PIPE_POLYGON_MODE_FILL:
return R300_GA_POLY_MODE_BACK_PTYPE_TRI;
case PIPE_POLYGON_MODE_LINE:
return R300_GA_POLY_MODE_BACK_PTYPE_LINE;
case PIPE_POLYGON_MODE_POINT:
return R300_GA_POLY_MODE_BACK_PTYPE_POINT;
default:
debug_printf("r300: Bad polygon mode %i in %s\n", mode,
__FUNCTION__);
return R300_GA_POLY_MODE_BACK_PTYPE_TRI;
}
}
#endif /* R300_STATE_INLINES_H */

3
src/gallium/drivers/r300/r300_state_invariant.c
View file

@ -84,7 +84,7 @@ void r300_emit_invariant_state(struct r300_context* r300)
END_CS;
/* XXX unsorted stuff from surface_fill */
BEGIN_CS(62 + (caps->has_tcl ? 5 : 0) + (caps->is_r500 ? 4 : 0));
BEGIN_CS(60 + (caps->has_tcl ? 5 : 0) + (caps->is_r500 ? 4 : 0));
/* Flush PVS. */
OUT_CS_REG(R300_VAP_PVS_STATE_FLUSH_REG, 0x0);
@ -114,7 +114,6 @@ void r300_emit_invariant_state(struct r300_context* r300)
/* XXX this big chunk should be refactored into rs_state */
OUT_CS_REG(R300_GA_SOLID_RG, 0x00000000);
OUT_CS_REG(R300_GA_SOLID_BA, 0x00000000);
OUT_CS_REG(R300_GA_POLY_MODE, 0x00000000);
OUT_CS_REG(R300_GA_ROUND_MODE, 0x00000001);
OUT_CS_REG(R300_GA_OFFSET, 0x00000000);
OUT_CS_REG(R300_GA_FOG_SCALE, 0x3DBF1412);