diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-06-08 19:47:48 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-07-01 13:07:40 +1000 |
| commit | 3ecd9e1a93817180fa5b280e5fe11c903cca38ba (patch) | |
| tree | f650a9e9d722667c24625d787d7738bdf9a08bb0 /src/loader/Makefile.am | |
| parent | 7ab925a6aafca106e7682dfc21e7c9351380809e (diff) | |
| download | external_mesa3d-3ecd9e1a93817180fa5b280e5fe11c903cca38ba.zip external_mesa3d-3ecd9e1a93817180fa5b280e5fe11c903cca38ba.tar.gz external_mesa3d-3ecd9e1a93817180fa5b280e5fe11c903cca38ba.tar.bz2 | |
loader: Use drirc device_id parameter in complement to DRI_PRIME
DRI_PRIME is not very handy, because you have to launch the executable
with it set, which is not always easy to do.
By using drirc, the user specifies the target executable
and the device to use. After that the program will be launched everytime
on the target device.
For example if .drirc contains:
<driconf>
<device driver="loader">
<application name="Glmark2" executable="glmark2">
<option name="device_id" value="pci-0000_01_00_0" />
</application>
</device>
</driconf>
Then glmark2 will use if possible the render-node of
ID_PATH_TAG pci-0000_01_00_0.
v2: Fix compilation issue
v3: Add "-lm" and rebase.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/loader/Makefile.am')
| -rw-r--r-- | src/loader/Makefile.am | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index bddf7ac..ae8a844 100644 --- a/src/loader/Makefile.am +++ b/src/loader/Makefile.am @@ -29,6 +29,25 @@ libloader_la_CPPFLAGS = \ $(VISIBILITY_CFLAGS) \ $(LIBUDEV_CFLAGS) +libloader_la_SOURCES = $(LOADER_C_FILES) +libloader_la_LIBADD = + +if NEED_OPENGL_COMMON +libloader_la_CPPFLAGS += \ + -I$(top_srcdir)/src/mesa/drivers/dri/common/ \ + -I$(top_builddir)/src/mesa/drivers/dri/common/ \ + -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/mapi/ \ + -DUSE_DRICONF + +libloader_la_SOURCES += \ + $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + +libloader_la_LIBADD += \ + -lm \ + $(EXPAT_LIBS) +endif + if !HAVE_LIBDRM libloader_la_CPPFLAGS += \ -D__NOT_HAVE_DRM_H @@ -36,8 +55,6 @@ else libloader_la_CPPFLAGS += \ $(LIBDRM_CFLAGS) -libloader_la_LIBADD = \ +libloader_la_LIBADD += \ $(LIBDRM_LIBS) endif - -libloader_la_SOURCES = $(LOADER_C_FILES) |