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

Commit f66aa3f9 authored by Craig Donner's avatar Craig Donner Committed by android-build-merger
Browse files

Merge "Allow both RENDER and TEXTURE flags when creating native client buffers." am: 2a3edda4 

am: 06f85bcf

Change-Id: I5391ae665e5ea95ed68d96f8d06626ab455dd074
parents 18148ac7 06f85bcf

opengl/libs/EGL/eglApi.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -1827,12 +1827,6 @@ EGLClientBuffer eglCreateNativeClientBufferANDROID(const EGLint *attrib_list) 
                    if (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID) {

                    if (value & EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID) {

                        usage |= GRALLOC_USAGE_HW_TEXTURE;

                        usage |= GRALLOC_USAGE_HW_TEXTURE;

                    }

                    }

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

                    // renderbuffer.

                    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;

                    break;

                default:

                default:

                    return setError(EGL_BAD_PARAMETER, (EGLClientBuffer)0);

                    return setError(EGL_BAD_PARAMETER, (EGLClientBuffer)0);

opengl/specs/EGL_ANDROID_create_native_client_buffer.txt

+2 −9
Original line number Original line Diff line number Diff line
@@ -124,12 +124,10 @@ Changes to Chapter 3 of the EGL 1.2 Specification (EGL Functions and Errors) 
        desirable) do not route the entire composition to the external sink.

        desirable) do not route the entire composition to the external sink.





        EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID: The buffer will be

        EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID: The buffer will be

        used to create a renderbuffer. This flag must not be set if

        used to create a color-renderable texture.

        EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID is set.





        EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID: The buffer will be used to

        EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID: The buffer will be used to

        create a texture. This flag must not be set if

        create a filterable texture.

        EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID is set.





    Errors

    Errors
@@ -149,11 +147,6 @@ Changes to Chapter 3 of the EGL 1.2 Specification (EGL Functions and Errors) 
         with the value of EGL_FORMAT, the error EGL_BAD_PARAMETER is

         with the value of EGL_FORMAT, the error EGL_BAD_PARAMETER is

         Generated.

         Generated.





       * If both the EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID and

         EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID are set in the value of

         EGL_NATIVE_BUFFER_USAGE_ANDROID, the error EGL_BAD_PARAMETER is

         Generated."



Issues

Issues





    1. Should this extension define what combinations of formats and usage flags

    1. Should this extension define what combinations of formats and usage flags