diff options
| author | Ben Skeggs <[email protected]> | 2008-09-18 13:14:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-18 13:14:36 +1000 |
| commit | b1d8b6c4d986a6526f20e1e89982036f0ba85222 (patch) | |
| tree | 5ca75a54aff8c5504731fe1e3dead9bbe3b92c44 /src/gallium/drivers | |
| parent | 6fca18696d0e6a243f6fbb5a30de45100a8e5fa0 (diff) | |
| parent | a06d38a74e865a0373a7314aad26b25c27ef8c57 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_pipe_state.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/trace/README | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/cell/ppu/cell_pipe_state.c b/src/gallium/drivers/cell/ppu/cell_pipe_state.c index e04cf5f274a..475c6ef0ce6 100644 --- a/src/gallium/drivers/cell/ppu/cell_pipe_state.c +++ b/src/gallium/drivers/cell/ppu/cell_pipe_state.c @@ -48,8 +48,9 @@ cell_create_blend_state(struct pipe_context *pipe, struct cell_blend_state *cb = MALLOC(sizeof(struct cell_blend_state)); (void) memcpy(cb, blend, sizeof(*blend)); +#if 0 cell_generate_alpha_blend(cb); - +#endif return cb; } @@ -100,8 +101,9 @@ cell_create_depth_stencil_alpha_state(struct pipe_context *pipe, MALLOC(sizeof(struct cell_depth_stencil_alpha_state)); (void) memcpy(cdsa, depth_stencil, sizeof(*depth_stencil)); +#if 0 cell_generate_depth_stencil_test(cdsa); - +#endif return cdsa; } diff --git a/src/gallium/drivers/trace/README b/src/gallium/drivers/trace/README index e7a2f12b022..f0e1cd596d3 100644 --- a/src/gallium/drivers/trace/README +++ b/src/gallium/drivers/trace/README @@ -10,7 +10,7 @@ This directory contains a Gallium3D pipe driver which traces all incoming calls. To build, invoke scons on the top dir as - scons statetrackers=mesa drivers=softpipe,i915simple,trace winsys=xlib + scons statetrackers=mesa drivers=softpipe,i965simple,trace winsys=xlib = Usage = |