Mesa (master): r600g: state context ptr in sampler_view & add I8/ L8 buffer format

[Jerome Glisse]

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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Wed Jul 28 20:09:15 2010 -0400

r600g: state context ptr in sampler_view & add I8/L8 buffer format

Signed-off-by: Jerome Glisse <jglisse at redhat.com>

---

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

diff --git a/src/gallium/drivers/r600/r600_helper.c b/src/gallium/drivers/r600/r600_helper.c
index 7241ab1..132abf9 100644
--- a/src/gallium/drivers/r600/r600_helper.c
+++ b/src/gallium/drivers/r600/r600_helper.c
@@ -59,6 +59,8 @@ int r600_conv_pipe_format(unsigned pformat, unsigned *format)
 	case PIPE_FORMAT_L8_UNORM:
 	case PIPE_FORMAT_A8_UNORM:
 	case PIPE_FORMAT_I8_UNORM:
+		*format = V_0280A0_COLOR_8;
+		return 0;
 	case PIPE_FORMAT_L16_UNORM:
 	case PIPE_FORMAT_Z16_UNORM:
 	case PIPE_FORMAT_Z32_UNORM:
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 5b98dbe..ff5df85 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -83,6 +83,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
 	pipe_reference(NULL, &texture->reference);
 	rstate->state.sampler_view.texture = texture;
 	rstate->state.sampler_view.reference.count = 1;
+	rstate->state.sampler_view.context = ctx;
 	return &rstate->state.sampler_view;
 }