diff options
author | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
---|---|---|
committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
commit | 6ef27b88e6f767cd476676b33cb7c4ea6922234e (patch) | |
tree | 463d6a70b986cb62b3516ef6fd8e691f680f30ea /src/mesa/drivers/dri/i965/brw_wm_pass1.c | |
parent | ff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8 (diff) | |
parent | de803f538c16096c9e241cfdddc092ac2aa2504e (diff) |
Merge branch '965-glsl'
Conflicts:
src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/intel_context.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_pass1.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_pass1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_pass1.c b/src/mesa/drivers/dri/i965/brw_wm_pass1.c index d668def700..26c044d400 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_pass1.c +++ b/src/mesa/drivers/dri/i965/brw_wm_pass1.c @@ -155,7 +155,11 @@ void brw_wm_pass1( struct brw_wm_compile *c ) case OPCODE_SUB: case OPCODE_SLT: + case OPCODE_SLE: case OPCODE_SGE: + case OPCODE_SGT: + case OPCODE_SEQ: + case OPCODE_SNE: case OPCODE_ADD: case OPCODE_MAX: case OPCODE_MIN: @@ -257,7 +261,6 @@ void brw_wm_pass1( struct brw_wm_compile *c ) case OPCODE_DST: case OPCODE_TXP: default: - assert(0); break; } |