Re: [Mesa-dev] [PATCH 2/2] xa: support for drivers which use NIR

2015-04-04 Thread Thomas Hellstrom 
lgtm.

Could you just add a small comment for future reference in in
xa_tracker.c that the function

_mesa_error_no_memory

is used by NIR?

Thanks,
Thomas




On 04/03/2015 08:07 PM, Rob Clark wrote:
 From: Rob Clark robcl...@freedesktop.org

 We need to pull in libnir.la and it's dependency libglsl_util.la.  Also,
 _mesa_error_no_memory() must be defined.

 Fortunately with libnir.la (vs pulling in all of libglsl.la) we don't
 also need libstdc++.

 Signed-off-by: Rob Clark robcl...@freedesktop.org
 ---
  src/gallium/state_trackers/xa/xa_tracker.c | 7 +++
  src/gallium/targets/xa/Makefile.am | 2 ++
  2 files changed, 9 insertions(+)

 diff --git a/src/gallium/state_trackers/xa/xa_tracker.c 
 b/src/gallium/state_trackers/xa/xa_tracker.c
 index f69ac8e..3f22d64 100644
 --- a/src/gallium/state_trackers/xa/xa_tracker.c
 +++ b/src/gallium/state_trackers/xa/xa_tracker.c
 @@ -535,3 +535,10 @@ xa_surface_format(const struct xa_surface *srf)
  {
  return srf-fdesc.xa_format;
  }
 +
 +void _mesa_error_no_memory(const char *caller);
 +void
 +_mesa_error_no_memory(const char *caller)
 +{
 + debug_printf(Mesa error: out of memory in %s, caller);
 +}
 diff --git a/src/gallium/targets/xa/Makefile.am 
 b/src/gallium/targets/xa/Makefile.am
 index a1eae2a..8ddb967 100644
 --- a/src/gallium/targets/xa/Makefile.am
 +++ b/src/gallium/targets/xa/Makefile.am
 @@ -37,6 +37,8 @@ libxatracker_la_LIBADD = \
   $(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
   $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
   $(top_builddir)/src/gallium/auxiliary/libgallium.la \
 + $(top_builddir)/src/glsl/libnir.la \
 + $(top_builddir)/src/libglsl_util.la \
   $(top_builddir)/src/util/libmesautil.la \
   $(LIBDRM_LIBS) \
   $(GALLIUM_COMMON_LIB_DEPS)

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/2] xa: support for drivers which use NIR

2015-04-03 Thread Rob Clark 
From: Rob Clark robcl...@freedesktop.org

We need to pull in libnir.la and it's dependency libglsl_util.la.  Also,
_mesa_error_no_memory() must be defined.

Fortunately with libnir.la (vs pulling in all of libglsl.la) we don't
also need libstdc++.

Signed-off-by: Rob Clark robcl...@freedesktop.org
---
 src/gallium/state_trackers/xa/xa_tracker.c | 7 +++
 src/gallium/targets/xa/Makefile.am | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/gallium/state_trackers/xa/xa_tracker.c 
b/src/gallium/state_trackers/xa/xa_tracker.c
index f69ac8e..3f22d64 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.c
+++ b/src/gallium/state_trackers/xa/xa_tracker.c
@@ -535,3 +535,10 @@ xa_surface_format(const struct xa_surface *srf)
 {
 return srf-fdesc.xa_format;
 }
+
+void _mesa_error_no_memory(const char *caller);
+void
+_mesa_error_no_memory(const char *caller)
+{
+   debug_printf(Mesa error: out of memory in %s, caller);
+}
diff --git a/src/gallium/targets/xa/Makefile.am 
b/src/gallium/targets/xa/Makefile.am
index a1eae2a..8ddb967 100644
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -37,6 +37,8 @@ libxatracker_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
$(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+   $(top_builddir)/src/glsl/libnir.la \
+   $(top_builddir)/src/libglsl_util.la \
$(top_builddir)/src/util/libmesautil.la \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
-- 
2.1.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev