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.
---
src/gallium/drivers/swr/swr_loader.cpp | 2 +-
src/gallium/drivers/swr/swr_public.h | 4 ++++
src/gallium/drivers/swr/swr_screen.cpp | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/swr/swr_loader.cpp
b/src/gallium/drivers/swr/swr_loader.cpp
index 2113c37..9d79fa5 100644
--- a/src/gallium/drivers/swr/swr_loader.cpp
+++ b/src/gallium/drivers/swr/swr_loader.cpp
@@ -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());
diff --git a/src/gallium/drivers/swr/swr_public.h
b/src/gallium/drivers/swr/swr_public.h
index 0814c3b..7ef81bf 100644
--- a/src/gallium/drivers/swr/swr_public.h
+++ b/src/gallium/drivers/swr/swr_public.h
@@ -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);
diff --git a/src/gallium/drivers/swr/swr_screen.cpp
b/src/gallium/drivers/swr/swr_screen.cpp
index cc79f28..8a85128 100644
--- a/src/gallium/drivers/swr/swr_screen.cpp
+++ b/src/gallium/drivers/swr/swr_screen.cpp
@@ -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);
--
2.10.0.windows.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
