Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8506bafe authored by Craig Donner's avatar Craig Donner Committed by Android (Google) Code Review
Browse files

Merge "Minor changes and cleanup to support EXT_protected_content." into nyc-dev

parents da2a8ca0 8cfae6dc

opengl/include/EGL/eglext.h

+2 −2
Original line number Diff line number Diff line
@@ -602,8 +602,8 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROID) (EGLDisplay dpy, 
#define EGL_ANDROID_create_native_client_buffer 1

#define EGL_NATIVE_BUFFER_USAGE_ANDROID   0x3143

#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID   0x00000001

#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_ANDROID   0x00000002

#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_ANDROID   0x00000004

#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID   0x00000002

#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID   0x00000004

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLClientBuffer eglCreateNativeClientBufferANDROID (const EGLint *attrib_list);

#else

opengl/libs/EGL/eglApi.cpp

+4 −8
Original line number Diff line number Diff line
@@ -1815,21 +1815,17 @@ EGLClientBuffer eglCreateNativeClientBufferANDROID(const EGLint *attrib_list) 
                case EGL_NATIVE_BUFFER_USAGE_ANDROID:

                    if (value & EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID) {

                        usage |= GRALLOC_USAGE_PROTECTED;

                        // If we are using QCOM then add in extra bits.  This

                        // should be removed before launch. These correspond to:

                        // USAGE_PRIVATE_MM_HEAP | USAGE_PRIVATE_UNCACHED

                        usage |= 0x82000000;

                    }

                    if (value & EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_ANDROID) {

                    if (value & EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID) {

                        usage |= GRALLOC_USAGE_HW_RENDER;

                    }

                    if (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_ANDROID) {

                    if (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID) {

                        usage |= GRALLOC_USAGE_HW_TEXTURE;

                    }

                    // The buffer must be used for either a texture or a

                    // renderbuffer.

                    if ((value & EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_ANDROID) &&

                        (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_ANDROID)) {

                    if ((value & EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID) &&

                        (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID)) {

                        return setError(EGL_BAD_PARAMETER, (EGLClientBuffer)0);

                    }

                    break;