Mesa (master): mesa/st: only compare the one scissor

Ilia Mirkin imirkin at kemper.freedesktop.org
Thu Mar 6 03:53:10 UTC 2014


Module: Mesa
Branch: master
Commit: 3649800009bffc7787f08c32cfee355b8e874b20
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3649800009bffc7787f08c32cfee355b8e874b20

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Mar  5 22:34:27 2014 -0500

mesa/st: only compare the one scissor

sizeof(scissor) returns the size of the full array rather than a single
element. Fix it to consider just the one element.

Fixes: 0705fa35 ("st/mesa: add support for GL_ARB_viewport_array (v0.2)")
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/state_tracker/st_atom_scissor.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index a19ade1..b720309 100644
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -85,7 +85,7 @@ update_scissor( struct st_context *st )
          scissor[i].maxy = maxy;
       }
 
-      if (memcmp(&scissor[i], &st->state.scissor[i], sizeof(scissor)) != 0) {
+      if (memcmp(&scissor[i], &st->state.scissor[i], sizeof(scissor[0])) != 0) {
          /* state has changed */
          st->state.scissor[i] = scissor[i];  /* struct copy */
          changed = true;




More information about the mesa-commit mailing list