nv50: fixes after rebase + commits note on the code that was just pushed.

OK, seems a lot of people have been getting the idea that nouveau is
dying lately - I decided to commit some of the work I've been doing lately
to prove them wrong :)  Progress on my side is slow due to lack of time
mainly, but I'm still around.

Firstly, don't even bother trying to use gallium on G8x/G9x yet, it won't
work.  I've deliberately left all the necessary winsys changes out of the
commits for a very good reason - I don't know what we're going to need from
the DRM exactly yet and don't want to be continually breaking interfaces
as I discover additional requirements.  On my side, I think I've gone
through about 3 different DRM interface changes, and have just discovered
that I may need more yet.  It'd be very annoying for everyone who uses
nouveau to keep things in sync.  Once I've got it sorted - I'll commit a
lot of cool stuff. Stay tuned.

Also, don't look at the shader code.. it's horribly nasty and full of hacks,
I used it as an opportunity to learn G8x GPU programs at the same time.
New semi-decent code is in works, and will follow at some point. :)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 665e3cc80d..743de089d6 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -121,9 +121,9 @@ nv50_set_sampler_texture(struct pipe_context *pipe, unsigned nr,
 	int i;
 
 	for (i = 0; i < nr; i++)
-		pipe_texture_reference(&nv50->miptree[i], pt[i]);
+		pipe_texture_reference((void *)&nv50->miptree[i], pt[i]);
 	for (i = nr; i < nv50->miptree_nr; i++)
-		pipe_texture_reference(&nv50->miptree[i], NULL);
+		pipe_texture_reference((void *)&nv50->miptree[i], NULL);
 
 	nv50->miptree_nr = nr;
 	nv50->dirty |= NV50_NEW_TEXTURE;