OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/drm: remove unreachable code in dri2_drm_create_surface()

Browse Source 
The function can be called only when the type is EGL_WINDOW_BIT.
Remove the unneeded switch statement.

v2: Rename the local variable window to surface (Eric)

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v1)
This commit is contained in:
Emil Velikov
2017-08-05 00:25:52 +01:00
committed by Emil Velikov
parent 794df9acad
commit 430a80a7b6
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/egl/drivers/dri2/platform_drm.c
View File

@@ -92,13 +92,13 @@ has_free_buffers(struct gbm_surface *_surf)
static _EGLSurface * static _EGLSurface *
dri2_drm_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, dri2_drm_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
_EGLConfig *conf, void *native_window, _EGLConfig *conf, void *native_surface,
const EGLint *attrib_list) const EGLint *attrib_list)
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
struct dri2_egl_surface *dri2_surf; struct dri2_egl_surface *dri2_surf;
struct gbm_surface *window = native_window; struct gbm_surface *surface = native_surface;
struct gbm_dri_surface *surf; struct gbm_dri_surface *surf;
const __DRIconfig *config; const __DRIconfig *config;
@@ -113,17 +113,11 @@ dri2_drm_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list)) if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list))
goto cleanup_surf; goto cleanup_surf;
switch (type) { surf = gbm_dri_surface(surface);
case EGL_WINDOW_BIT: dri2_surf->gbm_surf = surf;
surf = gbm_dri_surface(window); dri2_surf->base.Width = surf->base.width;
dri2_surf->gbm_surf = surf; dri2_surf->base.Height = surf->base.height;
dri2_surf->base.Width = surf->base.width; surf->dri_private = dri2_surf;
dri2_surf->base.Height = surf->base.height;
surf->dri_private = dri2_surf;
break;
default:
goto cleanup_surf;
}
config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT, config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
dri2_surf->base.GLColorspace); dri2_surf->base.GLColorspace);