diff options
| author | Emil Velikov <[email protected]> | 2014-02-13 15:24:16 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-02-22 03:26:28 +0000 |
| commit | 4f37e52f374b8b1d7177634dc09ab71e30e1779d (patch) | |
| tree | 85f13d7c8ac044eb01628de73c0316f298f15922 /src/gallium/state_trackers | |
| parent | b4e8572bca60928c297e2b913ea1059aef104b98 (diff) | |
winsys/xlib: move xlib_create_sw_winsys within the winsys
v2: Rebase on top of vl_winsys_xsp.c removal
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Jakob Bornecrantz <[email protected]> (v1)
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/egl/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/x11/native_ximage.c | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.h | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index 9c00f06a1c4..26266ed2b6d 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -42,6 +42,7 @@ AM_CFLAGS += \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) AM_CPPFLAGS += \ + -I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/src/glx \ -I$(top_srcdir)/src/mapi \ diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript index 066a7fd9a92..3ddf0bca489 100644 --- a/src/gallium/state_trackers/egl/SConscript +++ b/src/gallium/state_trackers/egl/SConscript @@ -7,6 +7,7 @@ env = env.Clone() env.Append(CPPPATH = [ '#/src/egl/main', + '#/src/gallium/winsys', '#/src/gallium/winsys/sw', '.', ]) diff --git a/src/gallium/state_trackers/egl/x11/native_ximage.c b/src/gallium/state_trackers/egl/x11/native_ximage.c index 019e5355128..d3d19245aa3 100644 --- a/src/gallium/state_trackers/egl/x11/native_ximage.c +++ b/src/gallium/state_trackers/egl/x11/native_ximage.c @@ -29,7 +29,8 @@ #include "util/u_format.h" #include "pipe/p_compiler.h" #include "util/u_inlines.h" -#include "state_tracker/xlib_sw_winsys.h" +#include "state_tracker/xlibsw_api.h" +#include "sw/xlib/xlib_sw_winsys.h" #include "util/u_debug.h" #include "egllog.h" diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.h b/src/gallium/state_trackers/glx/xlib/xm_api.h index fa97ea4de01..6d0bc3f4d81 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.h +++ b/src/gallium/state_trackers/glx/xlib/xm_api.h @@ -61,7 +61,7 @@ and create a window, you must do the following to use the X/Mesa interface: #include "state_tracker/st_api.h" #include "os/os_thread.h" -#include "state_tracker/xlib_sw_winsys.h" +#include "state_tracker/xlibsw_api.h" # include <X11/Xlib.h> # include <X11/Xlibint.h> |