From e133c0103d4336c47911e89cc8a17a1c78bfdbb8 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 14 Nov 2013 10:36:12 -0800 Subject: [PATCH] i965: Assert that IF with cmod is Gen6 only. Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4 ++-- 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 f89390c346c..795e01efdfb 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 a036e2dbb06..423f69301e8 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; -- 2.30.2