mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-26 21:30:09 +01:00
cell: assert num samplers/textures <= CELL_MAX_SAMPLERS
This commit is contained in:
parent
6ddd2df1ae
commit
c14da8f524
1 changed files with 6 additions and 4 deletions
|
|
@ -232,12 +232,12 @@ cell_bind_sampler_states(struct pipe_context *pipe,
|
|||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
assert(num <= CELL_MAX_SAMPLERS);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
assert(unit < PIPE_MAX_SAMPLERS);
|
||||
|
||||
memcpy(cell->sampler, samplers, num * sizeof(void *));
|
||||
memset(&cell->sampler[num], 0, (PIPE_MAX_SAMPLERS - num) *
|
||||
memset(&cell->sampler[num], 0, (CELL_MAX_SAMPLERS - num) *
|
||||
sizeof(void *));
|
||||
cell->num_samplers = num;
|
||||
|
||||
|
|
@ -261,6 +261,8 @@ cell_set_sampler_textures(struct pipe_context *pipe,
|
|||
struct cell_context *cell = cell_context(pipe);
|
||||
uint i;
|
||||
|
||||
assert(num <= CELL_MAX_SAMPLERS);
|
||||
|
||||
/* Check for no-op */
|
||||
if (num == cell->num_textures &&
|
||||
!memcmp(cell->texture, texture, num * sizeof(struct pipe_texture *)))
|
||||
|
|
@ -268,7 +270,7 @@ cell_set_sampler_textures(struct pipe_context *pipe,
|
|||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
|
||||
for (i = 0; i < CELL_MAX_SAMPLERS; i++) {
|
||||
struct pipe_texture *tex = i < num ? texture[i] : NULL;
|
||||
|
||||
pipe_texture_reference((struct pipe_texture **) &cell->texture[i], tex);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue