diff options
| author | Brian Paul <brianp@vmware.com> | 2012-08-09 20:59:44 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-08-16 09:01:31 -0600 |
| commit | cab2fed135bc1edf7b65ddca3236020638427061 (patch) | |
| tree | 17a56b4023ad6345eb1a7baf9813da7dcf0469ff /src/gallium/auxiliary/draw/draw_llvm_sample.c | |
| parent | a2c1df4c9a7375bc5306e8cfd07a9f7087759a96 (diff) | |
| download | external_mesa3d-cab2fed135bc1edf7b65ddca3236020638427061.zip external_mesa3d-cab2fed135bc1edf7b65ddca3236020638427061.tar.gz external_mesa3d-cab2fed135bc1edf7b65ddca3236020638427061.tar.bz2 | |
gallium: remove PIPE_MAX_VERTEX/GEOMETRY_SAMPLERS #define
PIPE_MAX_SAMPLERS, PIPE_MAX_VERTEX_SAMPLERS and PIPE_MAX_GEOMETRY_SAMPLERS
were all defined to the same value (16).
In various places we're creating arrays such as
sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS] so we were assuming
the same number of max samplers for all shader stages anyway.
Of course, drivers are still free to advertise different numbers of max
samplers for different shaders.
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_llvm_sample.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm_sample.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm_sample.c b/src/gallium/auxiliary/draw/draw_llvm_sample.c index 1dbe5f5..5331716 100644 --- a/src/gallium/auxiliary/draw/draw_llvm_sample.c +++ b/src/gallium/auxiliary/draw/draw_llvm_sample.c @@ -98,7 +98,7 @@ draw_llvm_texture_member(const struct lp_sampler_dynamic_state *base, LLVMValueRef ptr; LLVMValueRef res; - debug_assert(unit < PIPE_MAX_VERTEX_SAMPLERS); + debug_assert(unit < PIPE_MAX_SAMPLERS); /* context[0] */ indices[0] = lp_build_const_int32(gallivm, 0); @@ -180,7 +180,7 @@ draw_llvm_sampler_soa_emit_fetch_texel(const struct lp_build_sampler_soa *base, { struct draw_llvm_sampler_soa *sampler = (struct draw_llvm_sampler_soa *)base; - assert(unit < PIPE_MAX_VERTEX_SAMPLERS); + assert(unit < PIPE_MAX_SAMPLERS); lp_build_sample_soa(gallivm, &sampler->dynamic_state.static_state[unit], @@ -207,7 +207,7 @@ draw_llvm_sampler_soa_emit_size_query(const struct lp_build_sampler_soa *base, { struct draw_llvm_sampler_soa *sampler = (struct draw_llvm_sampler_soa *)base; - assert(unit < PIPE_MAX_VERTEX_SAMPLERS); + assert(unit < PIPE_MAX_SAMPLERS); lp_build_size_query_soa(gallivm, &sampler->dynamic_state.static_state[unit], |