i965: Add missing defines for render cache messages.

And remove duplicated definition of OWORD_DUAL_BLOCK_WRITE.

Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Francisco Jerez
2013-11-22 16:18:43 -08:00
parent cf67ca9ffa
commit 65f9b83e05
2 changed files with 8 additions and 2 deletions
+7 -1
View File
@@ -1440,7 +1440,13 @@ enum brw_message_target {
#define GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_UNORM_WRITE 14
/* GEN7 */
#define GEN7_DATAPORT_WRITE_MESSAGE_OWORD_DUAL_BLOCK_WRITE 10
#define GEN7_DATAPORT_RC_MEDIA_BLOCK_READ 4
#define GEN7_DATAPORT_RC_TYPED_SURFACE_READ 5
#define GEN7_DATAPORT_RC_TYPED_ATOMIC_OP 6
#define GEN7_DATAPORT_RC_MEMORY_FENCE 7
#define GEN7_DATAPORT_RC_MEDIA_BLOCK_WRITE 10
#define GEN7_DATAPORT_RC_RENDER_TARGET_WRITE 12
#define GEN7_DATAPORT_RC_TYPED_SURFACE_WRITE 13
#define GEN7_DATAPORT_DC_OWORD_BLOCK_READ 0
#define GEN7_DATAPORT_DC_UNALIGNED_OWORD_BLOCK_READ 1
#define GEN7_DATAPORT_DC_OWORD_DUAL_BLOCK_READ 2
@@ -948,7 +948,7 @@ vec4_generator::generate_scratch_write(vec4_instruction *inst,
uint32_t msg_type;
if (brw->gen >= 7)
msg_type = GEN7_DATAPORT_WRITE_MESSAGE_OWORD_DUAL_BLOCK_WRITE;
msg_type = GEN7_DATAPORT_DC_OWORD_DUAL_BLOCK_WRITE;
else if (brw->gen == 6)
msg_type = GEN6_DATAPORT_WRITE_MESSAGE_OWORD_DUAL_BLOCK_WRITE;
else