summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-11-12 11:28:03 -0800
committerMatt Turner <[email protected]>2014-11-21 10:26:42 -0800
commitd9432af45a1a69d0cd1dcf12edfae920adeb4734 (patch)
treed319b53e3777bf6a275c493ce73fcd9ce84b872b
parentbd502139290ea902cbc4b5f535c102f8f98774b1 (diff)
i965: Move common fields into backend_instruction.
Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.h3
3 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 15eb76a2b5b..a675b2ef6e1 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -281,8 +281,6 @@ public:
uint8_t regs_written; /**< Number of vgrfs written by a SEND message, or 1 */
bool eot:1;
- bool header_present:1;
- bool shadow_compare:1;
bool force_uncompressed:1;
bool force_sechalf:1;
bool pi_noperspective:1; /**< Pixel interpolator noperspective flag */
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index 32460e233b9..cdf86ff3cee 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -126,6 +126,8 @@ struct backend_instruction {
bool no_dd_clear:1;
bool no_dd_check:1;
bool saturate:1;
+ bool shadow_compare:1;
+ bool header_present:1;
};
#ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index 8e7dfe16c7d..44aea0ea8ee 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -215,10 +215,7 @@ public:
dst_reg dst;
src_reg src[3];
- bool shadow_compare;
-
enum brw_urb_write_flags urb_write_flags;
- bool header_present;
unsigned sol_binding; /**< gen6: SOL binding table index */
bool sol_final_write; /**< gen6: send commit message */