clover: Unabbreviate a few data accessor names for consistency.

Tested-by: Tom Stellard <[email protected]>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/gallium/state_trackers/clover/api/context.cpp b/src/gallium/state_trackers/clover/api/context.cpp
index a78c00b72a7..021eea36f6e 100644
--- a/src/gallium/state_trackers/clover/api/context.cpp
+++ b/src/gallium/state_trackers/clover/api/context.cpp
@@ -117,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(ctx.devs());
+      buf.as_vector<cl_device_id>() = descs(ctx.devices());
       break;
 
    case CL_CONTEXT_PROPERTIES:
-      buf.as_vector<cl_context_properties>() = desc(ctx.props());
+      buf.as_vector<cl_context_properties>() = desc(ctx.properties());
       break;
 
    default:
diff --git a/src/gallium/state_trackers/clover/api/memory.cpp b/src/gallium/state_trackers/clover/api/memory.cpp
index 84b3bcb4c09..7ed2191f14e 100644
--- a/src/gallium/state_trackers/clover/api/memory.cpp
+++ b/src/gallium/state_trackers/clover/api/memory.cpp
@@ -38,7 +38,7 @@ clCreateBuffer(cl_context d_ctx, cl_mem_flags flags, size_t size,
 
    if (!size ||
        size > fold(maximum(), cl_ulong(0),
-                   map(std::mem_fn(&device::max_mem_alloc_size), ctx.devs())
+                   map(std::mem_fn(&device::max_mem_alloc_size), ctx.devices())
           ))
       throw error(CL_INVALID_BUFFER_SIZE);
 
diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp
index 8867ee97c58..fedc91d531a 100644
--- a/src/gallium/state_trackers/clover/api/program.cpp
+++ b/src/gallium/state_trackers/clover/api/program.cpp
@@ -64,7 +64,7 @@ clCreateProgramWithBinary(cl_context d_ctx, cl_uint n,
       throw error(CL_INVALID_VALUE);
 
    if (any_of([&](const device &dev) {
-            return !count(dev, ctx.devs());
+            return !count(dev, ctx.devices());
          }, devs))
       throw error(CL_INVALID_DEVICE);
 
@@ -133,7 +133,7 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs,
                void *user_data) try {
    auto &prog = obj(d_prog);
    auto devs = (d_devs ? objs(d_devs, num_devs) :
-                ref_vector<device>(prog.context().devs()));
+                ref_vector<device>(prog.context().devices()));
    auto opts = (p_opts ? p_opts : "");
 
    if (bool(num_devs) != bool(d_devs) ||
@@ -141,7 +141,7 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs,
       throw error(CL_INVALID_VALUE);
 
    if (any_of([&](const device &dev) {
-            return !count(dev, prog.context().devs());
+            return !count(dev, prog.context().devices());
          }, devs))
       throw error(CL_INVALID_DEVICE);
 
@@ -175,13 +175,13 @@ clGetProgramInfo(cl_program d_prog, cl_program_info param,
    case CL_PROGRAM_NUM_DEVICES:
       buf.as_scalar<cl_uint>() = (prog.devices().size() ?
                                   prog.devices().size() :
-                                  prog.context().devs().size());
+                                  prog.context().devices().size());
       break;
 
    case CL_PROGRAM_DEVICES:
       buf.as_vector<cl_device_id>() = (prog.devices().size() ?
                                        descs(prog.devices()) :
-                                       descs(prog.context().devs()));
+                                       descs(prog.context().devices()));
       break;
 
    case CL_PROGRAM_SOURCE:
@@ -226,7 +226,7 @@ clGetProgramBuildInfo(cl_program d_prog, cl_device_id d_dev,
    auto &prog = obj(d_prog);
    auto &dev = obj(d_dev);
 
-   if (!count(dev, prog.context().devs()))
+   if (!count(dev, prog.context().devices()))
       return CL_INVALID_DEVICE;
 
    switch (param) {
diff --git a/src/gallium/state_trackers/clover/api/queue.cpp b/src/gallium/state_trackers/clover/api/queue.cpp
index 8498e977b9c..a136018fbde 100644
--- a/src/gallium/state_trackers/clover/api/queue.cpp
+++ b/src/gallium/state_trackers/clover/api/queue.cpp
@@ -32,7 +32,7 @@ clCreateCommandQueue(cl_context d_ctx, cl_device_id d_dev,
    auto &ctx = obj(d_ctx);
    auto &dev = obj(d_dev);
 
-   if (!count(dev, ctx.devs()))
+   if (!count(dev, ctx.devices()))
       throw error(CL_INVALID_DEVICE);
 
    if (props & ~(CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE |
@@ -87,7 +87,7 @@ clGetCommandQueueInfo(cl_command_queue d_q, cl_command_queue_info param,
       break;
 
    case CL_QUEUE_PROPERTIES:
-      buf.as_scalar<cl_command_queue_properties>() = q.props();
+      buf.as_scalar<cl_command_queue_properties>() = q.properties();
       break;
 
    default: