diff options
| author | bohu <bohu@google.com> | 2015-01-29 13:49:06 -0800 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2015-01-29 13:49:06 -0800 |
| commit | 7dff72ec7b07e0b86c20b2e8855e3d2c014d206e (patch) | |
| tree | 542351fcd13a7390640179d933e394d7cd56e7a1 /opengl | |
| parent | 9f9e1c9dd24816e5e5f35d57dfed49a7aaf9f7ba (diff) | |
| parent | dd14cf865c04bf9d15ca2c60409f1b131e9818f6 (diff) | |
| download | android_device_generic_goldfish-7dff72ec7b07e0b86c20b2e8855e3d2c014d206e.tar.gz android_device_generic_goldfish-7dff72ec7b07e0b86c20b2e8855e3d2c014d206e.tar.bz2 android_device_generic_goldfish-7dff72ec7b07e0b86c20b2e8855e3d2c014d206e.zip | |
resolved conflicts for merge of dd14cf86 to lmp-mr1-dev-plus-aosp
Change-Id: I128516966bf0949a7079269d8923daf5a7b9a112
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/gralloc/gralloc.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp index d74af08..059bf12 100644 --- a/opengl/system/gralloc/gralloc.cpp +++ b/opengl/system/gralloc/gralloc.cpp @@ -136,17 +136,11 @@ static int gralloc_alloc(alloc_device_t* dev, } // - // Validate usage: buffer cannot be written both by s/w and h/w access. + // Note: in screen capture mode, both sw_write and hw_write will be on + // and this is a valid usage // bool sw_write = (0 != (usage & GRALLOC_USAGE_SW_WRITE_MASK)); bool hw_write = (usage & GRALLOC_USAGE_HW_RENDER); - if (hw_write && sw_write) { - // screen-capture has both hw_write and sw_write enabled, and we - // should allow this usage. - // ALOGE("gralloc_alloc: Mismatched usage flags: %d x %d, usage %x", - // w, h, usage); - // return -EINVAL; - } bool sw_read = (0 != (usage & GRALLOC_USAGE_SW_READ_MASK)); bool hw_cam_write = usage & GRALLOC_USAGE_HW_CAMERA_WRITE; bool hw_cam_read = usage & GRALLOC_USAGE_HW_CAMERA_READ; |