diff options
| author | Eric Anholt <eric@anholt.net> | 2014-09-22 12:24:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-09-23 13:40:10 -0700 |
| commit | 517e01b5c3db9ba750698096e823134b288e213f (patch) | |
| tree | c45b171316ae6d599b6b19d4c3a5cc7960334491 /src/gallium/targets | |
| parent | 5e1fcc625824ae962d5f658e151e6bc2665adce8 (diff) | |
mesa: Move register_allocate.c to util.
The r300 gallium driver is using it outside of the Mesa tree, and I wanted
to do so for vc4 as well. Rather than make the multiple-definitions
problem even more complicated, just move it to more-shared code.
v2: Don't forget to delete the symlink in r300 (review by Matt).
Delete more r300-helper references (review by Emil)
Don't prefix util/ header inclusion with "util/" (review by Emil)
Reviewed-by: Matt Turner <mattst88@gmail.com> (v1)
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v1)
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 84f33381a0b..a428be5ba83 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -196,11 +196,6 @@ egl_gallium_la_CPPFLAGS += -DGALLIUM_R300 egl_gallium_la_LIBADD += \ $(top_builddir)/src/gallium/drivers/r300/libr300.la \ $(RADEON_LIBS) - -if !HAVE_OPENGL -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la -endif endif if HAVE_GALLIUM_R600 diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index a5f70704c67..31a8b47c1e4 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -94,7 +94,6 @@ if HAVE_GALLIUM_R300 STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300 STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ $(RADEON_LIBS) endif diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index ee930781480..5f1330ab656 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -97,7 +97,6 @@ nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp pipe_r300_la_LIBADD = \ $(PIPE_LIBS) \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ $(top_builddir)/src/gallium/drivers/r300/libr300.la \ $(LIBDRM_LIBS) \ $(RADEON_LIBS) |