diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 03:31:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 03:31:32 +0000 |
| commit | d9e4e27c3796012a2df99613caab078da626a6b9 (patch) | |
| tree | de4939641dd890309722934cde9110a8be5d7bf7 | |
| parent | bf705ff2c8d668b8628760531c42cdcc40f795b0 (diff) | |
| parent | ba45ba3f8eb4fb6af061307e95b6eea4a7205073 (diff) | |
| download | mesa3d-d9e4e27c3796012a2df99613caab078da626a6b9.tar.gz | |
release-request-ff422c3c-f322-4fd6-8018-3005297c3ce9-for-git_oc-mr1-iot-release-4351313 snap-temp-L99900000104754319android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6oreo-mr1-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6
Change-Id: Ic603f7228748428bf4ecc7d4aa370122e49b8504
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_resource.c | 5 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index e4784ff86e2..c18d1d693a2 100644 --- a/src/gallium/drivers/vc4/vc4_resource.c +++ b/src/gallium/drivers/vc4/vc4_resource.c @@ -22,6 +22,8 @@ * IN THE SOFTWARE. */ +#define LOG_TAG "vc4_resource" +#include <cutils/log.h> #include "util/u_blit.h" #include "util/u_memory.h" #include "util/u_format.h" @@ -590,7 +592,7 @@ vc4_resource_from_handle(struct pipe_screen *pscreen, static bool warned = false; if (!warned) { warned = true; - fprintf(stderr, + ALOGW( "Attempting to import %dx%d %s with " "unsupported stride %d instead of %d\n", prsc->width0, prsc->height0, @@ -598,7 +600,6 @@ vc4_resource_from_handle(struct pipe_screen *pscreen, handle->stride, expected_stride); } - goto fail; } rsc->tiled = false; diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 2ca708e6509..25d7f4b6910 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -34,6 +34,7 @@ LOCAL_CFLAGS := LOCAL_SHARED_LIBRARIES := \ libdl \ + liblog \ libglapi \ libexpat \ |