egl: drop always-false TestOnly option
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
@@ -901,10 +901,6 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp)
|
||||
if (disp->Options.UseFallback)
|
||||
return EGL_FALSE;
|
||||
|
||||
/* Nothing to initialize for a test only display */
|
||||
if (disp->Options.TestOnly)
|
||||
return EGL_TRUE;
|
||||
|
||||
switch (disp->Platform) {
|
||||
#ifdef HAVE_SURFACELESS_PLATFORM
|
||||
case _EGL_PLATFORM_SURFACELESS:
|
||||
|
@@ -583,7 +583,7 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
|
||||
RETURN_EGL_ERROR(NULL, EGL_BAD_DISPLAY, EGL_FALSE);
|
||||
|
||||
if (!disp->Initialized) {
|
||||
if (!_eglMatchDriver(disp, EGL_FALSE))
|
||||
if (!_eglMatchDriver(disp))
|
||||
RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE);
|
||||
|
||||
/* limit to APIs supported by core */
|
||||
|
@@ -152,7 +152,6 @@ struct _egl_display
|
||||
|
||||
/* options that affect how the driver initializes the display */
|
||||
struct {
|
||||
EGLBoolean TestOnly; /**< Driver should not set fields when true */
|
||||
EGLBoolean UseFallback; /**< Use fallback driver (sw or less features) */
|
||||
void *Platform; /**< Platform-specific options */
|
||||
} Options;
|
||||
|
@@ -75,19 +75,17 @@ _eglMatchAndInitialize(_EGLDisplay *dpy)
|
||||
}
|
||||
|
||||
/**
|
||||
* Match a display to a driver. The display is initialized unless test_only is
|
||||
* true. The matching is done by finding the first driver that can initialize
|
||||
* the display.
|
||||
* Match a display to a driver. The matching is done by finding the first
|
||||
* driver that can initialize the display.
|
||||
*/
|
||||
_EGLDriver *
|
||||
_eglMatchDriver(_EGLDisplay *dpy, EGLBoolean test_only)
|
||||
_eglMatchDriver(_EGLDisplay *dpy)
|
||||
{
|
||||
_EGLDriver *best_drv;
|
||||
|
||||
assert(!dpy->Initialized);
|
||||
|
||||
/* set options */
|
||||
dpy->Options.TestOnly = test_only;
|
||||
dpy->Options.UseFallback = EGL_FALSE;
|
||||
|
||||
best_drv = _eglMatchAndInitialize(dpy);
|
||||
@@ -97,12 +95,10 @@ _eglMatchDriver(_EGLDisplay *dpy, EGLBoolean test_only)
|
||||
}
|
||||
|
||||
if (best_drv) {
|
||||
_eglLog(_EGL_DEBUG, "the best driver is %s%s",
|
||||
best_drv->Name, (test_only) ? " (test only) " : "");
|
||||
if (!test_only) {
|
||||
dpy->Driver = best_drv;
|
||||
dpy->Initialized = EGL_TRUE;
|
||||
}
|
||||
_eglLog(_EGL_DEBUG, "the best driver is %s",
|
||||
best_drv->Name);
|
||||
dpy->Driver = best_drv;
|
||||
dpy->Initialized = EGL_TRUE;
|
||||
}
|
||||
|
||||
return best_drv;
|
||||
|
@@ -86,7 +86,7 @@ _eglInitDriver(_EGLDriver *driver);
|
||||
|
||||
|
||||
extern _EGLDriver *
|
||||
_eglMatchDriver(_EGLDisplay *dpy, EGLBoolean test_only);
|
||||
_eglMatchDriver(_EGLDisplay *dpy);
|
||||
|
||||
|
||||
extern __eglMustCastToProperFunctionPointerType
|
||||
|
Reference in New Issue
Block a user