clover: Switch command queues to the new model.

[mesa.git] / src / gallium / state_trackers / clover / core / queue.hpp

diff --git a/src/gallium/state_trackers/clover/core/queue.hpp b/src/gallium/state_trackers/clover/core/queue.hpp
index a02de95cf8f079b644df6f712ada657498124f66..4a2d02251b1425e8612316c1396d3d65600fc449 100644 (file)
--- a/src/gallium/state_trackers/clover/core/queue.hpp
+++ b/src/gallium/state_trackers/clover/core/queue.hpp
@@ -29,46 +29,45 @@
 #include "pipe/p_context.h"
 
 namespace clover {
-   typedef struct _cl_command_queue command_queue;
    class resource;
    class mapping;
    class hard_event;
-}
 
-struct _cl_command_queue : public clover::ref_counter {
-public:
-   _cl_command_queue(clover::context &ctx, clover::device &dev,
-                     cl_command_queue_properties props);
-   _cl_command_queue(const _cl_command_queue &q) = delete;
-   ~_cl_command_queue();
+   class command_queue : public ref_counter, public _cl_command_queue {
+   public:
+      command_queue(context &ctx, device &dev,
+                    cl_command_queue_properties props);
+      command_queue(const command_queue &q) = delete;
+      ~command_queue();
 
-   void flush();
+      void flush();
 
-   cl_command_queue_properties props() const;
-   bool profiling_enabled() const;
+      cl_command_queue_properties props() const;
+      bool profiling_enabled() const;
 
-   clover::context &ctx;
-   clover::device &dev;
+      context &ctx;
+      device &dev;
 
-   friend class clover::resource;
-   friend class clover::root_resource;
-   friend class clover::mapping;
-   friend class clover::hard_event;
-   friend struct _cl_sampler;
-   friend struct _cl_kernel;
-   friend class clover::timestamp::query;
-   friend class clover::timestamp::current;
+      friend class resource;
+      friend class root_resource;
+      friend class mapping;
+      friend class hard_event;
+      friend struct ::_cl_sampler;
+      friend struct ::_cl_kernel;
+      friend class clover::timestamp::query;
+      friend class clover::timestamp::current;
 
-private:
-   /// Serialize a hardware event with respect to the previous ones,
-   /// and push it to the pending list.
-   void sequence(clover::hard_event *ev);
+   private:
+      /// Serialize a hardware event with respect to the previous ones,
+      /// and push it to the pending list.
+      void sequence(hard_event *ev);
 
-   cl_command_queue_properties _props;
-   pipe_context *pipe;
+      cl_command_queue_properties _props;
+      pipe_context *pipe;
 
-   typedef clover::ref_ptr<clover::hard_event> event_ptr;
-   std::vector<event_ptr> queued_events;
-};
+      typedef ref_ptr<hard_event> event_ptr;
+      std::vector<event_ptr> queued_events;
+   };
+}
 
 #endif