frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kenneth Graunke 2014-12-09 13:01:09 -08:00
parent 91651e7c15
commit 35e9924484
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/drivers/modesetting/driver.c
View File

@ -888,13 +888,12 @@ CreateScreenResources(ScreenPtr pScreen)
#ifdef GLAMOR #ifdef GLAMOR
if (ms->drmmode.glamor) { if (ms->drmmode.glamor) {
if (!glamor_egl_create_textured_screen_ext(pScreen, if (!glamor_egl_create_textured_screen(pScreen,
ms->drmmode.front_bo->handle, ms->drmmode.front_bo->handle,
pScrn->displayWidth * pScrn->displayWidth *
pScrn->bitsPerPixel / 8, pScrn->bitsPerPixel / 8)) {
NULL)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"glamor_egl_create_textured_screen_ext() failed\n"); "glamor_egl_create_textured_screen() failed\n");
return FALSE; return FALSE;
} }
} }

7
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -1249,13 +1249,12 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
#ifdef GLAMOR #ifdef GLAMOR
if (drmmode->glamor) { if (drmmode->glamor) {
if (!glamor_egl_create_textured_screen_ext(screen, if (!glamor_egl_create_textured_screen(screen,
drmmode->front_bo->handle, drmmode->front_bo->handle,
scrn->displayWidth * scrn->displayWidth *
scrn->bitsPerPixel / 8, scrn->bitsPerPixel / 8)) {
NULL)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"glamor_egl_create_textured_screen_ext() failed\n"); "glamor_egl_create_textured_screen() failed\n");
goto fail; goto fail;
} }
} }