[Mesa-dev] [PATCH 10/10] pipe-loader: introduce pipe_loader_sw_probe_null helper function

Emil Velikov emil.l.velikov at gmail.com
Thu Feb 13 08:18:20 PST 2014


v2: Handle null_sw_create failure, add missing function return type

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob at vmware.com> (v1)
---
 src/gallium/auxiliary/pipe-loader/pipe_loader.h    | 10 ++++++++++
 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index f80defe..6ab2752 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -132,6 +132,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 abc87a2..ece687b 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -93,6 +93,27 @@ pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, struct drisw_loader_f
    return true;
 }
 
+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();
+   if (!sdev->ws) {
+      FREE(sdev);
+      return false;
+   }
+   *devs = &sdev->base;
+
+   return true;
+}
+
 int
 pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev)
 {
-- 
1.8.5.4



More information about the mesa-dev mailing list