fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-07 18:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swr: renamed duplicate swr_create_screen()

Browse source 
There are 2 swr_create_screen() functions.  One in swr_loader.cpp, which
is used during driver init, and the other is hiding in swr_screen.cpp,
which ends up in the arch-specific .dll/.so.

Rename the second one to swr_create_screen_internal(), to avoid confusion
in header files.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
George Kyriazis 2016-11-17 16:21:12 -06:00 • committed by Tim Rowley
parent 974d280e81
commit 87bd28210f
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/swr/swr_loader.cpp
View file

@ -54,7 +54,7 @@ swr_create_screen(struct sw_winsys *winsys)
exit(-1);
}
util_dl_proc pScreenProc = util_dl_get_proc_address(pLibrary, "swr_create_screen");
util_dl_proc pScreenProc = util_dl_get_proc_address(pLibrary, "swr_create_screen_internal");
if (!pScreenProc) {
fprintf(stderr, "SWR library search failure: %s\n", util_dl_error());

4
src/gallium/drivers/swr/swr_public.h
View file

@ -32,8 +32,12 @@ struct sw_displaytarget;
extern "C" {
#endif
// driver entry point
struct pipe_screen *swr_create_screen(struct sw_winsys *winsys);
// arch-specific dll entry point
PUBLIC struct pipe_screen *swr_create_screen_internal(struct sw_winsys *winsys);
struct sw_winsys *swr_get_winsys(struct pipe_screen *pipe);
struct sw_displaytarget *swr_get_displaytarget(struct pipe_resource *resource);

2
src/gallium/drivers/swr/swr_screen.cpp
View file

@ -986,7 +986,7 @@ swr_destroy_screen(struct pipe_screen *p_screen)
PUBLIC
struct pipe_screen *
swr_create_screen(struct sw_winsys *winsys)
swr_create_screen_internal(struct sw_winsys *winsys)
{
struct swr_screen *screen = CALLOC_STRUCT(swr_screen);