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

modesetting: Move ModifyPixmapHeader calls out of if/else branches. 

Both branches called ModifyPixmapHeader with essentially the same
parameters.  By using new_pixels in the shadowfb case, we can make
them completely the same, and move them out a level, for simplicity.

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 14:38:39 -08:00
parent 35e9924484
commit b4324c6a23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,22 +1231,18 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
if (!new_pixels) if (!new_pixels)
goto fail; goto fail;
if (!drmmode->shadow_enable) if (drmmode->shadow_enable) {
screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
pitch, new_pixels);
else {
void *new_shadow;
uint32_t size = scrn->displayWidth * scrn->virtualY * uint32_t size = scrn->displayWidth * scrn->virtualY *
((scrn->bitsPerPixel + 7) >> 3); ((scrn->bitsPerPixel + 7) >> 3);
new_shadow = calloc(1, size); new_pixels = calloc(1, size);
if (new_shadow == NULL) if (new_pixels == NULL)
goto fail; goto fail;
free(drmmode->shadow_fb); free(drmmode->shadow_fb);
drmmode->shadow_fb = new_shadow; drmmode->shadow_fb = new_pixels;
screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
pitch, drmmode->shadow_fb);
} }
screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch, new_pixels);
#ifdef GLAMOR #ifdef GLAMOR
if (drmmode->glamor) { if (drmmode->glamor) {
if (!glamor_egl_create_textured_screen(screen, if (!glamor_egl_create_textured_screen(screen,