projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi/gfx10: finish up Navi14, add PCI ID
[mesa.git]
/
src
/
gallium
/
drivers
/
swr
/
swr_loader.cpp
diff --git
a/src/gallium/drivers/swr/swr_loader.cpp
b/src/gallium/drivers/swr/swr_loader.cpp
index c5b2e294ef7ef5ae0671a9192fb2e8c85f594f44..f597b5015e46c14ee4fb84ccf93055e5c02c7567 100644
(file)
--- a/
src/gallium/drivers/swr/swr_loader.cpp
+++ b/
src/gallium/drivers/swr/swr_loader.cpp
@@
-36,6
+36,7
@@
swr_initialize_screen_interface(struct swr_screen *screen, const char arch[])
#ifdef HAVE_SWR_BUILTIN
screen->pLibrary = NULL;
screen->pfnSwrGetInterface = SwrGetInterface;
#ifdef HAVE_SWR_BUILTIN
screen->pLibrary = NULL;
screen->pfnSwrGetInterface = SwrGetInterface;
+ screen->pfnSwrGetInterface = SwrGetTileInterface;
InitTilesTable();
fprintf(stderr, "(using: builtin).\n");
#else
InitTilesTable();
fprintf(stderr, "(using: builtin).\n");
#else
@@
-50,9
+51,11
@@
swr_initialize_screen_interface(struct swr_screen *screen, const char arch[])
util_dl_proc pApiProc = util_dl_get_proc_address(screen->pLibrary,
"SwrGetInterface");
util_dl_proc pApiProc = util_dl_get_proc_address(screen->pLibrary,
"SwrGetInterface");
+ util_dl_proc pTileApiProc = util_dl_get_proc_address(screen->pLibrary,
+ "SwrGetTileIterface");
util_dl_proc pInitFunc = util_dl_get_proc_address(screen->pLibrary,
"InitTilesTable");
util_dl_proc pInitFunc = util_dl_get_proc_address(screen->pLibrary,
"InitTilesTable");
- if (!pApiProc || !pInitFunc) {
+ if (!pApiProc || !pInitFunc
|| !pTileApiProc
) {
fprintf(stderr, "(skipping: %s).\n", util_dl_error());
util_dl_close(screen->pLibrary);
screen->pLibrary = NULL;
fprintf(stderr, "(skipping: %s).\n", util_dl_error());
util_dl_close(screen->pLibrary);
screen->pLibrary = NULL;
@@
-60,6
+63,12
@@
swr_initialize_screen_interface(struct swr_screen *screen, const char arch[])
}
screen->pfnSwrGetInterface = (PFNSwrGetInterface)pApiProc;
}
screen->pfnSwrGetInterface = (PFNSwrGetInterface)pApiProc;
+ screen->pfnSwrGetTileInterface = (PFNSwrGetTileInterface)pTileApiProc;
+
+ SWR_ASSERT(screen->pfnSwrGetInterface != nullptr);
+ SWR_ASSERT(screen->pfnSwrGetTileInterface != nullptr);
+ SWR_ASSERT(pInitFunc != nullptr);
+
pInitFunc();
fprintf(stderr, "(using: %s).\n", filename);
pInitFunc();
fprintf(stderr, "(using: %s).\n", filename);