st/nine: Add debug warning when application uses sw processing

[mesa.git] / src / gallium / state_trackers / clover / api / context.cpp

diff --git a/src/gallium/state_trackers/clover/api/context.cpp b/src/gallium/state_trackers/clover/api/context.cpp
index ca05efc2d954b42b290dea0c036ea88d87ad15f4..021eea36f6edc3f61ff31042307b68c418666c21 100644 (file)
--- a/src/gallium/state_trackers/clover/api/context.cpp
+++ b/src/gallium/state_trackers/clover/api/context.cpp
@@ -22,35 +22,38 @@
 
 #include "api/util.hpp"
 #include "core/context.hpp"
+#include "core/platform.hpp"
 
 using namespace clover;
 
-PUBLIC cl_context
+CLOVER_API cl_context
 clCreateContext(const cl_context_properties *d_props, cl_uint num_devs,
                 const cl_device_id *d_devs,
                 void (CL_CALLBACK *pfn_notify)(const char *, const void *,
                                                size_t, void *),
                 void *user_data, cl_int *r_errcode) try {
-   auto props = property_map(d_props);
+   auto props = obj<property_list_tag>(d_props);
    auto devs = objs(d_devs, num_devs);
 
    if (!pfn_notify && user_data)
       throw error(CL_INVALID_VALUE);
 
-   for (auto prop : props) {
-      if (prop.first != CL_CONTEXT_PLATFORM)
+   for (auto &prop : props) {
+      if (prop.first == CL_CONTEXT_PLATFORM)
+         obj(prop.second.as<cl_platform_id>());
+      else
          throw error(CL_INVALID_PROPERTY);
    }
 
    ret_error(r_errcode, CL_SUCCESS);
-   return desc(new context(property_vector(props), devs));
+   return desc(new context(props, devs));
 
 } catch (error &e) {
    ret_error(r_errcode, e);
    return NULL;
 }
 
-PUBLIC cl_context
+CLOVER_API cl_context
 clCreateContextFromType(const cl_context_properties *d_props,
                         cl_device_type type,
                         void (CL_CALLBACK *pfn_notify)(
@@ -58,25 +61,31 @@ clCreateContextFromType(const cl_context_properties *d_props,
                         void *user_data, cl_int *r_errcode) try {
    cl_platform_id d_platform;
    cl_uint num_platforms;
-   cl_device_id d_dev;
    cl_int ret;
+   std::vector<cl_device_id> devs;
+   cl_uint num_devices;
 
    ret = clGetPlatformIDs(1, &d_platform, &num_platforms);
    if (ret || !num_platforms)
       throw error(CL_INVALID_PLATFORM);
 
-   ret = clGetDeviceIDs(d_platform, type, 1, &d_dev, 0);
+   ret = clGetDeviceIDs(d_platform, type, 0, NULL, &num_devices);
+   if (ret)
+      throw error(CL_DEVICE_NOT_FOUND);
+   devs.resize(num_devices);
+   ret = clGetDeviceIDs(d_platform, type, num_devices, devs.data(), 0);
    if (ret)
       throw error(CL_DEVICE_NOT_FOUND);
 
-   return clCreateContext(d_props, 1, &d_dev, pfn_notify, user_data, r_errcode);
+   return clCreateContext(d_props, num_devices, devs.data(), pfn_notify,
+                          user_data, r_errcode);
 
 } catch (error &e) {
    ret_error(r_errcode, e);
    return NULL;
 }
 
-PUBLIC cl_int
+CLOVER_API cl_int
 clRetainContext(cl_context d_ctx) try {
    obj(d_ctx).retain();
    return CL_SUCCESS;
@@ -85,7 +94,7 @@ clRetainContext(cl_context d_ctx) try {
    return e.get();
 }
 
-PUBLIC cl_int
+CLOVER_API cl_int
 clReleaseContext(cl_context d_ctx) try {
    if (obj(d_ctx).release())
       delete pobj(d_ctx);
@@ -96,7 +105,7 @@ clReleaseContext(cl_context d_ctx) try {
    return e.get();
 }
 
-PUBLIC cl_int
+CLOVER_API cl_int
 clGetContextInfo(cl_context d_ctx, cl_context_info param,
                  size_t size, void *r_buf, size_t *r_size) try {
    property_buffer buf { r_buf, size, r_size };
@@ -108,15 +117,15 @@ clGetContextInfo(cl_context d_ctx, cl_context_info param,
       break;
 
    case CL_CONTEXT_NUM_DEVICES:
-      buf.as_scalar<cl_uint>() = ctx.devs.size();
+      buf.as_scalar<cl_uint>() = ctx.devices().size();
       break;
 
    case CL_CONTEXT_DEVICES:
-      buf.as_vector<cl_device_id>() = descs(map(derefs(), ctx.devs));
+      buf.as_vector<cl_device_id>() = descs(ctx.devices());
       break;
 
    case CL_CONTEXT_PROPERTIES:
-      buf.as_vector<cl_context_properties>() = ctx.props();
+      buf.as_vector<cl_context_properties>() = desc(ctx.properties());
       break;
 
    default: