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

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

diff --git a/src/gallium/drivers/r600/r600_helper.c b/src/gallium/drivers/r600/r600_helper.c
index 7241ab1c175d4ca33c4416ddaf38e4f1bfad8144..132abf90a382d50c516399186c3bf101a02035b0 100644 (file)
--- 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 5b98dbe236fad0b5e4eea1e7a39cdfb1eaf8dbcb..ff5df855c6264aa049cc3bbcadaa52d0e9118d40 100644 (file)
--- 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;
 }