i965g: propogate nr_cbufs into wm prog key

This commit is contained in:
Keith Whitwell
2009-11-06 12:51:26 +00:00
parent 1e3910a878
commit 3e14a482da
3 changed files with 10 additions and 1 deletions
+1
View File
@@ -209,6 +209,7 @@ struct brw_sampler {
#define PIPE_NEW_QUERY 0x80000
#define PIPE_NEW_SCISSOR 0x100000
#define PIPE_NEW_BOUND_TEXTURES 0x200000
#define PIPE_NEW_NR_CBUFS 0x400000
+4 -1
View File
@@ -38,7 +38,10 @@ static void brw_set_framebuffer_state( struct pipe_context *pipe,
}
}
brw->curr.fb.nr_cbufs = fb->nr_cbufs;
if (brw->curr.fb.nr_cbufs != fb->nr_cbufs) {
brw->curr.fb.nr_cbufs = fb->nr_cbufs;
brw->state.dirty.mesa |= PIPE_NEW_NR_CBUFS;
}
}
+5
View File
@@ -259,6 +259,10 @@ static void brw_wm_populate_key( struct brw_context *brw,
/* CACHE_NEW_VS_PROG */
key->vp_nr_outputs = brw->vs.prog_data->nr_outputs;
key->nr_cbufs = brw->curr.fb.nr_cbufs;
key->nr_inputs = brw->curr.fragment_shader->info.num_inputs;
/* The unique fragment program ID */
key->program_string_id = brw->curr.fragment_shader->id;
}
@@ -294,6 +298,7 @@ const struct brw_tracked_state brw_wm_prog = {
.mesa = (PIPE_NEW_FRAGMENT_SHADER |
PIPE_NEW_DEPTH_STENCIL_ALPHA |
PIPE_NEW_RAST |
PIPE_NEW_NR_CBUFS |
PIPE_NEW_BOUND_TEXTURES),
.brw = (BRW_NEW_WM_INPUT_DIMENSIONS |
BRW_NEW_REDUCED_PRIMITIVE),