KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Return NULL from initScreen2, not false. 

This returns a pointer, not a boolean.  No actual effect, but cleaner.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Kenneth Graunke 2017-03-01 16:02:58 -08:00
parent b5b123ac8f
commit 7782936cbc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/intel_screen.c
View File

@ -1654,14 +1654,14 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
fprintf(stderr, fprintf(stderr,
"\nERROR! DRI2 loader with getBuffersWithFormat() " "\nERROR! DRI2 loader with getBuffersWithFormat() "
"support required\n"); "support required\n");
return false; return NULL;
} }
/* Allocate the private area */ /* Allocate the private area */
screen = rzalloc(NULL, struct intel_screen); screen = rzalloc(NULL, struct intel_screen);
if (!screen) { if (!screen) {
fprintf(stderr, "\nERROR! Allocating private area failed\n"); fprintf(stderr, "\nERROR! Allocating private area failed\n");
return false; return NULL;
} }
/* parse information in __driConfigOptions */ /* parse information in __driConfigOptions */
driParseOptionInfo(&screen->optionCache, brw_config_options.xml); driParseOptionInfo(&screen->optionCache, brw_config_options.xml);
@ -1670,11 +1670,11 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
dri_screen->driverPrivate = (void *) screen; dri_screen->driverPrivate = (void *) screen;
if (!intel_init_bufmgr(screen)) if (!intel_init_bufmgr(screen))
return false; return NULL;
screen->deviceID = drm_intel_bufmgr_gem_get_devid(screen->bufmgr); screen->deviceID = drm_intel_bufmgr_gem_get_devid(screen->bufmgr);
if (!gen_get_device_info(screen->deviceID, &screen->devinfo)) if (!gen_get_device_info(screen->deviceID, &screen->devinfo))
return false; return NULL;
const struct gen_device_info *devinfo = &screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;