From 9b2fe7cf96dc25f52ae43c8dfda20ee354c329f2 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 18 Feb 2014 13:12:52 +0100 Subject: [PATCH] clover: Unabbreviate a few data accessor names for consistency. Tested-by: Tom Stellard --- src/gallium/state_trackers/clover/api/context.cpp | 6 +++--- src/gallium/state_trackers/clover/api/memory.cpp | 2 +- src/gallium/state_trackers/clover/api/program.cpp | 12 ++++++------ src/gallium/state_trackers/clover/api/queue.cpp | 4 ++-- src/gallium/state_trackers/clover/core/context.cpp | 10 +++++----- src/gallium/state_trackers/clover/core/context.hpp | 8 ++++---- src/gallium/state_trackers/clover/core/format.cpp | 2 +- src/gallium/state_trackers/clover/core/queue.cpp | 8 ++++---- src/gallium/state_trackers/clover/core/queue.hpp | 4 ++-- 9 files changed, 28 insertions(+), 28 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() = ctx.devs().size(); + buf.as_scalar() = ctx.devices().size(); break; case CL_CONTEXT_DEVICES: - buf.as_vector() = descs(ctx.devs()); + buf.as_vector() = descs(ctx.devices()); break; case CL_CONTEXT_PROPERTIES: - buf.as_vector() = desc(ctx.props()); + buf.as_vector() = 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(prog.context().devs())); + ref_vector(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() = (prog.devices().size() ? prog.devices().size() : - prog.context().devs().size()); + prog.context().devices().size()); break; case CL_PROGRAM_DEVICES: buf.as_vector() = (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() = q.props(); + buf.as_scalar() = q.properties(); break; default: diff --git a/src/gallium/state_trackers/clover/core/context.cpp b/src/gallium/state_trackers/clover/core/context.cpp index 34ffd9f29ef..bf4df39dc2a 100644 --- a/src/gallium/state_trackers/clover/core/context.cpp +++ b/src/gallium/state_trackers/clover/core/context.cpp @@ -26,7 +26,7 @@ using namespace clover; context::context(const property_list &props, const ref_vector &devs) : - _props(props), _devs(devs) { + props(props), devs(devs) { } bool @@ -40,11 +40,11 @@ context::operator!=(const context &ctx) const { } const context::property_list & -context::props() const { - return _props; +context::properties() const { + return props; } context::device_range -context::devs() const { - return map(evals(), _devs); +context::devices() const { + return map(evals(), devs); } diff --git a/src/gallium/state_trackers/clover/core/context.hpp b/src/gallium/state_trackers/clover/core/context.hpp index ef14f1578d5..0ec4ff4a231 100644 --- a/src/gallium/state_trackers/clover/core/context.hpp +++ b/src/gallium/state_trackers/clover/core/context.hpp @@ -48,14 +48,14 @@ namespace clover { operator!=(const context &ctx) const; const property_list & - props() const; + properties() const; device_range - devs() const; + devices() const; private: - property_list _props; - const std::vector> _devs; + property_list props; + const std::vector> devs; }; } diff --git a/src/gallium/state_trackers/clover/core/format.cpp b/src/gallium/state_trackers/clover/core/format.cpp index 79582306a60..aee1cc9c79d 100644 --- a/src/gallium/state_trackers/clover/core/format.cpp +++ b/src/gallium/state_trackers/clover/core/format.cpp @@ -155,7 +155,7 @@ namespace clover { if (all_of([=](const device &dev) { return dev.pipe->is_format_supported( dev.pipe, f.second, target, 1, bindings); - }, ctx.devs())) + }, ctx.devices())) s.insert(f.first); } diff --git a/src/gallium/state_trackers/clover/core/queue.cpp b/src/gallium/state_trackers/clover/core/queue.cpp index 246d927a931..24f9326662d 100644 --- a/src/gallium/state_trackers/clover/core/queue.cpp +++ b/src/gallium/state_trackers/clover/core/queue.cpp @@ -29,7 +29,7 @@ using namespace clover; command_queue::command_queue(clover::context &ctx, clover::device &dev, cl_command_queue_properties props) : - context(ctx), device(dev), _props(props) { + context(ctx), device(dev), props(props) { pipe = dev.pipe->context_create(dev.pipe, NULL); if (!pipe) throw error(CL_INVALID_DEVICE); @@ -58,13 +58,13 @@ command_queue::flush() { } cl_command_queue_properties -command_queue::props() const { - return _props; +command_queue::properties() const { + return props; } bool command_queue::profiling_enabled() const { - return _props & CL_QUEUE_PROFILING_ENABLE; + return props & CL_QUEUE_PROFILING_ENABLE; } void diff --git a/src/gallium/state_trackers/clover/core/queue.hpp b/src/gallium/state_trackers/clover/core/queue.hpp index 19cb8910976..b7166e685b7 100644 --- a/src/gallium/state_trackers/clover/core/queue.hpp +++ b/src/gallium/state_trackers/clover/core/queue.hpp @@ -47,7 +47,7 @@ namespace clover { void flush(); - cl_command_queue_properties props() const; + cl_command_queue_properties properties() const; bool profiling_enabled() const; const intrusive_ref context; @@ -67,7 +67,7 @@ namespace clover { /// and push it to the pending list. void sequence(hard_event &ev); - cl_command_queue_properties _props; + cl_command_queue_properties props; pipe_context *pipe; std::deque> queued_events; }; -- 2.30.2