diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-12-09 13:01:09 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-12-11 11:26:19 -0800 |
| commit | 35e9924484ec7bafb749c88ed7f78e6a71f8dfb3 (patch) | |
| tree | bf4a6e3de9a5e2abfdccd295e1797e096d25257e | |
| parent | 91651e7c15892aa846fc406fbb13b37f094dd3f0 (diff) | |
modesetting: Stop using glamor_egl_create_textured_screen_ext().
The _ext variant takes an additional pointer argument, which it now
ignores, thanks to Keith's recent patches.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/drivers/modesetting/driver.c | 11 | ||||
| -rw-r--r-- | hw/xfree86/drivers/modesetting/drmmode_display.c | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index d1284c6fc..06b0f2174 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -888,13 +888,12 @@ CreateScreenResources(ScreenPtr pScreen) #ifdef GLAMOR if (ms->drmmode.glamor) { - if (!glamor_egl_create_textured_screen_ext(pScreen, - ms->drmmode.front_bo->handle, - pScrn->displayWidth * - pScrn->bitsPerPixel / 8, - NULL)) { + if (!glamor_egl_create_textured_screen(pScreen, + ms->drmmode.front_bo->handle, + pScrn->displayWidth * + pScrn->bitsPerPixel / 8)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "glamor_egl_create_textured_screen_ext() failed\n"); + "glamor_egl_create_textured_screen() failed\n"); return FALSE; } } diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index d5b7d0008..fddbaff96 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1249,13 +1249,12 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) #ifdef GLAMOR if (drmmode->glamor) { - if (!glamor_egl_create_textured_screen_ext(screen, - drmmode->front_bo->handle, - scrn->displayWidth * - scrn->bitsPerPixel / 8, - NULL)) { + if (!glamor_egl_create_textured_screen(screen, + drmmode->front_bo->handle, + scrn->displayWidth * + scrn->bitsPerPixel / 8)) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, - "glamor_egl_create_textured_screen_ext() failed\n"); + "glamor_egl_create_textured_screen() failed\n"); goto fail; } } |