[Mesa-dev] [PATCH 02/24] ac/radeonsi: move amdgpu_addr_create to ac_surface

[Emil Velikov]

On 14 May 2017 at 22:46, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> ---
>  src/amd/Makefile.common.am                     |   2 +
>  src/amd/Makefile.sources                       |   4 +
>  src/amd/common/ac_surface.c                    | 198 +++++++++++++++++++++++++
>  src/amd/common/ac_surface.h                    |  10 ++
>  src/gallium/winsys/amdgpu/drm/amdgpu_surface.c |  74 ---------
>  src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c  |  85 +----------
>  src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h  |   3 -
>  7 files changed, 215 insertions(+), 161 deletions(-)
>  create mode 100644 src/amd/common/ac_surface.c
>
> diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
> index 83f148b..21d56f1 100644
> --- a/src/amd/Makefile.common.am
> +++ b/src/amd/Makefile.common.am
> @@ -18,20 +18,21 @@
>  # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>  # IN THE SOFTWARE.
>
>  if HAVE_GALLIUM_LLVM
>
>  COMMON_LIBS = common/libamd_common.la
>
>  # TODO cleanup these
>  common_libamd_common_la_CPPFLAGS = \
> +       $(AMDGPU_CFLAGS) \
>         $(VALGRIND_CFLAGS) \
>         $(DEFINES) \
>         -I$(top_srcdir)/include \
>         -I$(top_builddir)/src \
>         -I$(top_srcdir)/src \
>         -I$(top_builddir)/src/amd/common \
>         -I$(top_srcdir)/src/amd/common \
>         -I$(top_builddir)/src/compiler \
>         -I$(top_builddir)/src/compiler/nir \
>         -I$(top_srcdir)/src/compiler \
> @@ -48,20 +49,21 @@ common_libamd_common_la_CFLAGS = \
>         $(LIBELF_CFLAGS)
>
>  common_libamd_common_la_CXXFLAGS = \
>         $(VISIBILITY_CXXFLAGS) \
>         $(LLVM_CXXFLAGS)
>
>  noinst_LTLIBRARIES += $(COMMON_LIBS)
>
>  common_libamd_common_la_SOURCES = \
>         $(AMD_COMPILER_FILES) \
> +       $(AMD_SURFACE_FILES) \
Please add this line to the LOCAL_SRC_FILES in src/amd/Android.common.mk

Mauro, Rob you guys test if that will be enough, or we'll need something extra?

-Emil