diff options
| author | Roland Scheidegger <[email protected]> | 2014-08-28 05:13:35 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2014-08-30 01:34:16 +0200 |
| commit | 3d29e75a5f59639c3b9dfed26cd41ab13c0d60fc (patch) | |
| tree | dc790305a13bb0f46f3dc464db8ab2c42d40e9fc /src/gallium/drivers/llvmpipe | |
| parent | 62fd87198432f3eac7b36fee4dfa2568cc1a5aad (diff) | |
softpipe: handle vertex texture sampling when using llvm for draw
Pretty trivial, just fill in the offsets and such. The implementation
is near 100% copy and paste from llvmpipe. Should be useful for debugging.
No piglit change when not using SOFTPIPE_USE_LLVM=1.
Now that it can do the same tests with and without using llvm for vs/gs,
with llvm more pass, the only things failing only with llvm seems to be
edgeflags tests and vs/gs-pow-float-float (and for the latter I'm not
convinced the zero tolerance it requires is somehow mandated by glsl).
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_setup.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_sampler.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index e85c4ca9c3d..7d0c8cc847a 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_setup.c @@ -873,7 +873,7 @@ lp_setup_set_fragment_sampler_views(struct lp_setup_context *setup, /* probably don't really need to fill that out */ jit_tex->mip_offsets[0] = 0; jit_tex->row_stride[0] = 0; - jit_tex->row_stride[0] = 0; + jit_tex->img_stride[0] = 0; /* everything specified in number of elements here. */ jit_tex->width = view->u.buf.last_element - view->u.buf.first_element + 1; diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c index 0180e99fca0..21da6290574 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c +++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c @@ -266,7 +266,7 @@ prepare_shader_sampling( /* probably don't really need to fill that out */ mip_offsets[0] = 0; row_stride[0] = 0; - row_stride[0] = 0; + img_stride[0] = 0; /* everything specified in number of elements here. */ width0 = view->u.buf.last_element - view->u.buf.first_element + 1; |