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.h | |
| 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.h')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index 39d83cf..9a291a4 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -97,7 +97,7 @@ struct draw_jit_context float (*planes) [DRAW_TOTAL_CLIP_PLANES][4]; float *viewport; - struct draw_jit_texture textures[PIPE_MAX_VERTEX_SAMPLERS]; + struct draw_jit_texture textures[PIPE_MAX_SAMPLERS]; }; @@ -184,7 +184,7 @@ struct draw_llvm_variant_key #define DRAW_LLVM_MAX_VARIANT_KEY_SIZE \ (sizeof(struct draw_llvm_variant_key) + \ - PIPE_MAX_VERTEX_SAMPLERS * sizeof(struct lp_sampler_static_state) + \ + PIPE_MAX_SAMPLERS * sizeof(struct lp_sampler_static_state) + \ (PIPE_MAX_ATTRIBS-1) * sizeof(struct pipe_vertex_element)) |