On 13/02/14 12:49, Francisco Jerez wrote:
Emil Velikov <emil.l.veli...@gmail.com> writes:

Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
  src/gallium/auxiliary/pipe-loader/pipe_loader.h    | 10 ++++++++++
  src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 18 +++++++++++++++++-
  2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h 
b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index f5a7252..026f809 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -133,6 +133,16 @@ pipe_loader_sw_probe_dri(struct pipe_loader_device **devs,


  /**
+ * Initialize a null sw device.
+ *
+ * This function is platform-specific.
+ *
+ * \sa pipe_loader_probe
+ */
+bool
+pipe_loader_sw_probe_null(struct pipe_loader_device **devs);
+
+/**
   * Get a list of known software devices.
   *
   * This function is platform-specific.
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c 
b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
index 954e16e..618a911 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -85,7 +85,23 @@ pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, 
struct drisw_loader_f
     return true;
  }

-int
+bool
+pipe_loader_sw_probe_null(struct pipe_loader_device **devs)
+{
+   struct pipe_loader_sw_device *sdev = CALLOC_STRUCT(pipe_loader_sw_device);
+
+   if (!sdev)
+      return false;
+
+   sdev->base.type = PIPE_LOADER_DEVICE_SOFTWARE;
+   sdev->base.driver_name = "swrast";
+   sdev->base.ops = &pipe_loader_sw_ops;
+   sdev->ws = null_sw_create();
+   *devs = &sdev->base;
+
+   return true;
+}
+

Missing return type here.

Too much git rebase... :\

  pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev)
  {
     int i;

Maybe remove pipe_loader_sw_probe() altogether and change pipe_loader.c
to use pipe_loader_sw_probe_null() instead?

Mind if we keep that as a follow up. Last time I've checked the pipe-loader was used by clover and I've no idea how deep those waters are.

Thanks for the review and comments.

-Emil

P.S. Thunderbird does not like when I reply to your signed email :\ More on that at 11.

--
1.8.5.4

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

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

Reply via email to