diff options
| author | Ben Skeggs <[email protected]> | 2008-09-13 00:07:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-13 00:07:19 +1000 |
| commit | 8c14bd6992e338da8e467775b0237c8db7cbe44d (patch) | |
| tree | 569eb9c5f056e4652a2d849c4fd7da4cd0910dfa /src | |
| parent | d64da83a2c21d17f2f0a6b9b4c8e90df0e993559 (diff) | |
| parent | 2d28c2e3566c80c5ad0b0fd543cb4cd4cf9f36bd (diff) | |
Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/Makefile | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_pipe_state.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/Makefile b/src/gallium/Makefile index 8a516f7112b..36bd3623e7f 100644 --- a/src/gallium/Makefile +++ b/src/gallium/Makefile @@ -2,7 +2,8 @@ TOP = ../.. include $(TOP)/configs/current -SUBDIRS = auxiliary drivers winsys +SUBDIRS = auxiliary drivers +# Note winsys/ needs to be built after src/mesa default: subdirs 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; } |