Mesa (gallium-dynamicstencilref): nouveau: fix compile errors...

Roland Scheidegger sroland at kemper.freedesktop.org
Thu Feb 11 22:12:10 UTC 2010


Module: Mesa
Branch: gallium-dynamicstencilref
Commit: 16d520f6d69edb112887d8db1e014a521a34f532
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16d520f6d69edb112887d8db1e014a521a34f532

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Thu Feb 11 23:11:03 2010 +0100

nouveau: fix compile errors...

---

 src/gallium/drivers/nv30/nv30_state_zsa.c      |    4 ++--
 src/gallium/drivers/nv40/nv40_state_zsa.c      |    8 ++++----
 src/gallium/drivers/nv50/nv50_state_validate.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_state_zsa.c b/src/gallium/drivers/nv30/nv30_state_zsa.c
index 6c0baa8..88cd74f 100644
--- a/src/gallium/drivers/nv30/nv30_state_zsa.c
+++ b/src/gallium/drivers/nv30/nv30_state_zsa.c
@@ -23,9 +23,9 @@ nv30_state_sr_validate(struct nv30_context *nv30)
 	struct pipe_stencil_ref *sr = &nv30->stencil_ref;
 
 	so_method(so, nv30->screen->rankine, NV34TCL_STENCIL_FRONT_FUNC_REF, 1);
-	so_data  (so, sr->ref_value[0];
+	so_data  (so, sr->ref_value[0]);
 	so_method(so, nv30->screen->rankine, NV34TCL_STENCIL_BACK_FUNC_REF, 1);
-	so_data  (so, sr->ref_value[1];
+	so_data  (so, sr->ref_value[1]);
 
 	so_ref(so, &nv30->state.hw[NV30_STATE_SR]);
 	so_ref(NULL, &so);
diff --git a/src/gallium/drivers/nv40/nv40_state_zsa.c b/src/gallium/drivers/nv40/nv40_state_zsa.c
index 4c734f4..9cbe7da 100644
--- a/src/gallium/drivers/nv40/nv40_state_zsa.c
+++ b/src/gallium/drivers/nv40/nv40_state_zsa.c
@@ -22,10 +22,10 @@ nv40_state_sr_validate(struct nv40_context *nv40)
 	struct nouveau_stateobj *so = so_new(2, 2, 0);
 	struct pipe_stencil_ref *sr = &nv40->stencil_ref;
 
-	so_method(so, nv40->screen->rankine, NV40TCL_STENCIL_FRONT_FUNC_REF, 1);
-	so_data  (so, sr->ref_value[0];
-	so_method(so, nv40->screen->rankine, NV40TCL_STENCIL_BACK_FUNC_REF, 1);
-	so_data  (so, sr->ref_value[1];
+	so_method(so, nv40->screen->curie, NV40TCL_STENCIL_FRONT_FUNC_REF, 1);
+	so_data  (so, sr->ref_value[0]);
+	so_method(so, nv40->screen->curie, NV40TCL_STENCIL_BACK_FUNC_REF, 1);
+	so_data  (so, sr->ref_value[1]);
 
 	so_ref(so, &nv40->state.hw[NV40_STATE_SR]);
 	so_ref(NULL, &so);
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 3afeb2b..0be6abb 100644
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -332,9 +332,9 @@ nv50_state_validate(struct nv50_context *nv50)
 	if (nv50->dirty & NV50_NEW_STENCIL_REF) {
 		so = so_new(2, 2, 0);
 		so_method(so, tesla, NV50TCL_STENCIL_FRONT_FUNC_REF, 1);
-		so_data  (so, nv50->stencil_ref.ref_value[0];
+		so_data  (so, nv50->stencil_ref.ref_value[0]);
 		so_method(so, tesla, NV50TCL_STENCIL_BACK_FUNC_REF, 1);
-		so_data  (so, nv50->stencil_ref.ref_value[1];
+		so_data  (so, nv50->stencil_ref.ref_value[1]);
 		so_ref(so, &nv50->state.stencil_ref);
 		so_ref(NULL, &so);
 	}




More information about the mesa-commit mailing list