diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-27 21:57:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-27 21:57:26 -0700 |
| commit | 3e02f65bd164947f0d13ea0091d3b1688ff13aca (patch) | |
| tree | 131cafa1c16c32ff0930884609139029637f53f7 | |
| parent | 12ae20664b1796102259e96cc524732d1e19c217 (diff) | |
| parent | da929c7b4c1892cfbaa643b6c3402eb6ac5b5d8f (diff) | |
| download | goldfish-opengl-3e02f65bd164947f0d13ea0091d3b1688ff13aca.tar.gz | |
Merge "Revert "Handle HAL_PIXEL_FORMAT_RGBX_8888 more appropriately"" into pi-dev
am: da929c7b4c
Change-Id: Iefa55cc178571b5a9f82f779cfd04ff9cfd1c5bc
| -rw-r--r-- | system/gralloc/gralloc.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp index 986118ae..37481487 100644 --- a/system/gralloc/gralloc.cpp +++ b/system/gralloc/gralloc.cpp @@ -513,12 +513,12 @@ static int gralloc_alloc(alloc_device_t* dev, int align = 1; switch (format) { case HAL_PIXEL_FORMAT_RGBA_8888: + case HAL_PIXEL_FORMAT_RGBX_8888: case HAL_PIXEL_FORMAT_BGRA_8888: bpp = 4; glFormat = GL_RGBA; glType = GL_UNSIGNED_BYTE; break; - case HAL_PIXEL_FORMAT_RGBX_8888: case HAL_PIXEL_FORMAT_RGB_888: bpp = 3; glFormat = GL_RGB; @@ -1177,12 +1177,8 @@ static int gralloc_lock(gralloc_module_t const* module, } D("gralloc_lock read back color buffer %d %d ashmem base %p sz %d\n", cb->width, cb->height, cb->ashmemBase, cb->ashmemSize); - GLenum readbackFormat = cb->glFormat; - if (cb->format == HAL_PIXEL_FORMAT_RGBX_8888) { - readbackFormat = GL_RGBA; - } rcEnc->rcReadColorBuffer(rcEnc, cb->hostHandle, - 0, 0, cb->width, cb->height, readbackFormat, cb->glType, rgb_addr); + 0, 0, cb->width, cb->height, cb->glFormat, cb->glType, rgb_addr); if (tmpBuf) { if (cb->frameworkFormat == HAL_PIXEL_FORMAT_YV12) { rgb888_to_yv12((char*)cpu_addr, tmpBuf, cb->width, cb->height, l, t, l+w-1, t+h-1); |