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

Commit 8af003eb authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

OpenGL: let eglext_angle.h include eglext.h for platform 

EGLStreamKHR and EGLDeviceEXT used by eglext_angle.h is undefined
without eglext.h. From the description of eglext_angle.h, it's just
for patching eglext.h and should never be explictly included. However,
eglext.h is generated from EGL spec. So we'd better not manually modify
eglext.h to include eglext_angle.h at the bottom. This change just let
eglext_angle.h include eglext.h.

Bug: 158235687
Test: build, flash and boot
Change-Id: I02f992d880cce41b3ddc70fb5a28a87a64f05ec7
parent d40aaacf

opengl/include/EGL/eglext_angle.h

+2 −2
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ 
// found in the LICENSE file.

//

// eglext_angle.h: ANGLE modifications to the eglext.h header file.

//   Currently we don't include this file directly, we patch eglext.h

//   to include it implicitly so it is visible throughout our code.



#ifndef INCLUDE_EGL_EGLEXT_ANGLE_

#define INCLUDE_EGL_EGLEXT_ANGLE_



#include <EGL/eglext.h>



// clang-format off



#ifndef EGL_ANGLE_robust_resource_initialization

opengl/libs/EGL/Loader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 


#include <string>



#include "EGL/eglext_angle.h"

#include "egl_platform_entries.h"

#include "egl_trace.h"

#include "egldefs.h"

#include "EGL/eglext_angle.h"



namespace android {

opengl/libs/EGL/egl_display.cpp

+10 −13
Original line number Diff line number Diff line
@@ -19,25 +19,22 @@ 


#include "egl_display.h"



#include "../egl_impl.h"



#include <EGL/eglext_angle.h>

#include <private/EGL/display.h>



#include "Loader.h"

#include "egl_angle_platform.h"

#include "egl_cache.h"

#include "egl_object.h"

#include "egl_tls.h"



#include <SurfaceFlingerProperties.h>

#include <android-base/properties.h>

#include <android/dlext.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <configstore/Utils.h>

#include <dlfcn.h>

#include <graphicsenv/GraphicsEnv.h>



#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <configstore/Utils.h>

#include "../egl_impl.h"

#include "EGL/eglext_angle.h"

#include "Loader.h"

#include "egl_angle_platform.h"

#include "egl_cache.h"

#include "egl_object.h"

#include "egl_tls.h"

#include "private/EGL/display.h"



using namespace android::hardware::configstore;

using namespace android::hardware::configstore::V1_0;

opengl/libs/EGL/egl_platform_entries.cpp

+11 −15
Original line number Diff line number Diff line
@@ -18,36 +18,32 @@ 


#include "egl_platform_entries.h"



#include <ctype.h>

#include <dlfcn.h>

#include <stdlib.h>

#include <string.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <EGL/eglext_angle.h>



#include <android-base/properties.h>

#include <android-base/strings.h>

#include <android/hardware_buffer.h>

#include <graphicsenv/GraphicsEnv.h>

#include <private/android/AHardwareBufferHelpers.h>



#include <ctype.h>

#include <cutils/compiler.h>

#include <dlfcn.h>

#include <graphicsenv/GraphicsEnv.h>

#include <log/log.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <stdlib.h>

#include <string.h>



#include <condition_variable>

#include <deque>

#include <mutex>

#include <unordered_map>

#include <string>

#include <thread>

#include <unordered_map>



#include "../egl_impl.h"



#include "EGL/egl.h"

#include "EGL/eglext.h"

#include "EGL/eglext_angle.h"

#include "egl_display.h"

#include "egl_object.h"

#include "egl_layers.h"

#include "egl_object.h"

#include "egl_tls.h"

#include "egl_trace.h"