Mesa (master): r600g: fix incorrect state naming in pipe_sampler vs pipe_sampler_view

Dave Airlie airlied at kemper.freedesktop.org
Thu Sep 2 01:18:33 UTC 2010


Module: Mesa
Branch: master
Commit: 36192b772eda190c4d78e8a4979c4e3c6377ae61
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=36192b772eda190c4d78e8a4979c4e3c6377ae61

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Sep  2 11:16:31 2010 +1000

r600g: fix incorrect state naming in pipe_sampler vs pipe_sampler_view

fixes problems in valgrind with uninitialised values.

---

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

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 4f00cfb..8885077 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -92,7 +92,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
 	struct r600_context *rctx = r600_context(ctx);
 	struct r600_context_state *rstate;
 
-	rstate = r600_context_state(rctx, pipe_sampler_type, state);
+	rstate = r600_context_state(rctx, pipe_sampler_view_type, state);
 	pipe_reference(NULL, &texture->reference);
 	rstate->state.sampler_view.texture = texture;
 	rstate->state.sampler_view.reference.count = 1;




More information about the mesa-commit mailing list