diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2015-01-22 18:18:26 +0800 |
|---|---|---|
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | 2015-01-22 18:18:26 +0800 |
| commit | 703199caf7160a33015685b2b0dbf3a29619d354 (patch) | |
| tree | c74b3f32c1443c9465a93e3039cd2ea52768db5f /gralloc_drm_pipe.c | |
| parent | d71e7963c186d6c83b5c11028bf1261bab65fa54 (diff) | |
| download | external_drm_gralloc-703199caf7160a33015685b2b0dbf3a29619d354.zip external_drm_gralloc-703199caf7160a33015685b2b0dbf3a29619d354.tar.gz external_drm_gralloc-703199caf7160a33015685b2b0dbf3a29619d354.tar.bz2 | |
gralloc_drm_pipe: fix building errors with mesa 10.4
Diffstat (limited to 'gralloc_drm_pipe.c')
| -rw-r--r-- | gralloc_drm_pipe.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c index 2f96ab5..477e98f 100644 --- a/gralloc_drm_pipe.c +++ b/gralloc_drm_pipe.c @@ -401,25 +401,19 @@ static int pipe_init_screen(struct pipe_manager *pm) #endif #ifdef ENABLE_PIPE_R300 if (strcmp(pm->driver, "r300") == 0) { - struct radeon_winsys *sws = radeon_drm_winsys_create(pm->fd); + struct radeon_winsys *sws = + radeon_drm_winsys_create(pm->fd, r300_screen_create); - if (sws) { - screen = r300_screen_create(sws); - if (!screen) - sws->destroy(sws); - } + screen = sws ? sws->screen : NULL; } else #endif #ifdef ENABLE_PIPE_R600 if (strcmp(pm->driver, "r600") == 0) { - struct radeon_winsys *sws = radeon_drm_winsys_create(pm->fd); + struct radeon_winsys *sws = + radeon_drm_winsys_create(pm->fd, r600_screen_create); - if (sws) { - screen = r600_screen_create(sws); - if (!screen) - sws->destroy(sws); - } + screen = sws ? sws->screen : NULL; } else #endif @@ -428,18 +422,14 @@ static int pipe_init_screen(struct pipe_manager *pm) struct svga_winsys_screen *sws = svga_drm_winsys_screen_create(pm->fd); - if (sws) { - screen = svga_screen_create(sws); - if (!screen) - sws->destroy(sws); - } + screen = sws ? svga_screen_create(sws) : NULL; } else #endif screen = NULL; if (!screen) { - ALOGW("failed to create screen for %s", pm->driver); + ALOGW("failed to create pipe screen for %s", pm->driver); return -EINVAL; } |