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

Commit 591acdc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "EGL: Add EGL_GL_scrgb extension"

parents 21802beb 33e2b781

opengl/include/EGL/eglext.h

+5 −0
Original line number Diff line number Diff line
@@ -682,6 +682,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROID) (EGLDi 
#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362

#endif /* EGL_EXT_gl_colorspace_display_p3_linear */



#ifndef EGL_EXT_gl_colorspace_scrgb

#define EGL_EXT_gl_colorspace_scrgb 1

#define EGL_GL_COLORSPACE_SCRGB_EXT       0x3351

#endif /* EGL_EXT_gl_colorspace_scrgb */



#ifndef EGL_EXT_gl_colorspace_scrgb_linear

#define EGL_EXT_gl_colorspace_scrgb_linear 1

#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350

opengl/libs/EGL/eglApi.cpp

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ char const * const gBuiltinExtensionString = 
        "EGL_ANDROID_get_native_client_buffer "

        "EGL_ANDROID_front_buffer_auto_refresh "

        "EGL_ANDROID_get_frame_timestamps "

        "EGL_EXT_gl_colorspace_scrgb "

        "EGL_EXT_gl_colorspace_scrgb_linear "

        "EGL_EXT_gl_colorspace_display_p3_linear "

        "EGL_EXT_gl_colorspace_display_p3 "
@@ -467,6 +468,8 @@ static android_dataspace modifyBufferDataspace(android_dataspace dataSpace, 
        return HAL_DATASPACE_DISPLAY_P3;

    } else if (colorspace == EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT) {

        return HAL_DATASPACE_DISPLAY_P3_LINEAR;

    } else if (colorspace == EGL_GL_COLORSPACE_SCRGB_EXT) {

        return HAL_DATASPACE_V0_SCRGB;

    } else if (colorspace == EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT) {

        return HAL_DATASPACE_V0_SCRGB_LINEAR;

    }
@@ -545,6 +548,9 @@ static EGLBoolean getColorSpaceAttribute(egl_display_ptr dp, const EGLint* attri 
                } else if (colorSpace == EGL_EXT_gl_colorspace_bt2020_pq &&

                           dp->haveExtension("EGL_EXT_gl_colorspace_bt2020_pq")) {

                    found = true;

                } else if (colorSpace == EGL_GL_COLORSPACE_SCRGB_EXT &&

                           dp->haveExtension("EGL_EXT_gl_colorspace_scrgb")) {

                    found = true;

                } else if (colorSpace == EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT &&

                           dp->haveExtension("EGL_EXT_gl_colorspace_scrgb_linear")) {

                    found = true;