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

i965: upload multisample state for fragment program change

Browse source 
This makes conformance tests stable on sandybridge D0 to track
multisample state before SF/WM state.
This commit is contained in:
Zhenyu Wang 2010-12-23 16:30:20 +08:00
parent 845d651cf6
commit de6fd527a5
3 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/mesa/drivers/dri/i965/brw_misc_state.c
View file

@ -488,31 +488,6 @@ static void upload_invarient_state( struct brw_context *brw )
BRW_BATCH_STRUCT(brw, &gdo);
}
if (intel->gen >= 6) {
int i;
BEGIN_BATCH(3);
OUT_BATCH(CMD_3D_MULTISAMPLE << 16 | (3 - 2));
OUT_BATCH(MS_PIXEL_LOCATION_CENTER |
MS_NUMSAMPLES_1);
OUT_BATCH(0); /* positions for 4/8-sample */
ADVANCE_BATCH();
BEGIN_BATCH(2);
OUT_BATCH(CMD_3D_SAMPLE_MASK << 16 | (2 - 2));
OUT_BATCH(1);
ADVANCE_BATCH();
for (i = 0; i < 4; i++) {
BEGIN_BATCH(4);
OUT_BATCH(CMD_GS_SVB_INDEX << 16 | (4 - 2));
OUT_BATCH(i << SVB_INDEX_SHIFT);
OUT_BATCH(0);
OUT_BATCH(0xffffffff);
ADVANCE_BATCH();
}
}
/* 0x61020000 State Instruction Pointer */
{
struct brw_system_instruction_pointer sip;
@ -547,6 +522,42 @@ const struct brw_tracked_state brw_invarient_state = {
.emit = upload_invarient_state
};
static void gen6_upload_multisample_state( struct brw_context *brw )
{
struct intel_context *intel = &brw->intel;
int i;
BEGIN_BATCH(3);
OUT_BATCH(CMD_3D_MULTISAMPLE << 16 | (3 - 2));
OUT_BATCH(MS_PIXEL_LOCATION_CENTER |
MS_NUMSAMPLES_1);
OUT_BATCH(0); /* positions for 4/8-sample */
ADVANCE_BATCH();
BEGIN_BATCH(2);
OUT_BATCH(CMD_3D_SAMPLE_MASK << 16 | (2 - 2));
OUT_BATCH(1);
ADVANCE_BATCH();
for (i = 0; i < 4; i++) {
BEGIN_BATCH(4);
OUT_BATCH(CMD_GS_SVB_INDEX << 16 | (4 - 2));
OUT_BATCH(i << SVB_INDEX_SHIFT);
OUT_BATCH(0);
OUT_BATCH(0xffffffff);
ADVANCE_BATCH();
}
}
const struct brw_tracked_state gen6_multisample_state = {
.dirty = {
.mesa = 0,
.brw = (BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM),
.cache = 0,
},
.emit = gen6_upload_multisample_state
};
/**
* Define the base addresses which some state is referenced from.
*

1
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -110,6 +110,7 @@ extern const struct brw_tracked_state gen6_viewport_state;
extern const struct brw_tracked_state gen6_vs_state;
extern const struct brw_tracked_state gen6_wm_constants;
extern const struct brw_tracked_state gen6_wm_state;
extern const struct brw_tracked_state gen6_multisample_state;
/***********************************************************************
* brw_state.c

1
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -142,6 +142,7 @@ const struct brw_tracked_state *gen6_atoms[] =
&gen6_vs_state,
&gen6_gs_state,
&gen6_clip_state,
&gen6_multisample_state,
&gen6_sf_state,
&gen6_wm_state,