diff options
| author | Matt Turner <[email protected]> | 2014-11-21 12:34:22 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-11-24 14:06:39 -0800 |
| commit | f5bef2d2e53fc43cbdf15914e8886fc51f77b546 (patch) | |
| tree | 16c9e24b3b2262eed605da159a960120dc6ed9cf /src/mesa | |
| parent | 803a7445076d0c521ca86ed722b702a6e4181786 (diff) | |
i965: Assert that math instructions don't have conditional mod.
The math function field is at the same location as conditional mod.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index ab5d22317ed..4af9cbe83cb 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1817,6 +1817,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) case SHADER_OPCODE_SIN: case SHADER_OPCODE_COS: assert(brw->gen < 6 || inst->mlen == 0); + assert(inst->conditional_mod == BRW_CONDITIONAL_NONE); if (brw->gen >= 7) { gen6_math(p, dst, brw_math_function(inst->opcode), src[0], brw_null_reg()); @@ -1832,6 +1833,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) case SHADER_OPCODE_INT_REMAINDER: case SHADER_OPCODE_POW: assert(brw->gen < 6 || inst->mlen == 0); + assert(inst->conditional_mod == BRW_CONDITIONAL_NONE); if (brw->gen >= 7 && inst->opcode == SHADER_OPCODE_POW) { gen6_math(p, dst, brw_math_function(inst->opcode), src[0], src[1]); } else if (brw->gen >= 6) { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index 0776a917456..d027fda85de 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -1361,6 +1361,7 @@ vec4_generator::generate_code(const cfg_t *cfg) case SHADER_OPCODE_LOG2: case SHADER_OPCODE_SIN: case SHADER_OPCODE_COS: + assert(inst->conditional_mod == BRW_CONDITIONAL_NONE); if (brw->gen >= 7) { gen6_math(p, dst, brw_math_function(inst->opcode), src[0], brw_null_reg()); @@ -1374,6 +1375,7 @@ vec4_generator::generate_code(const cfg_t *cfg) case SHADER_OPCODE_POW: case SHADER_OPCODE_INT_QUOTIENT: case SHADER_OPCODE_INT_REMAINDER: + assert(inst->conditional_mod == BRW_CONDITIONAL_NONE); if (brw->gen >= 7) { gen6_math(p, dst, brw_math_function(inst->opcode), src[0], src[1]); } else if (brw->gen == 6) { |