summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-11-14 10:36:12 -0800
committerMatt Turner <mattst88@gmail.com>2013-11-15 23:31:42 -0800
commite133c0103d4336c47911e89cc8a17a1c78bfdbb8 (patch)
tree59bda92b8d3b89a9683b033104be8da5754a1e37 /src/mesa/drivers
parentb570c4229fe9c621b56bb9475d77a344039444d4 (diff)
downloadexternal_mesa3d-e133c0103d4336c47911e89cc8a17a1c78bfdbb8.zip
external_mesa3d-e133c0103d4336c47911e89cc8a17a1c78bfdbb8.tar.gz
external_mesa3d-e133c0103d4336c47911e89cc8a17a1c78bfdbb8.tar.bz2
i965: Assert that IF with cmod is Gen6 only.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp4
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f89390c..795e01e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -193,11 +193,11 @@ fs_visitor::IF(uint32_t predicate)
return inst;
}
-/** Gen6+ IF with embedded comparison. */
+/** Gen6 IF with embedded comparison. */
fs_inst *
fs_visitor::IF(fs_reg src0, fs_reg src1, uint32_t condition)
{
- assert(brw->gen >= 6);
+ assert(brw->gen == 6);
fs_inst *inst = new(mem_ctx) fs_inst(BRW_OPCODE_IF,
reg_null_d, src0, src1);
inst->conditional_mod = condition;
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index a036e2d..423f693 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -177,11 +177,11 @@ vec4_visitor::IF(uint32_t predicate)
return inst;
}
-/** Gen6+ IF with embedded comparison. */
+/** Gen6 IF with embedded comparison. */
vec4_instruction *
vec4_visitor::IF(src_reg src0, src_reg src1, uint32_t condition)
{
- assert(brw->gen >= 6);
+ assert(brw->gen == 6);
vec4_instruction *inst;