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

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

Merge "EGL: Grab relevant upstream colorspace changes"

parents ff4bc528 62203bfc

opengl/include/EGL/eglext.h

+35 −6
Original line number Original line Diff line number Diff line
@@ -670,12 +670,41 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROID) (EGLDi 
#endif

#endif

#endif

#endif





#ifndef EGL_KHR_pixel_format_float

#ifndef EGL_EXT_gl_colorspace_bt2020_linear

#define EGL_KHR_pixel_format_float 1

#define EGL_EXT_gl_colorspace_bt2020_linear 1

#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339  // eglChooseConfig and eglGetConfigAttrib attribute

#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F

#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A  // Attribute value for COLOR_COMPONENT_TYPE

#endif /* EGL_EXT_gl_colorspace_bt2020_linear */

#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B  // Attribute value for COLOR_COMPONENT_TYPE



#endif

#ifndef EGL_EXT_gl_colorspace_bt2020_pq

#define EGL_EXT_gl_colorspace_bt2020_pq 1

#define EGL_GL_COLORSPACE_BT2020_PQ_EXT   0x3340

#endif /* EGL_EXT_gl_colorspace_bt2020_pq */



#ifndef EGL_EXT_gl_colorspace_scrgb_linear

#define EGL_EXT_gl_colorspace_scrgb_linear 1

#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350

#endif /* EGL_EXT_gl_colorspace_scrgb_linear */



#ifndef EGL_EXT_pixel_format_float

#define EGL_EXT_pixel_format_float 1

#define EGL_COLOR_COMPONENT_TYPE_EXT      0x3339

#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A

#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B

#endif /* EGL_EXT_pixel_format_float */



#ifndef EGL_EXT_surface_SMPTE2086_metadata

#define EGL_EXT_surface_SMPTE2086_metadata 1

#define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341

#define EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT 0x3342

#define EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT 0x3343

#define EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT 0x3344

#define EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT 0x3345

#define EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT 0x3346

#define EGL_SMPTE2086_WHITE_POINT_X_EXT   0x3347

#define EGL_SMPTE2086_WHITE_POINT_Y_EXT   0x3348

#define EGL_SMPTE2086_MAX_LUMINANCE_EXT   0x3349

#define EGL_SMPTE2086_MIN_LUMINANCE_EXT   0x334A

#endif /* EGL_EXT_surface_SMPTE2086_metadata */





#ifdef __cplusplus

#ifdef __cplusplus

}

}

opengl/tools/glgen2/registry/egl.xml

+48 −2
Original line number Original line Diff line number Diff line
@@ -723,6 +723,22 @@ 
        <enum value="0x3339" name="EGL_COLOR_COMPONENT_TYPE_EXT"/>

        <enum value="0x3339" name="EGL_COLOR_COMPONENT_TYPE_EXT"/>

        <enum value="0x333A" name="EGL_COLOR_COMPONENT_TYPE_FIXED_EXT"/>

        <enum value="0x333A" name="EGL_COLOR_COMPONENT_TYPE_FIXED_EXT"/>

        <enum value="0x333B" name="EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT"/>

        <enum value="0x333B" name="EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT"/>

            <unused start="0x333C" end="0x333E"/>

        <enum value="0x333F" name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/>

        <enum value="0x3340" name="EGL_GL_COLORSPACE_BT2020_PQ_EXT"/>

        <enum value="0x3341" name="EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT"/>

        <enum value="0x3342" name="EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT"/>

        <enum value="0x3343" name="EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT"/>

        <enum value="0x3344" name="EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT"/>

        <enum value="0x3345" name="EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT"/>

        <enum value="0x3346" name="EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT"/>

        <enum value="0x3347" name="EGL_SMPTE2086_WHITE_POINT_X_EXT"/>

        <enum value="0x3348" name="EGL_SMPTE2086_WHITE_POINT_Y_EXT"/>

        <enum value="0x3349" name="EGL_SMPTE2086_MAX_LUMINANCE_EXT"/>

        <enum value="0x334A" name="EGL_SMPTE2086_MIN_LUMINANCE_EXT"/>

            <unused start="0x334B" end="0x334F"/>

        <enum value="0x3350" name="EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT"/>

            <unused start="0x3351" end="0x339F"/>

    </enums>

    </enums>





    <enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)">

    <enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)">
@@ -765,8 +781,8 @@ 




<!-- Reservable for future use. To generate a new range, allocate multiples

<!-- Reservable for future use. To generate a new range, allocate multiples

     of 16 starting at the lowest available point in this block. -->

     of 16 starting at the lowest available point in this block. -->

    <enums namespace="EGL" start="0x3420" end="0x3FFF" vendor="KHR">

    <enums namespace="EGL" start="0x3470" end="0x3FFF" vendor="KHR">

            <unused start="0x3420" end="0x3FFF" comment="Reserved for future use"/>

            <unused start="0x3470" end="0x3FFF" comment="Reserved for future use"/>

    </enums>

    </enums>





    <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">

    <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
@@ -1859,6 +1875,21 @@ 
                <command name="eglQueryDisplayAttribEXT"/>

                <command name="eglQueryDisplayAttribEXT"/>

            </require>

            </require>

        </extension>

        </extension>

        <extension name="EGL_EXT_gl_colorspace_bt2020_linear" supported="egl">

            <require>

                <enum name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/>

            </require>

        </extension>

        <extension name="EGL_EXT_gl_colorspace_bt2020_pq" supported="egl">

            <require>

                <enum name="EGL_GL_COLORSPACE_BT2020_PQ_EXT"/>

            </require>

        </extension>

        <extension name="EGL_EXT_gl_colorspace_scrgb_linear" supported="egl">

            <require>

                <enum name="EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT"/>

            </require>

        </extension>

        <extension name="EGL_EXT_image_dma_buf_import" supported="egl">

        <extension name="EGL_EXT_image_dma_buf_import" supported="egl">

            <require>

            <require>

                <enum name="EGL_LINUX_DMA_BUF_EXT"/>

                <enum name="EGL_LINUX_DMA_BUF_EXT"/>
@@ -1955,6 +1986,21 @@ 
                <command name="eglStreamConsumerOutputEXT"/>

                <command name="eglStreamConsumerOutputEXT"/>

            </require>

            </require>

        </extension>

        </extension>

        <extension name="EGL_EXT_surface_SMPTE2086_metadata" supported="egl">

            <require>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT"/>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT"/>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT"/>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT"/>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT"/>

                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT"/>

                <enum name="EGL_SMPTE2086_WHITE_POINT_X_EXT"/>

                <enum name="EGL_SMPTE2086_WHITE_POINT_Y_EXT"/>

                <enum name="EGL_SMPTE2086_MAX_LUMINANCE_EXT"/>

                <enum name="EGL_SMPTE2086_MIN_LUMINANCE_EXT"/>

            </require>

        </extension>



        <extension name="EGL_EXT_swap_buffers_with_damage" supported="egl">

        <extension name="EGL_EXT_swap_buffers_with_damage" supported="egl">

            <require>

            <require>

                <command name="eglSwapBuffersWithDamageEXT"/>

                <command name="eglSwapBuffersWithDamageEXT"/>