diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-21 12:38:30 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-26 14:05:13 +0100 |
| commit | 11bce6a94e93562a5076d65bc96db36bab599459 (patch) | |
| tree | 88ddfb84ad503fc3930dbbce11eddb6138d91e99 /src/gallium/targets/omx | |
| parent | d23497c256539d4a49120cfeeb043c9f2ef8e09b (diff) | |
| download | external_mesa3d-11bce6a94e93562a5076d65bc96db36bab599459.zip external_mesa3d-11bce6a94e93562a5076d65bc96db36bab599459.tar.gz external_mesa3d-11bce6a94e93562a5076d65bc96db36bab599459.tar.bz2 | |
targets/radeonsi/omx: convert to static/shared pipe-drivers
The radeonsi counterpart of previous commit - now libomx-radeonsi is
built into the libomx-mesa library. Providing a single library per API.
v2: Include the radeon winsys only when there is a user for it.
v3: Correcly include the winsys. Now with extra brown bag :\
Note: Make sure to rebuild the .omxregister file, by executing
$ omxregister-bellagio
This patch concludes the unification. Now libomx-mesa will be used
for all hardware - r600, radeonsi and nouveau.
Cc: Leo Liu <leo.liu@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'src/gallium/targets/omx')
| -rw-r--r-- | src/gallium/targets/omx/Makefile.am | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 736ee0e..ac43c80 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -47,6 +47,11 @@ endif if HAVE_GALLIUM_R600 STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +else +if HAVE_GALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +endif endif if HAVE_GALLIUM_RADEON_COMMON @@ -61,6 +66,13 @@ STATIC_TARGET_LIB_DEPS += \ $(RADEON_LIBS) endif +if HAVE_GALLIUM_RADEONSI +STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) +endif + libomx_mesa_la_SOURCES += target.c libomx_mesa_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) |