fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 07:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: clamp scissors to be between 0 and max

Browse source 
We need to clamp to make sure invalid shader doesn't crash our
driver. The spec says to return 0-th index for everything that's
out of bounds.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca<jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Zack Rusin 2013-05-25 01:04:17 -04:00
parent d7d676252d
commit c88ce3480c
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/llvmpipe/lp_setup.h
View file

@ -154,4 +154,10 @@ void
lp_setup_end_query(struct lp_setup_context *setup,
struct llvmpipe_query *pq);
static INLINE unsigned
lp_clamp_scissor_idx(int idx)
{
return (PIPE_MAX_VIEWPORTS > idx && idx >= 0) ? idx : 0;
}
#endif

2
src/gallium/drivers/llvmpipe/lp_setup_line.c
View file

@ -318,7 +318,7 @@ try_setup_line( struct lp_setup_context *setup,
nr_planes = 8;
if (setup->viewport_index_slot > 0) {
unsigned *udata = (unsigned*)v1[setup->viewport_index_slot];
scissor_index = *udata;
scissor_index = lp_clamp_scissor_idx(*udata);
}
}
else {

2
src/gallium/drivers/llvmpipe/lp_setup_point.c
View file

@ -328,7 +328,7 @@ try_setup_point( struct lp_setup_context *setup,
if (setup->viewport_index_slot > 0) {
unsigned *udata = (unsigned*)v0[setup->viewport_index_slot];
scissor_index = *udata;
scissor_index = lp_clamp_scissor_idx(*udata);
}
/* Bounding rectangle (in pixels) */
{

2
src/gallium/drivers/llvmpipe/lp_setup_tri.c
View file

@ -258,7 +258,7 @@ do_triangle_ccw(struct lp_setup_context *setup,
nr_planes = 7;
if (setup->viewport_index_slot > 0) {
unsigned *udata = (unsigned*)v0[setup->viewport_index_slot];
scissor_index = *udata;
scissor_index = lp_clamp_scissor_idx(*udata);
}
}
else {

4
src/gallium/drivers/llvmpipe/lp_state_clip.c
View file

@ -71,8 +71,12 @@ llvmpipe_set_scissor_states(struct pipe_context *pipe,
draw_flush(llvmpipe->draw);
debug_assert(start_slot < PIPE_MAX_VIEWPORTS);
debug_assert((start_slot + num_scissors) <= PIPE_MAX_VIEWPORTS);
memcpy(llvmpipe->scissors + start_slot, scissors,
sizeof(struct pipe_scissor_state) * num_scissors);
llvmpipe->dirty |= LP_NEW_SCISSOR;
}