diff options
| author | Christoph Bumiller <[email protected]> | 2010-08-22 23:09:55 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-08-23 14:25:53 +0200 |
| commit | 0df5e84b01f5420e37006a32c916835af2aa4314 (patch) | |
| tree | 94e974b0428d642f806d786e202f3032a28dc522 | |
| parent | 33f45c5a8afd353ad9bbd8647fa5c6dfc59cdfd7 (diff) | |
nv50: yet another case we need a nop.exit
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_pc.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_shader_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_pc.c b/src/gallium/drivers/nv50/nv50_pc.c index 5041fc75059..b9d274414d1 100644 --- a/src/gallium/drivers/nv50/nv50_pc.c +++ b/src/gallium/drivers/nv50/nv50_pc.c @@ -327,7 +327,7 @@ nv50_emit_program(struct nv_pc *pc) assert(pc->emit == &code[pc->bin_size / 4]); /* XXX: we can do better than this ... */ - if (!(pc->emit[-2] & 1) || (pc->emit[-2] & 2) || (pc->emit[-1] & 3) == 3) { + if (!(pc->emit[-2] & 1) || (pc->emit[-2] & 2) || (pc->emit[-1] & 3)) { pc->emit[0] = 0xf0000001; pc->emit[1] = 0xe0000000; pc->bin_size += 8; diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c index 5f70df3662d..a244753c4d3 100644 --- a/src/gallium/drivers/nv50/nv50_shader_state.c +++ b/src/gallium/drivers/nv50/nv50_shader_state.c @@ -547,7 +547,7 @@ nv50_fp_linkage_validate(struct nv50_context *nv50) so_method(so, tesla, NV50TCL_NOPERSPECTIVE_BITMAP(0), 4); so_datap (so, lin, 4); - if (nv50->rasterizer->pipe.sprite_coord_enable) { + if (nv50->rasterizer->pipe.sprite_coord_enable) { /* XXX: gl_PointCoord */ so_method(so, tesla, NV50TCL_POINT_SPRITE_CTRL, 1); so_data (so, nv50_pntc_replace(nv50, pntc, (interp >> 8) & 0xff)); |