Signed-off-by: Edward O'Callaghan <[email protected]>
---
src/gallium/drivers/svga/svga_state_tss.c | 2 +-
src/gallium/drivers/svga/svgadump/svga_shader_op.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/svga/svga_state_tss.c
b/src/gallium/drivers/svga/svga_state_tss.c
index 5991da1..4debbf1 100644
--- a/src/gallium/drivers/svga/svga_state_tss.c
+++ b/src/gallium/drivers/svga/svga_state_tss.c
@@ -316,7 +316,7 @@ svga_queue_tss( struct ts_queue *q,
unsigned tss,
unsigned value )
{
- assert(q->ts_count < sizeof(q->ts)/sizeof(q->ts[0]));
+ assert(q->ts_count < ARRAY_SIZE(q->ts));
q->ts[q->ts_count].stage = unit;
q->ts[q->ts_count].name = tss;
q->ts[q->ts_count].value = value;
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_op.c
b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
index ad1549d..03a63cf 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_op.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
@@ -144,7 +144,7 @@ const struct sh_opcode_info *svga_opcode_info( uint op )
{
struct sh_opcode_info *info;
- if (op >= sizeof( opcode_info ) / sizeof( opcode_info[0] )) {
+ if (op >= ARRAY_SIZE(opcode_info)) {
/* The opcode is either PHASE, COMMENT, END or out of range.
*/
assert( 0 );
--
2.5.0
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
