diff options
| -rw-r--r-- | src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_state.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c b/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c index 46df588b5b..a86b726544 100644 --- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c +++ b/src/mesa/drivers/dri/nouveau_winsys/nouveau_bo.c @@ -222,6 +222,9 @@ nouveau_bo_map(struct nouveau_bo *bo, uint32_t flags) if (!nvbo) return -EINVAL; + if (nvbo->fence) + nouveau_fence_wait(&nvbo->fence); + if (nvbo->sysmem) bo->map = nvbo->sysmem; else diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/mesa/pipe/nv40/nv40_state.c index 12b2c2a8e8..8fa40ce8ef 100644 --- a/src/mesa/pipe/nv40/nv40_state.c +++ b/src/mesa/pipe/nv40/nv40_state.c @@ -425,9 +425,10 @@ nv40_depth_stencil_alpha_state_bind(struct pipe_context *pipe, void *hwcso) BEGIN_RING(curie, NV40TCL_DEPTH_FUNC, 3); OUT_RINGp ((uint32_t *)&hw->depth, 3); + /*XXX: fix in nouveau_class.h, faces backwards.. */ BEGIN_RING(curie, NV40TCL_STENCIL_BACK_ENABLE, 16); - OUT_RINGp ((uint32_t *)&hw->stencil.back, 8); OUT_RINGp ((uint32_t *)&hw->stencil.front, 8); + OUT_RINGp ((uint32_t *)&hw->stencil.back, 8); BEGIN_RING(curie, NV40TCL_ALPHA_TEST_ENABLE, 3); OUT_RINGp ((uint32_t *)&hw->alpha.enabled, 3); } |