diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/targets/libgl-xlib/xlib.c | |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/targets/libgl-xlib/xlib.c')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/xlib.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index 05dc8db57d..eff4b4778b 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -39,9 +39,15 @@ #include "target-helpers/wrap_screen.h" #include "xm_public.h" +#include "state_tracker/st_manager.h" + /* advertise OpenGL support */ PUBLIC const int st_api_OpenGL = 1; +PUBLIC const struct st_module st_module_OpenGL = { + .api = ST_API_OPENGL, + .create_api = st_manager_create_api +}; /* Helper function to build a subset of a driver stack consisting of * one of the software rasterizers (cell, llvmpipe, softpipe) and the @@ -81,8 +87,10 @@ swrast_xlib_create_screen( Display *display ) screen = llvmpipe_create_screen( winsys ); #endif +#if defined(GALLIUM_SOFTPIPE) if (screen == NULL) screen = softpipe_create_screen( winsys ); +#endif if (screen == NULL) goto fail; @@ -98,9 +106,10 @@ fail: return NULL; } -struct xm_driver xlib_driver = +static struct xm_driver xlib_driver = { .create_pipe_screen = swrast_xlib_create_screen, + .create_st_api = st_manager_create_api, }; |