fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'origin/master'

Browse source
This commit is contained in:
José Fonseca 2010-02-05 13:50:24 +00:00
commit 8eda504203
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/drivers/dri/r200/r200_state.c
View file

@ -595,6 +595,13 @@ static void r200PointSize( GLcontext *ctx, GLfloat size )
r200ContextPtr rmesa = R200_CONTEXT(ctx);
GLfloat *fcmd = (GLfloat *)rmesa->hw.ptp.cmd;
radeon_print(RADEON_STATE, RADEON_TRACE,
"%s(%p) size: %f, fixed point result: %d.%d (%d/16)\n",
__func__, ctx, size,
((GLuint)(ctx->Point.Size * 16.0))/16,
(((GLuint)(ctx->Point.Size * 16.0))&15)*100/16,
((GLuint)(ctx->Point.Size * 16.0))&15);
R200_STATECHANGE( rmesa, cst );
R200_STATECHANGE( rmesa, ptp );
rmesa->hw.cst.cmd[CST_RE_POINTSIZE] &= ~0xffff;

11
src/mesa/drivers/dri/r200/r200_state_init.c
View file

@ -347,6 +347,15 @@ static int check_rrb(GLcontext *ctx, struct radeon_state_atom *atom)
return atom->cmd_size;
}
static int check_polygon_stipple(GLcontext *ctx,
struct radeon_state_atom *atom)
{
r200ContextPtr r200 = R200_CONTEXT(ctx);
if (r200->hw.set.cmd[SET_RE_CNTL] & R200_STIPPLE_ENABLE)
return atom->cmd_size;
return 0;
}
static void mtl_emit(GLcontext *ctx, struct radeon_state_atom *atom)
{
r200ContextPtr r200 = R200_CONTEXT(ctx);
@ -885,7 +894,7 @@ void r200InitState( r200ContextPtr rmesa )
}
}
ALLOC_STATE( stp, always, STP_STATE_SIZE, "STP/stp", 0 );
ALLOC_STATE( stp, polygon_stipple, STP_STATE_SIZE, "STP/stp", 0 );
for (i = 0; i < 6; i++)
if (rmesa->radeon.radeonScreen->kernel_mm)