Add layered buffer support to libui and libgui.
Bug: 31686534
Test: manual
Change-Id: Ia40270701467f4b785660324cad883e7da08989a
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h
index 8e69330..7cb608e 100644
--- a/opengl/include/EGL/eglext.h
+++ b/opengl/include/EGL/eglext.h
@@ -607,6 +607,7 @@
#ifndef EGL_ANDROID_create_native_client_buffer
#define EGL_ANDROID_create_native_client_buffer 1
+#define EGL_LAYER_COUNT_ANDROID 0x3434
#define EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143
#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001
#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 3f2861f..0bfefd0 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -1802,6 +1802,7 @@
uint32_t width = 0;
uint32_t height = 0;
uint32_t format = 0;
+ uint32_t layer_count = 1;
uint32_t red_size = 0;
uint32_t green_size = 0;
uint32_t blue_size = 0;
@@ -1827,6 +1828,7 @@
GET_NONNEGATIVE_VALUE(EGL_GREEN_SIZE, green_size);
GET_NONNEGATIVE_VALUE(EGL_BLUE_SIZE, blue_size);
GET_NONNEGATIVE_VALUE(EGL_ALPHA_SIZE, alpha_size);
+ GET_NONNEGATIVE_VALUE(EGL_LAYER_COUNT_ANDROID, layer_count);
case EGL_NATIVE_BUFFER_USAGE_ANDROID:
if (value & EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID) {
usage |= GRALLOC_USAGE_PROTECTED;
@@ -1862,7 +1864,7 @@
alpha_size == 0) {
format = HAL_PIXEL_FORMAT_RGB_565;
} else {
- ALOGE("Invalid native pixel format { r=%d, g=%d, b=%d, a=%d }",
+ ALOGE("Invalid native pixel format { r=%u, g=%u, b=%u, a=%u }",
red_size, green_size, blue_size, alpha_size);
return setError(EGL_BAD_PARAMETER, (EGLClientBuffer)0);
}
@@ -1907,7 +1909,9 @@
CHECK_ERROR_CONDITION("Unable to write height");
err = data.writeInt32(static_cast<int32_t>(format));
CHECK_ERROR_CONDITION("Unable to write format");
- err = data.writeUint32(usage);
+ err = data.writeUint32(layer_count);
+ CHECK_ERROR_CONDITION("Unable to write layer count");
+ err = data.writeUint32(usage);
CHECK_ERROR_CONDITION("Unable to write usage");
err = data.writeUtf8AsUtf16(
std::string("[eglCreateNativeClientBufferANDROID pid ") +
@@ -1924,12 +1928,13 @@
err = gBuffer->initCheck();
if (err != NO_ERROR) {
- ALOGE("Unable to create native buffer { w=%d, h=%d, f=%d, u=%#x }: %#x",
- width, height, format, usage, err);
+ ALOGE("Unable to create native buffer "
+ "{ w=%u, h=%u, f=%u, u=%#x, lc=%u}: %#x", width, height, format,
+ usage, layer_count, err);
goto error_condition;
}
- ALOGD("Created new native buffer %p { w=%d, h=%d, f=%d, u=%#x }",
- gBuffer, width, height, format, usage);
+ ALOGV("Created new native buffer %p { w=%u, h=%u, f=%u, u=%#x, lc=%u}",
+ gBuffer, width, height, format, usage, layer_count);
return static_cast<EGLClientBuffer>(gBuffer->getNativeBuffer());
#undef CHECK_ERROR_CONDITION
diff --git a/opengl/specs/EGL_ANDROID_create_native_client_buffer.txt b/opengl/specs/EGL_ANDROID_create_native_client_buffer.txt
index a6fae80..9b2bbbc 100644
--- a/opengl/specs/EGL_ANDROID_create_native_client_buffer.txt
+++ b/opengl/specs/EGL_ANDROID_create_native_client_buffer.txt
@@ -20,7 +20,7 @@
Version
- Version 1, January 19, 2016
+ Version 1.1, October 26, 2016
Number
@@ -53,6 +53,7 @@
New Tokens
+ EGL_NATIVE_BUFFER_LAYER_COUNT_ANDROID 0x3434
EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143
EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001
EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002
@@ -103,6 +104,8 @@
| EGL_ALPHA_SIZE | The bits of Alpha in | 0 |
| | the color buffer | |
| | buffer data | |
+ | EGL_LAYER_COUNT_ANDROID | The number of image | 1 |
+ | | layers in the buffer | |
| EGL_NATIVE_BUFFER_USAGE_ANDROID | The usage bits of | 0 |
| | the buffer data | |
+---------------------------------+----------------------+---------------+
@@ -114,8 +117,10 @@
EGL_RED_SIZE, EGL_GREEN_SIZE, and EGL_BLUE_SIZE must be non-zero and
correspond to a valid pixel format for the implementation. If EGL_ALPHA_SIZE
is non-zero then the combination of all four sizes must correspond to a
- valid pixel format for the implementation. The
- EGL_NATIVE_BUFFER_USAGE_ANDROID flag may include any of the following bits:
+ valid pixel format for the implementation. The value of
+ EGL_LAYER_COUNT_ANDROID must be a valid number of image layers for the
+ implementation. The EGL_NATIVE_BUFFER_USAGE_ANDROID flag may include any of
+ the following bits:
EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID: Indicates that the
created buffer must have a hardware-protected path to external display
@@ -189,6 +194,10 @@
Revision History
+#3 (Craig Donner, October 26, 2016)
+ - Added EGL_LAYER_COUNT_ANDROID for creating buffers that back texture
+ arrays.
+
#2 (Craig Donner, April 15, 2016)
- Set color formats and usage bits explicitly using additional attributes,
and add value for new token EGL_NATIVE_BUFFER_USAGE_ANDROID.