diff options
| author | Marek Olšák <[email protected]> | 2016-08-12 02:33:41 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-08-17 14:15:33 +0200 |
| commit | 7cd256ce7e4bad680bb77d033cf5dd662abab2dd (patch) | |
| tree | 3b4a190876c076129e01792f0e3f4a087a820988 /src/gallium/drivers/llvmpipe/lp_state_sampler.c | |
| parent | 1ac23a9359556091b12ed1345737084e3a2f6ae3 (diff) | |
gallium: change pipe_sampler_view::first_element/last_element -> offset/size
This is required by OpenGL. Our hardware supports this.
Example: Bind RGBA32F with offset = 4 bytes.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97305
Acked-by: Ilia Mirkin <[email protected]>
Acked-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_state_sampler.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_sampler.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c index 4441f2a40d6..665cd9ed475 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c +++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c @@ -308,11 +308,9 @@ prepare_shader_sampling( img_stride[0] = 0; /* everything specified in number of elements here. */ - width0 = view->u.buf.last_element - view->u.buf.first_element + 1; - addr = (uint8_t *)addr + view->u.buf.first_element * - view_blocksize; - assert(view->u.buf.first_element <= view->u.buf.last_element); - assert(view->u.buf.last_element * view_blocksize < res->width0); + width0 = view->u.buf.size / view_blocksize; + addr = (uint8_t *)addr + view->u.buf.offset; + assert(view->u.buf.offset + view->u.buf.size <= res->width0); } } else { |