projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Give the math opcodes information on base mrf/mrf len.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_state_upload.c
diff --git
a/src/mesa/drivers/dri/i965/brw_state_upload.c
b/src/mesa/drivers/dri/i965/brw_state_upload.c
index f92a19c2aa0f7c28905d562d6661244ceb794a4f..1aadd5ca61d8c154ce2a0c3a425176e547ca4ac4 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/
src/mesa/drivers/dri/i965/brw_state_upload.c
@@
-35,7
+35,6
@@
#include "brw_state.h"
#include "intel_batchbuffer.h"
#include "intel_buffers.h"
#include "brw_state.h"
#include "intel_batchbuffer.h"
#include "intel_buffers.h"
-#include "intel_chipset.h"
/* This is used to initialize brw->state.atoms[]. We could use this
* list directly except for a single atom, brw_constant_buffer, which
/* This is used to initialize brw->state.atoms[]. We could use this
* list directly except for a single atom, brw_constant_buffer, which
@@
-129,7
+128,7
@@
const struct brw_tracked_state *gen6_atoms[] =
&gen6_cc_state_pointers,
&brw_vs_constants, /* Before vs_surfaces and constant_buffer */
&gen6_cc_state_pointers,
&brw_vs_constants, /* Before vs_surfaces and constant_buffer */
- &
brw
_wm_constants, /* Before wm_surfaces and constant_buffer */
+ &
gen6
_wm_constants, /* Before wm_surfaces and constant_buffer */
&brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
&brw_vs_surfaces, /* must do before unit */
&brw_wm_constant_surface, /* must do before wm surfaces/bind bo */
@@
-146,6
+145,7
@@
const struct brw_tracked_state *gen6_atoms[] =
&gen6_wm_state,
&gen6_scissor_state,
&gen6_wm_state,
&gen6_scissor_state,
+ &gen6_scissor_state_pointers,
&brw_state_base_address,
&brw_state_base_address,
@@
-232,7
+232,6
@@
static struct dirty_bit_map mesa_bits[] = {
DEFINE_BIT(_NEW_MODELVIEW),
DEFINE_BIT(_NEW_PROJECTION),
DEFINE_BIT(_NEW_TEXTURE_MATRIX),
DEFINE_BIT(_NEW_MODELVIEW),
DEFINE_BIT(_NEW_PROJECTION),
DEFINE_BIT(_NEW_TEXTURE_MATRIX),
- DEFINE_BIT(_NEW_COLOR_MATRIX),
DEFINE_BIT(_NEW_ACCUM),
DEFINE_BIT(_NEW_COLOR),
DEFINE_BIT(_NEW_DEPTH),
DEFINE_BIT(_NEW_ACCUM),
DEFINE_BIT(_NEW_COLOR),
DEFINE_BIT(_NEW_DEPTH),
@@
-351,7
+350,7
@@
void brw_validate_state( struct brw_context *brw )
brw_add_validated_bo(brw, intel->batch->buf);
brw_add_validated_bo(brw, intel->batch->buf);
- if (
IS_GEN6(intel->intelScreen->deviceID)
) {
+ if (
intel->gen >= 6
) {
atoms = gen6_atoms;
num_atoms = ARRAY_SIZE(gen6_atoms);
} else {
atoms = gen6_atoms;
num_atoms = ARRAY_SIZE(gen6_atoms);
} else {
@@
-425,7
+424,7
@@
void brw_upload_state(struct brw_context *brw)
const struct brw_tracked_state **atoms;
int num_atoms;
const struct brw_tracked_state **atoms;
int num_atoms;
- if (
IS_GEN6(intel->intelScreen->deviceID)
) {
+ if (
intel->gen >= 6
) {
atoms = gen6_atoms;
num_atoms = ARRAY_SIZE(gen6_atoms);
} else {
atoms = gen6_atoms;
num_atoms = ARRAY_SIZE(gen6_atoms);
} else {