commit 2f510be2326304f699129e31d312ec6be1d314a8
author Jason Sams <jsams@google.com> Wed Feb 25 23:47:14 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 25 23:47:15 2015 +0000
tree f9bebc0b3958f605f7c54e0772aee5713899da55
parent a43823a68a27c8ee059610905ea6a11a6599239b
parent 3b0efb602f7151a158ce37f6ba02b0e2ad885545

Merge "Fix error check for surface type in setSurface"

driver/rsdAllocation.cpp

diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index 3af04b0..33a1b11 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -767,9 +767,13 @@
 
         int format = 0;
         const Element *e = alloc->mHal.state.type->getElement();
-        rsAssert(e->getType() == RS_TYPE_UNSIGNED_8);
-        rsAssert(e->getVectorSize() == 4);
-        rsAssert(e->getKind() == RS_KIND_PIXEL_RGBA);
+        if ((e->getType() != RS_TYPE_UNSIGNED_8) ||
+            (e->getVectorSize() != 4)) {
+            // We do not check for RGBA, RGBx, to allow for interop with U8_4
+
+            rsc->setError(RS_ERROR_DRIVER, "Surface passed to setSurface is not U8_4, RGBA.");
+            goto error;
+        }
         format = PIXEL_FORMAT_RGBA_8888;
 
         r = native_window_set_buffers_format(nw, format);