DescriptionRemove GetPlatformDefaultEGLNativeDisplay() function.
During EGL initialization GetPlatformDefaultEGLNativeDisplay() gets
called. This function is conditionally compiled for each platform. Under
Ozone the function calls into OzonePlatform to get the EGL
native_display to use. This ordering requires that //ui/gl depends on
//ui/ozone which we want to break.
This CL removes GetPlatformDefaultEGLNativeDisplay() and instead passes
in the EGL native_display to GLSurfaceEGL::InitializeOneOff() or
GLSurfaceEGL::InitializeDisplay(). For tests EGL_DEFAULT_DISPLAY is
always passed in.
The GL initialization and autogen binding code needs to be rearranged to
accomplish this. For EGL generated code split the client extension
bindings and extension bindings into two separate methods. The client
extension bindings need to be initialized before
GLSurfaceEGL::InitializeDisplay() is called while the extension bindings
need to be initialized after. Also fix a problem preventing
generate_bindings.py from running with missing extension information due
to a recent change.
BUG=611142
Committed: https://crrev.com/7dd36fe1e9bab00078cecd98616364ccf5e8b957
Cr-Commit-Position: refs/heads/master@{#406643}
Patch Set 1 #Patch Set 2 : Missing comment. #Patch Set 3 : Rebase. #Patch Set 4 : Fix win GYP linker settings. #Patch Set 5 : Fix initialization order. #Patch Set 6 : Fix test. #Patch Set 7 : Add SetNativeDisplay back. #Patch Set 8 : Rebase. #Patch Set 9 : Back to original. #
Messages
Total messages: 48 (29 generated)
|