Quoting Rob Clark (2018-11-09 14:27:35) > On Fri, Nov 9, 2018 at 1:41 PM Dylan Baker <dy...@pnwbakers.com> wrote: > > > > as well as os_memory* > > Thanks, I think this will be useful for me to extract freedreno/ir3 > out to src/compiler :-)
Shouldn't that be src/qualcomm? :)
>
> Reviewed-by: Rob Clark <robdcl...@gmail.com>
Thanks!
>
> > ---
> > src/gallium/auxiliary/Makefile.sources | 5 -----
> > src/gallium/auxiliary/meson.build | 5 -----
> > src/gallium/auxiliary/util/u_debug_memory.c | 4 ++--
> > src/gallium/auxiliary/util/u_format.c | 2 +-
> > src/gallium/auxiliary/util/u_format_tests.c | 2 +-
> > src/gallium/auxiliary/util/u_log.c | 2 +-
> > src/gallium/auxiliary/util/u_prim_restart.c | 2 +-
> > src/util/Makefile.sources | 5 +++++
> > src/{gallium/auxiliary/os => util}/os_memory.h | 0
> > src/{gallium/auxiliary/os => util}/os_memory_aligned.h | 0
> > src/{gallium/auxiliary/os => util}/os_memory_debug.h | 0
> > src/{gallium/auxiliary/os => util}/os_memory_stdc.h | 0
> > src/{gallium/auxiliary => }/util/u_memory.h | 3 +--
> > 13 files changed, 12 insertions(+), 18 deletions(-)
> > rename src/{gallium/auxiliary/os => util}/os_memory.h (100%)
> > rename src/{gallium/auxiliary/os => util}/os_memory_aligned.h (100%)
> > rename src/{gallium/auxiliary/os => util}/os_memory_debug.h (100%)
> > rename src/{gallium/auxiliary/os => util}/os_memory_stdc.h (100%)
> > rename src/{gallium/auxiliary => }/util/u_memory.h (98%)
> >
> > diff --git a/src/gallium/auxiliary/Makefile.sources
> > b/src/gallium/auxiliary/Makefile.sources
> > index b60b25a0e4c..87a490e555d 100644
> > --- a/src/gallium/auxiliary/Makefile.sources
> > +++ b/src/gallium/auxiliary/Makefile.sources
> > @@ -102,10 +102,6 @@ C_SOURCES := \
> > indices/u_indices_priv.h \
> > indices/u_primconvert.c \
> > indices/u_primconvert.h \
> > - os/os_memory_aligned.h \
> > - os/os_memory_debug.h \
> > - os/os_memory_stdc.h \
> > - os/os_memory.h \
> > os/os_mman.h \
> > os/os_process.c \
> > os/os_process.h \
> > @@ -290,7 +286,6 @@ C_SOURCES := \
> > util/u_linear.h \
> > util/u_log.c \
> > util/u_log.h \
> > - util/u_memory.h \
> > util/u_mm.c \
> > util/u_mm.h \
> > util/u_network.c \
> > diff --git a/src/gallium/auxiliary/meson.build
> > b/src/gallium/auxiliary/meson.build
> > index e1497992b17..a4dbcf7b4ca 100644
> > --- a/src/gallium/auxiliary/meson.build
> > +++ b/src/gallium/auxiliary/meson.build
> > @@ -122,10 +122,6 @@ files_libgallium = files(
> > 'indices/u_indices_priv.h',
> > 'indices/u_primconvert.c',
> > 'indices/u_primconvert.h',
> > - 'os/os_memory_aligned.h',
> > - 'os/os_memory_debug.h',
> > - 'os/os_memory_stdc.h',
> > - 'os/os_memory.h',
> > 'os/os_mman.h',
> > 'os/os_process.c',
> > 'os/os_process.h',
> > @@ -310,7 +306,6 @@ files_libgallium = files(
> > 'util/u_linear.h',
> > 'util/u_log.c',
> > 'util/u_log.h',
> > - 'util/u_memory.h',
> > 'util/u_mm.c',
> > 'util/u_mm.h',
> > 'util/u_network.c',
> > diff --git a/src/gallium/auxiliary/util/u_debug_memory.c
> > b/src/gallium/auxiliary/util/u_debug_memory.c
> > index 0c822369a00..42e29dd6b2a 100644
> > --- a/src/gallium/auxiliary/util/u_debug_memory.c
> > +++ b/src/gallium/auxiliary/util/u_debug_memory.c
> > @@ -36,14 +36,14 @@
> >
> > #define DEBUG_MEMORY_IMPLEMENTATION
> >
> > -#include "os/os_memory.h"
> > -#include "os/os_memory_debug.h"
> > #include "os/os_thread.h"
> >
> > #include "util/u_debug.h"
> > #include "util/u_debug_gallium.h"
> > #include "util/u_debug_stack.h"
> > #include "util/list.h"
> > +#include "util/os_memory.h"
> > +#include "util/os_memory_debug.h"
> >
> >
> > #define DEBUG_MEMORY_MAGIC 0x6e34090aU
> > diff --git a/src/gallium/auxiliary/util/u_format.c
> > b/src/gallium/auxiliary/util/u_format.c
> > index 6445f2647cf..e43a619313e 100644
> > --- a/src/gallium/auxiliary/util/u_format.c
> > +++ b/src/gallium/auxiliary/util/u_format.c
> > @@ -32,7 +32,7 @@
> > * @author Jose Fonseca <jfons...@vmware.com>
> > */
> >
> > -#include "u_memory.h"
> > +#include "util/u_memory.h"
> > #include "u_format.h"
> > #include "u_format_s3tc.h"
> > #include "u_surface.h"
> > diff --git a/src/gallium/auxiliary/util/u_format_tests.c
> > b/src/gallium/auxiliary/util/u_format_tests.c
> > index dee52533c15..94bea2363d0 100644
> > --- a/src/gallium/auxiliary/util/u_format_tests.c
> > +++ b/src/gallium/auxiliary/util/u_format_tests.c
> > @@ -30,7 +30,7 @@
> > #include <float.h>
> >
> > #include "pipe/p_config.h"
> > -#include "u_memory.h"
> > +#include "util/u_memory.h"
> > #include "u_format_tests.h"
> >
> >
> > diff --git a/src/gallium/auxiliary/util/u_log.c
> > b/src/gallium/auxiliary/util/u_log.c
> > index dacbe0505e1..90fd24ca394 100644
> > --- a/src/gallium/auxiliary/util/u_log.c
> > +++ b/src/gallium/auxiliary/util/u_log.c
> > @@ -23,7 +23,7 @@
> >
> > #include "u_log.h"
> >
> > -#include "u_memory.h"
> > +#include "util/u_memory.h"
> > #include "util/u_string.h"
> >
> > struct page_entry {
> > diff --git a/src/gallium/auxiliary/util/u_prim_restart.c
> > b/src/gallium/auxiliary/util/u_prim_restart.c
> > index 9ff93a7f669..10e39e240db 100644
> > --- a/src/gallium/auxiliary/util/u_prim_restart.c
> > +++ b/src/gallium/auxiliary/util/u_prim_restart.c
> > @@ -26,7 +26,7 @@
> >
> >
> > #include "u_inlines.h"
> > -#include "u_memory.h"
> > +#include "util/u_memory.h"
> > #include "u_prim_restart.h"
> >
> >
> > diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
> > index b4d23947ab7..f09b89b3be5 100644
> > --- a/src/util/Makefile.sources
> > +++ b/src/util/Makefile.sources
> > @@ -72,6 +72,11 @@ MESA_UTIL_FILES := \
> > u_debug.h \
> > u_cpu_detect.c \
> > u_cpu_detect.h \
> > + os_memory_aligned.h \
> > + os_memory_debug.h \
> > + os_memory_stdc.h \
> > + os_memory.h \
> > + u_memory.h \
> > vma.c \
> > vma.h
> >
> > diff --git a/src/gallium/auxiliary/os/os_memory.h b/src/util/os_memory.h
> > similarity index 100%
> > rename from src/gallium/auxiliary/os/os_memory.h
> > rename to src/util/os_memory.h
> > diff --git a/src/gallium/auxiliary/os/os_memory_aligned.h
> > b/src/util/os_memory_aligned.h
> > similarity index 100%
> > rename from src/gallium/auxiliary/os/os_memory_aligned.h
> > rename to src/util/os_memory_aligned.h
> > diff --git a/src/gallium/auxiliary/os/os_memory_debug.h
> > b/src/util/os_memory_debug.h
> > similarity index 100%
> > rename from src/gallium/auxiliary/os/os_memory_debug.h
> > rename to src/util/os_memory_debug.h
> > diff --git a/src/gallium/auxiliary/os/os_memory_stdc.h
> > b/src/util/os_memory_stdc.h
> > similarity index 100%
> > rename from src/gallium/auxiliary/os/os_memory_stdc.h
> > rename to src/util/os_memory_stdc.h
> > diff --git a/src/gallium/auxiliary/util/u_memory.h b/src/util/u_memory.h
> > similarity index 98%
> > rename from src/gallium/auxiliary/util/u_memory.h
> > rename to src/util/u_memory.h
> > index 66c3ba4e410..dc22ab0fd1a 100644
> > --- a/src/gallium/auxiliary/util/u_memory.h
> > +++ b/src/util/u_memory.h
> > @@ -34,10 +34,9 @@
> > #ifndef U_MEMORY_H
> > #define U_MEMORY_H
> >
> > -
> > #include "util/u_pointer.h"
> > #include "util/u_debug.h"
> > -#include "os/os_memory.h"
> > +#include "util/os_memory.h"
> >
> >
> > #ifdef __cplusplus
> > --
> > 2.19.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
