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

965: make sure stipple state gets uploaded

Browse source
This commit is contained in:
Keith Whitwell 2007-12-19 13:12:34 +00:00
parent 2e3dfe97ee
commit 65f67baa42
4 changed files with 65 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/pipe/i965simple/brw_context.h
View file

@ -666,8 +666,6 @@ void brwUpdateTextureState( struct brw_context *brw );
void brw_upload_urb_fence(struct brw_context *brw);
void brw_upload_constant_buffer_state(struct brw_context *brw);
void brw_upload_polygon_stipple(struct brw_context *brw);
void brw_upload_line_stipple(struct brw_context *brw);
void brw_init_surface_functions(struct brw_context *brw);
void brw_init_state_functions(struct brw_context *brw);

86
src/mesa/pipe/i965simple/brw_misc_state.c
View file

@ -42,7 +42,7 @@
* Blend color
*/
void brw_upload_blend_constant_color(struct brw_context *brw)
static void upload_blend_constant_color(struct brw_context *brw)
{
struct brw_blend_constant_color bcc;
@ -57,6 +57,19 @@ void brw_upload_blend_constant_color(struct brw_context *brw)
BRW_CACHED_BATCH_STRUCT(brw, &bcc);
}
const struct brw_tracked_state brw_blend_constant_color = {
.dirty = {
.brw = BRW_NEW_BLEND,
.cache = 0
},
.update = upload_blend_constant_color
};
/***********************************************************************
* Drawing rectangle
*/
static void upload_drawing_rect(struct brw_context *brw)
{
struct brw_drawrect bdr;
@ -243,7 +256,7 @@ static void upload_depthbuffer(struct brw_context *brw)
const struct brw_tracked_state brw_depthbuffer = {
.dirty = {
.brw = 0,
.brw = BRW_NEW_SCENE,
.cache = 0
},
.update = upload_depthbuffer,
@ -251,50 +264,43 @@ const struct brw_tracked_state brw_depthbuffer = {
/***********************************************************************
* Polygon stipple offset packet
*/
static void upload_polygon_stipple_offset(struct brw_context *brw)
{
struct brw_polygon_stipple_offset bpso;
memset(&bpso, 0, sizeof(bpso));
bpso.header.opcode = CMD_POLY_STIPPLE_OFFSET;
bpso.header.length = sizeof(bpso)/4-2;
bpso.bits0.x_offset = 0;
bpso.bits0.y_offset = 0;
BRW_CACHED_BATCH_STRUCT(brw, &bpso);
}
/***********************************************************************
* Polygon stipple packet
*/
void brw_upload_polygon_stipple(struct brw_context *brw)
static void upload_polygon_stipple(struct brw_context *brw)
{
struct brw_polygon_stipple bps;
unsigned i;
/*update the offset at the same time it will always be 0*/
upload_polygon_stipple_offset(brw);
memset(&bps, 0, sizeof(bps));
bps.header.opcode = CMD_POLY_STIPPLE_PATTERN;
bps.header.length = sizeof(bps)/4-2;
for (i = 0; i < 32; i++)
bps.stipple[i] = brw->attribs.PolygonStipple->stipple[31 - i]; /* invert */
/* XXX: state tracker should send *all* state down initially!
*/
if (brw->attribs.PolygonStipple)
for (i = 0; i < 32; i++)
bps.stipple[i] = brw->attribs.PolygonStipple->stipple[31 - i]; /* invert */
BRW_CACHED_BATCH_STRUCT(brw, &bps);
}
const struct brw_tracked_state brw_polygon_stipple = {
.dirty = {
.brw = BRW_NEW_STIPPLE,
.cache = 0
},
.update = upload_polygon_stipple
};
/***********************************************************************
* Line stipple packet
*/
void brw_upload_line_stipple(struct brw_context *brw)
static void upload_line_stipple(struct brw_context *brw)
{
struct brw_line_stipple bls;
float tmp;
@ -316,6 +322,14 @@ void brw_upload_line_stipple(struct brw_context *brw)
BRW_CACHED_BATCH_STRUCT(brw, &bls);
}
const struct brw_tracked_state brw_line_stipple = {
.dirty = {
.brw = BRW_NEW_STIPPLE,
.cache = 0
},
.update = upload_line_stipple
};
/***********************************************************************
* Misc constant state packets
@ -355,6 +369,15 @@ const struct brw_tracked_state brw_pipe_control = {
static void upload_invarient_state( struct brw_context *brw )
{
{
struct brw_mi_flush flush;
memset(&flush, 0, sizeof(flush));
flush.opcode = CMD_MI_FLUSH;
flush.flags = BRW_FLUSH_STATE_CACHE | BRW_FLUSH_READ_CACHE;
BRW_BATCH_STRUCT(brw, &flush);
}
{
/* 0x61040000 Pipeline Select */
/* PipelineSelect : 0 */
@ -403,6 +426,19 @@ static void upload_invarient_state( struct brw_context *brw )
BRW_BATCH_STRUCT(brw, &vfs);
}
{
struct brw_polygon_stipple_offset bpso;
memset(&bpso, 0, sizeof(bpso));
bpso.header.opcode = CMD_POLY_STIPPLE_OFFSET;
bpso.header.length = sizeof(bpso)/4-2;
bpso.bits0.x_offset = 0;
bpso.bits0.y_offset = 0;
BRW_BATCH_STRUCT(brw, &bpso);
}
}
const struct brw_tracked_state brw_invarient_state = {

5
src/mesa/pipe/i965simple/brw_state.h
View file

@ -65,7 +65,6 @@ const struct brw_tracked_state brw_urb_fence;
const struct brw_tracked_state brw_vertex_state;
const struct brw_tracked_state brw_vs_prog;
const struct brw_tracked_state brw_vs_unit;
const struct brw_tracked_state brw_wm_input_sizes;
const struct brw_tracked_state brw_wm_prog;
const struct brw_tracked_state brw_wm_samplers;
const struct brw_tracked_state brw_wm_surfaces;
@ -149,10 +148,6 @@ void brw_clear_all_caches( struct brw_context *brw );
void brw_invalidate_pools( struct brw_context *brw );
void brw_clear_batch_cache_flush( struct brw_context *brw );
void brw_upload_cc_unit(struct brw_context *brw);
void brw_upload_clip_prog(struct brw_context *brw);
void brw_upload_blend_constant_color(struct brw_context *brw);
void brw_upload_wm_samplers(struct brw_context *brw);
/* brw_shader_info.c
*/

7
src/mesa/pipe/i965simple/brw_state_upload.c
View file

@ -43,7 +43,6 @@
*/
const struct brw_tracked_state *atoms[] =
{
&brw_wm_input_sizes,
&brw_vs_prog,
&brw_gs_prog,
&brw_clip_prog,
@ -84,8 +83,6 @@ const struct brw_tracked_state *atoms[] =
&brw_depthbuffer,
&brw_polygon_stipple,
&brw_polygon_stipple_offset,
&brw_line_stipple,
&brw_psp_urb_cbs,
@ -192,6 +189,10 @@ void brw_validate_state( struct brw_context *brw )
for (i = 0; i < Elements(atoms); i++) {
const struct brw_tracked_state *atom = atoms[i];
assert(atom->dirty.brw ||
atom->dirty.cache);
assert(atom->update);
if (check_state(state, &atom->dirty))
atom->update( brw );
}