diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
| commit | 09df5eaff2ba2694b82d1211fd24410cb2997e25 (patch) | |
| tree | 0028ffd43d1895bb9e7d1ab0f5906629b0fa4825 /src/mesa/tnl | |
| parent | 9566cf0e2f326d8fe638748d0bc10626e8c0387e (diff) | |
| parent | b64448b3e4026d3f11f366515b7544a6581403f3 (diff) | |
Merge branch 'master' into r500test
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vertex_sse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c index 9515d9f81f..f1c98fe2d1 100644 --- a/src/mesa/tnl/t_vertex_sse.c +++ b/src/mesa/tnl/t_vertex_sse.c @@ -648,12 +648,12 @@ void _tnl_generate_sse_emit( GLcontext *ctx ) p.ctx = ctx; p.inputs_safe = 0; /* for now */ - p.outputs_safe = 1; /* for now */ + p.outputs_safe = 0; /* for now */ p.have_sse2 = cpu_has_xmm2; p.identity = x86_make_reg(file_XMM, 6); p.chan0 = x86_make_reg(file_XMM, 7); - if (!x86_init_func(&p.func, MAX_SSE_CODE_SIZE)) { + if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) { vtx->emit = NULL; return; } |