mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

egl: inline _eglInitializeDisplay() into eglInitialize() 

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>
This commit is contained in:
Eric Engestrom 2020-08-03 23:43:33 +02:00 committed by Marge Bot
parent 0e7ae395e7
commit 890d0334c1
3 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/egl/main/eglapi.c
View File

@ -89,11 +89,13 @@
#define PUBLIC
#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "c99_compat.h"
#include "c11/threads.h"
#include "util/debug.h"
#include "util/macros.h"
#include "egldefines.h"
@ -108,6 +110,7 @@
#include "eglconfig.h"
#include "eglimage.h"
#include "eglsync.h"
#include "egllog.h"
#include "GL/mesa_glinterop.h"
@ -613,8 +616,28 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
RETURN_EGL_ERROR(NULL, EGL_BAD_DISPLAY, EGL_FALSE);
if (!disp->Initialized) {
if (!_eglInitializeDisplay(disp))
RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE);
/* set options */
disp->Options.ForceSoftware =
env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
if (disp->Options.ForceSoftware)
_eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer");
/**
* Initialize the display using the driver's function.
* If the initialisation fails, try again using only software rendering.
*/
if (!_eglDriver.Initialize(disp)) {
if (disp->Options.ForceSoftware)
RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE);
else {
disp->Options.ForceSoftware = EGL_TRUE;
if (!_eglDriver.Initialize(disp))
RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE);
}
}
disp->Initialized = EGL_TRUE;
disp->Driver = &_eglDriver;
/* limit to APIs supported by core */
disp->ClientAPIs &= _EGL_API_ALL_BITS;

41
src/egl/main/egldriver.c
View File

@ -33,50 +33,9 @@
*/
#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "c11/threads.h"
#include "egldefines.h"
#include "egldisplay.h"
#include "egldriver.h"
#include "egllog.h"
#include "util/debug.h"
extern const _EGLDriver _eglDriver;
/**
* Initialize the display using the driver's function.
* If the initialisation fails, try again using only software rendering.
*/
bool
_eglInitializeDisplay(_EGLDisplay *disp)
{
assert(!disp->Initialized);
/* set options */
disp->Options.ForceSoftware =
env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
if (disp->Options.ForceSoftware)
_eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer");
if (_eglDriver.Initialize(disp)) {
disp->Driver = &_eglDriver;
disp->Initialized = EGL_TRUE;
return true;
}
if (disp->Options.ForceSoftware)
return false;
disp->Options.ForceSoftware = EGL_TRUE;
if (!_eglDriver.Initialize(disp))
return false;
disp->Driver = &_eglDriver;
disp->Initialized = EGL_TRUE;
return true;
}

4
src/egl/main/egldriver.h
View File

@ -195,10 +195,6 @@ struct _egl_driver
};
extern bool
_eglInitializeDisplay(_EGLDisplay *disp);
#ifdef __cplusplus
}
#endif