diff options
| author | Jerome Glisse <[email protected]> | 2010-07-28 20:09:15 -0400 |
|---|---|---|
| committer | Jerome Glisse <[email protected]> | 2010-07-28 20:09:15 -0400 |
| commit | 42c1f27149828e5b5143f5e53ca3bd7c04a4e762 (patch) | |
| tree | 56382788ed2eee09dbd40c366ad2ba93db2eb62f | |
| parent | 35e044ab562b65aa53f9d9d7b5885e6a887774bb (diff) | |
r600g: state context ptr in sampler_view & add I8/L8 buffer format
Signed-off-by: Jerome Glisse <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/r600_helper.c | 2 | ||||
| -rw-r--r-- | 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 7241ab1c175..132abf90a38 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 5b98dbe236f..ff5df855c62 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; } |