diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
| commit | 6c14cf58343135491068e96575bf4e61a6d34c87 (patch) | |
| tree | 0b826725f867a706d558492ac9abf881ab06e7a5 /src/mesa/pipe/i965simple/brw_wm_glsl.c | |
| parent | bf2410ca73d1eabc7134e51855d0b603897229e4 (diff) | |
| parent | 4fa7afabc966a3d37324f2f9b03e1cc466db7773 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i965simple/brw_wm_glsl.c')
| -rw-r--r-- | src/mesa/pipe/i965simple/brw_wm_glsl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/pipe/i965simple/brw_wm_glsl.c b/src/mesa/pipe/i965simple/brw_wm_glsl.c index 37d5b216b2..f4b5c13c06 100644 --- a/src/mesa/pipe/i965simple/brw_wm_glsl.c +++ b/src/mesa/pipe/i965simple/brw_wm_glsl.c @@ -935,6 +935,7 @@ static void brw_wm_emit_instruction( struct brw_wm_compile *c, break; case TGSI_OPCODE_RET: +#if 0 brw_push_insn_state(p); brw_set_mask_control(p, BRW_MASK_DISABLE); brw_ADD(p, @@ -944,6 +945,9 @@ static void brw_wm_emit_instruction( struct brw_wm_compile *c, brw_MOV(p, brw_ip_reg(), deref_1ud(c->stack_index, 0)); brw_set_access_mode(p, BRW_ALIGN_16); brw_pop_insn_state(p); +#else + emit_fb_write(c, inst); +#endif break; case TGSI_OPCODE_LOOP: |