[PATCH 1/8] modesetting: Stop using glamor_egl_create_textured_screen_ext().
Kenneth Graunke
kenneth at whitecape.org
Tue Dec 9 16:55:24 PST 2014
The _ext variant takes an additional pointer argument, which it now
ignores, thanks to Keith's recent patches.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
hw/xfree86/drivers/modesetting/driver.c | 11 +++++------
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 d1284c6..06b0f21 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 d5b7d00..fddbaff 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;
}
}
--
2.1.3
More information about the xorg-devel
mailing list