summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/cell.html8
-rw-r--r--src/gallium/Makefile3
-rw-r--r--src/gallium/drivers/cell/ppu/cell_pipe_state.c6
3 files changed, 10 insertions, 7 deletions
diff --git a/docs/cell.html b/docs/cell.html
index f9915d67e54..e1160b24288 100644
--- a/docs/cell.html
+++ b/docs/cell.html
@@ -29,12 +29,12 @@ Second, to implement a full-featured OpenGL driver with support for GLSL, etc.
<H2>Source Code</H2>
<p>
-The Cell driver source code is on the <code>gallium-0.1</code> branch of the
-git repository.
+The latest Cell driver source code is on the <code>gallium-0.2</code> branch
+of the Mesa git repository.
After you've cloned the repository, check out the branch with:
</p>
<pre>
- git-checkout -b gallium-0.1 origin/gallium-0.1
+ git-checkout -b gallium-0.2 origin/gallium-0.2
</pre>
<p>
To build the driver you'll need the IBM Cell SDK (version 2.1 or 3.0).
@@ -60,7 +60,7 @@ directory that contains <code>libGL.so</code>.
Verify that the Cell driver is being used by running <code>glxinfo</code>
and looking for:
<pre>
- OpenGL renderer string: Gallium 0.1, Cell on Xlib
+ OpenGL renderer string: Gallium 0.2, Cell on Xlib
</pre>
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;
}