egl/android: simplify swrastPutImage

Just call swrastPutImage2 with stride = 0.

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 270bedf..af6aba5 100644 (file)
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1039,6 +1039,8 @@ swrastPutImage2(__DRIdrawable * draw, int op,
    dstStride = BPerPixel * dri2_surf->buffer->stride;
    copyWidth = BPerPixel * w;
    xOffset = BPerPixel * x;
+   if (stride == 0)
+      stride = copyWidth;
 
    /* drivers expect we do these checks (and some rely on it) */
    if (copyWidth > dstStride - xOffset)
@@ -1077,15 +1079,7 @@ swrastPutImage(__DRIdrawable * draw, int op,
               int x, int y, int w, int h,
               char *data, void *loaderPrivate)
 {
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-   int stride;
-
-   if (swrastUpdateBuffer(dri2_surf)) {
-      return;
-   }
-
-   stride = get_format_bpp(dri2_surf->buffer->format) * w;
-   swrastPutImage2(draw, op, x, y, w, h, stride, data, loaderPrivate);
+   swrastPutImage2(draw, op, x, y, w, h, 0, data, loaderPrivate);
 }
 
 static void