r600g: state context ptr in sampler_view & add I8/L8 buffer format
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
parent
35e044ab56
commit
42c1f27149
|
@ -59,6 +59,8 @@ int r600_conv_pipe_format(unsigned pformat, unsigned *format)
|
||||||
case PIPE_FORMAT_L8_UNORM:
|
case PIPE_FORMAT_L8_UNORM:
|
||||||
case PIPE_FORMAT_A8_UNORM:
|
case PIPE_FORMAT_A8_UNORM:
|
||||||
case PIPE_FORMAT_I8_UNORM:
|
case PIPE_FORMAT_I8_UNORM:
|
||||||
|
*format = V_0280A0_COLOR_8;
|
||||||
|
return 0;
|
||||||
case PIPE_FORMAT_L16_UNORM:
|
case PIPE_FORMAT_L16_UNORM:
|
||||||
case PIPE_FORMAT_Z16_UNORM:
|
case PIPE_FORMAT_Z16_UNORM:
|
||||||
case PIPE_FORMAT_Z32_UNORM:
|
case PIPE_FORMAT_Z32_UNORM:
|
||||||
|
|
|
@ -83,6 +83,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
|
||||||
pipe_reference(NULL, &texture->reference);
|
pipe_reference(NULL, &texture->reference);
|
||||||
rstate->state.sampler_view.texture = texture;
|
rstate->state.sampler_view.texture = texture;
|
||||||
rstate->state.sampler_view.reference.count = 1;
|
rstate->state.sampler_view.reference.count = 1;
|
||||||
|
rstate->state.sampler_view.context = ctx;
|
||||||
return &rstate->state.sampler_view;
|
return &rstate->state.sampler_view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue