Mesa (7.10): r600g: fix evergreen segfaults.

Jerome Glisse glisse at kemper.freedesktop.org
Thu Jan 6 20:55:51 UTC 2011


Module: Mesa
Branch: 7.10
Commit: 949c24862afcaf50b2c204f88582099c60fdbc51
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=949c24862afcaf50b2c204f88582099c60fdbc51

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 22 14:54:17 2010 +1000

r600g: fix evergreen segfaults.

evergreen was crashing running even gears here.

This is a 7.10 candidate if its broken the same.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/r600_state_common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index f488cf7..3603376 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -182,7 +182,7 @@ void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count,
 	if (rctx->family >= CHIP_CEDAR) {
 		for (int i = 0; i < rctx->nvertex_buffer; i++) {
 			pipe_resource_reference(&rctx->vertex_buffer[i].buffer, NULL);
-			evergreen_fs_resource_set(&rctx->ctx, NULL, i);
+			evergreen_context_pipe_state_set_fs_resource(&rctx->ctx, NULL, i);
 		}
 	} else {
 		for (int i = 0; i < rctx->nvertex_buffer; i++) {




More information about the mesa-commit mailing list