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

Commit c7fa0898 authored by Weiwan Liu's avatar Weiwan Liu Committed by Yiwei Zhang
Browse files

EGL: always set data space even for UNKNOWN 

Set dataSpace even if it could be HAL_DATASPACE_UNKNOWN.
HAL_DATASPACE_UNKNOWN is the initial value, but it may
have been set to other value.

Bug: b/118093231
Test: NV internal regression tests including dEQP
Test: EGL_test --gtest_filter=EGLTest.EGLCreateWindowTwoColorspaces

Change-Id: Ifb64077dc0c39ebd1f7ec2641590b218bf6070d7
parent 60af8e3d

opengl/libs/EGL/egl_platform_entries.cpp

+8 −7
Original line number Diff line number Diff line
@@ -748,7 +748,9 @@ EGLSurface eglCreateWindowSurfaceTmpl(egl_display_ptr dp, egl_connection_t* cnx, 
        }



        android_dataspace dataSpace = dataSpaceFromEGLColorSpace(colorSpace);

        if (dataSpace != HAL_DATASPACE_UNKNOWN) {

        // Set dataSpace even if it could be HAL_DATASPACE_UNKNOWN.

        // HAL_DATASPACE_UNKNOWN is the default value, but it may have changed

        // at this point.

        err = native_window_set_buffers_data_space(window, dataSpace);

        if (err != 0) {

            ALOGE("error setting native window pixel dataSpace: %s (%d)", strerror(-err), err);
@@ -756,7 +758,6 @@ EGLSurface eglCreateWindowSurfaceTmpl(egl_display_ptr dp, egl_connection_t* cnx, 
            return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);

        }

    }

    }



    // the EGL spec requires that a new EGLSurface default to swap interval

    // 1, so explicitly set that on the window here.