diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-02-16 02:54:11 +0100 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-02-16 02:54:22 +0100 |
| commit | 4032ff3889021089debce1c43a0bb984b121cbf6 (patch) | |
| tree | fa2bceed9f90d7cc3d775357578876342ff23359 /src/mesa/pipe/nv30/nv30_state.c | |
| parent | 6e3e5ba3bb25183efafcf78d6794fc50236c2835 (diff) | |
nv30: fixes.
Diffstat (limited to 'src/mesa/pipe/nv30/nv30_state.c')
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/pipe/nv30/nv30_state.c b/src/mesa/pipe/nv30/nv30_state.c index 992afe033e..53368561e0 100644 --- a/src/mesa/pipe/nv30/nv30_state.c +++ b/src/mesa/pipe/nv30/nv30_state.c @@ -420,9 +420,9 @@ nv30_depth_stencil_alpha_state_bind(struct pipe_context *pipe, void *hwcso) BEGIN_RING(rankine, NV34TCL_DEPTH_FUNC, 3); OUT_RINGp ((uint32_t *)&hw->depth, 3); - BEGIN_RING(rankine, NV34TCL_STENCIL_FRONT_ENABLE, 16); - OUT_RINGp ((uint32_t *)&hw->stencil.front, 8); + BEGIN_RING(rankine, NV34TCL_STENCIL_BACK_ENABLE, 16); OUT_RINGp ((uint32_t *)&hw->stencil.back, 8); + OUT_RINGp ((uint32_t *)&hw->stencil.front, 8); BEGIN_RING(rankine, NV34TCL_ALPHA_FUNC_ENABLE, 3); OUT_RINGp ((uint32_t *)&hw->alpha.enabled, 3); } @@ -439,7 +439,7 @@ nv30_vp_state_create(struct pipe_context *pipe, { struct nv30_vertex_program *vp; - vp = calloc(1, sizeof(struct nv30_vertex_program)); + vp = CALLOC(1, sizeof(struct nv30_vertex_program)); vp->pipe = cso; return (void *)vp; @@ -471,7 +471,7 @@ nv30_fp_state_create(struct pipe_context *pipe, { struct nv30_fragment_program *fp; - fp = calloc(1, sizeof(struct nv30_fragment_program)); + fp = CALLOC(1, sizeof(struct nv30_fragment_program)); fp->pipe = cso; return (void *)fp; |