changeset 2832:c176fd6cd024

SW pipeline: was failing with assertion in debug mode, on Windows (RT-28767)
author Martin Soch <Martin.Soch@oracle.com>
date Mon, 11 Mar 2013 09:49:28 +0100
parents cbc4c527bc8a
children c77fa8b03077
files prism-sw-native/include/PiscesRenderer.inl prism-sw-native/src/PiscesBlit.c prism-sw-native/src/PiscesPaint.c
diffstat 3 files changed, 20 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/prism-sw-native/include/PiscesRenderer.inl	Mon Mar 11 09:29:41 2013 +0100
+++ b/prism-sw-native/include/PiscesRenderer.inl	Mon Mar 11 09:49:28 2013 +0100
@@ -631,6 +631,7 @@
             break;
     }
     updateCompositeDependedRoutines(rdr);
+    rdr->_rendererState &= ~INVALID_MASK_DEPENDED_ROUTINES;
 }
 
 static void
--- a/prism-sw-native/src/PiscesBlit.c	Mon Mar 11 09:29:41 2013 +0100
+++ b/prism-sw-native/src/PiscesBlit.c	Mon Mar 11 09:49:28 2013 +0100
@@ -755,7 +755,7 @@
         am = a + w;
         while (a < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             palpha = (cval >> 24) & 0xff;
@@ -811,7 +811,7 @@
         am = a + w;
         while (a < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             palpha = (cval >> 24) & 0xff;
@@ -917,7 +917,7 @@
         am = aidx + w;
         while (aidx < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             acoverage = aval = (cval >> 24) & 0xff;
@@ -1190,7 +1190,7 @@
         am = a + w;
         while (a < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             palpha = (cval >> 24) & 0xff;
@@ -1246,7 +1246,7 @@
         am = aidx + w;
         while (aidx < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             aval = (cval >> 24) & 0xff;
@@ -1302,7 +1302,7 @@
         am = aidx + w;
         while (aidx < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             avalOrig = aval = (cval >> 24) & 0xff;
@@ -1363,7 +1363,7 @@
         am = a + w;
         while (a < am) {
             assert(aidx >= 0);
-            assert(aidx < rdr->_paint_length / 4);
+            assert(aidx < rdr->_paint_length);
 
             cval = paint[aidx];
             palpha = (cval >> 24) & 0xff;
--- a/prism-sw-native/src/PiscesPaint.c	Mon Mar 11 09:29:41 2013 +0100
+++ b/prism-sw-native/src/PiscesPaint.c	Mon Mar 11 09:49:28 2013 +0100
@@ -468,16 +468,16 @@
                                 cval = p00;
                             }
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
                             paint[pidx] = cval;
                         } else {
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
                             paint[pidx] = p00;
                         }
                     } else {
                         assert(pidx >= 0);
-                        assert(pidx < rdr->_paint_length / 4);
+                        assert(pidx < rdr->_paint_length);
                         paint[pidx] = 0x00000000;
                     }
                     ++a;
@@ -526,16 +526,16 @@
                                 cval = p00;
                             }
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
                             paint[pidx] = cval;
                         } else {
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
                             paint[pidx] = p00;
                         }
                     } else {
                         assert(pidx >= 0);
-                        assert(pidx < rdr->_paint_length / 4);
+                        assert(pidx < rdr->_paint_length);
                         paint[pidx] = 0x00000000;
                     }
                     ++a;
@@ -599,18 +599,18 @@
                             }
 
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
 
                             paint[pidx] = cval;
                         } else {
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
 
                             paint[pidx] = p00;
                         }
                     } else {
                         assert(pidx >= 0);
-                        assert(pidx < rdr->_paint_length / 4);
+                        assert(pidx < rdr->_paint_length);
 
                         paint[pidx] = 0x00000000;
                     }
@@ -664,18 +664,18 @@
                             }
 
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
 
                             paint[pidx] = cval;
                         } else {
                             assert(pidx >= 0);
-                            assert(pidx < rdr->_paint_length / 4);
+                            assert(pidx < rdr->_paint_length);
 
                             paint[pidx] = p00;
                         }
                     } else {
                         assert(pidx >= 0);
-                        assert(pidx < rdr->_paint_length / 4);
+                        assert(pidx < rdr->_paint_length);
 
                         paint[pidx] = 0x00000000;
                     }