From 7ed360e06b6938699e9b11cddebaa388887a9a20 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 26 May 2017 17:37:20 +0100 Subject: [PATCH] gsdx: Prefix std:: to shared_ptr --- plugins/GSdx/GSCapture.cpp | 2 +- plugins/GSdx/GSRasterizer.cpp | 4 ++-- plugins/GSdx/GSRasterizer.h | 6 +++--- plugins/GSdx/GSRendererCL.cpp | 8 ++++---- plugins/GSdx/GSRendererCL.h | 6 +++--- plugins/GSdx/GSRendererSW.cpp | 4 ++-- plugins/GSdx/GSRendererSW.h | 2 +- plugins/GSdx/PSX/GPURendererSW.cpp | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/GSdx/GSCapture.cpp b/plugins/GSdx/GSCapture.cpp index 26e3db2a24..f51622cb5e 100644 --- a/plugins/GSdx/GSCapture.cpp +++ b/plugins/GSdx/GSCapture.cpp @@ -516,7 +516,7 @@ bool GSCapture::DeliverFrame(const void* bits, int pitch, bool rgba) std::string out_file = m_out_dir + format("/frame.%010d.png", m_frame); //GSPng::Save(GSPng::RGB_PNG, out_file, (uint8*)bits, m_size.x, m_size.y, pitch, m_compression_level); - m_workers[m_frame%m_threads]->Push(shared_ptr(new GSPng::Transaction(GSPng::RGB_PNG, out_file, static_cast(bits), m_size.x, m_size.y, pitch, m_compression_level))); + m_workers[m_frame%m_threads]->Push(std::make_shared(GSPng::RGB_PNG, out_file, static_cast(bits), m_size.x, m_size.y, pitch, m_compression_level)); m_frame++; diff --git a/plugins/GSdx/GSRasterizer.cpp b/plugins/GSdx/GSRasterizer.cpp index 4656d2a202..c547c61488 100644 --- a/plugins/GSdx/GSRasterizer.cpp +++ b/plugins/GSdx/GSRasterizer.cpp @@ -114,7 +114,7 @@ int GSRasterizer::FindMyNextScanline(int top) const return top; } -void GSRasterizer::Queue(const shared_ptr& data) +void GSRasterizer::Queue(const std::shared_ptr& data) { Draw(data.get()); } @@ -1161,7 +1161,7 @@ GSRasterizerList::~GSRasterizerList() _aligned_free(m_scanline); } -void GSRasterizerList::Queue(const shared_ptr& data) +void GSRasterizerList::Queue(const std::shared_ptr& data) { GSVector4i r = data->bbox.rintersect(data->scissor); diff --git a/plugins/GSdx/GSRasterizer.h b/plugins/GSdx/GSRasterizer.h index c3a77f83db..0c38e21847 100644 --- a/plugins/GSdx/GSRasterizer.h +++ b/plugins/GSdx/GSRasterizer.h @@ -115,7 +115,7 @@ class IRasterizer : public GSAlignedClass<32> public: virtual ~IRasterizer() {} - virtual void Queue(const shared_ptr& data) = 0; + virtual void Queue(const std::shared_ptr& data) = 0; virtual void Sync() = 0; virtual bool IsSynced() const = 0; virtual int GetPixels(bool reset = true) = 0; @@ -171,7 +171,7 @@ public: // IRasterizer - void Queue(const shared_ptr& data); + void Queue(const std::shared_ptr& data); void Sync() {} bool IsSynced() const {return true;} int GetPixels(bool reset); @@ -219,7 +219,7 @@ public: // IRasterizer - void Queue(const shared_ptr& data); + void Queue(const std::shared_ptr& data); void Sync(); bool IsSynced() const; int GetPixels(bool reset); diff --git a/plugins/GSdx/GSRendererCL.cpp b/plugins/GSdx/GSRendererCL.cpp index 1b697404f6..14035739db 100644 --- a/plugins/GSdx/GSRendererCL.cpp +++ b/plugins/GSdx/GSRendererCL.cpp @@ -405,7 +405,7 @@ void GSRendererCL::Draw() } } - shared_ptr job(new TFXJob()); + std::shared_ptr job(new TFXJob()); if(!SetupParameter(job.get(), pb, vb, m_vertex.next, m_index.buff, m_index.tail)) { @@ -891,7 +891,7 @@ void GSRendererCL::Enqueue() } } - std::list> jobs(head, next); + std::list> jobs(head, next); JoinTFX(jobs); @@ -945,7 +945,7 @@ void GSRendererCL::Enqueue() m_cl.Map(); } -void GSRendererCL::EnqueueTFX(std::list>& jobs, uint32 bin_count, const cl_uchar4& bin_dim) +void GSRendererCL::EnqueueTFX(std::list>& jobs, uint32 bin_count, const cl_uchar4& bin_dim) { cl_kernel tfx_prev = NULL; @@ -995,7 +995,7 @@ void GSRendererCL::EnqueueTFX(std::list>& jobs, uint32 bin_co } } -void GSRendererCL::JoinTFX(std::list>& jobs) +void GSRendererCL::JoinTFX(std::list>& jobs) { // join tfx kernel calls where the selector and fbp/zbp/bw/fpsm/zpsm are the same and src_pages != prev dst_pages diff --git a/plugins/GSdx/GSRendererCL.h b/plugins/GSdx/GSRendererCL.h index e85d598869..853dc38263 100644 --- a/plugins/GSdx/GSRendererCL.h +++ b/plugins/GSdx/GSRendererCL.h @@ -223,7 +223,7 @@ class GSRendererCL : public GSRenderer }; CL m_cl; - std::list> m_jobs; + std::list> m_jobs; uint32 m_vb_start; uint32 m_vb_count; uint32 m_pb_start; @@ -231,8 +231,8 @@ class GSRendererCL : public GSRenderer bool m_synced; void Enqueue(); - void EnqueueTFX(std::list>& jobs, uint32 bin_count, const cl_uchar4& bin_dim); - void JoinTFX(std::list>& jobs); + void EnqueueTFX(std::list>& jobs, uint32 bin_count, const cl_uchar4& bin_dim); + void JoinTFX(std::list>& jobs); bool UpdateTextureCache(TFXJob* job); void InvalidateTextureCache(TFXJob* job); void UsePages(uint32* pages); diff --git a/plugins/GSdx/GSRendererSW.cpp b/plugins/GSdx/GSRendererSW.cpp index 3ee7bc8b5d..c0aa199ac2 100644 --- a/plugins/GSdx/GSRendererSW.cpp +++ b/plugins/GSdx/GSRendererSW.cpp @@ -378,7 +378,7 @@ void GSRendererSW::Draw() SharedData* sd = new SharedData(this); - shared_ptr data(sd); + std::shared_ptr data(sd); sd->primclass = m_vt.m_primclass; sd->buff = (uint8*)_aligned_malloc(sizeof(GSVertexSW) * ((m_vertex.next + 1) & ~1) + sizeof(uint32) * m_index.tail, 64); @@ -576,7 +576,7 @@ void GSRendererSW::Draw() */ } -void GSRendererSW::Queue(shared_ptr& item) +void GSRendererSW::Queue(std::shared_ptr& item) { SharedData* sd = (SharedData*)item.get(); diff --git a/plugins/GSdx/GSRendererSW.h b/plugins/GSdx/GSRendererSW.h index 771c951074..1c6b758a8b 100644 --- a/plugins/GSdx/GSRendererSW.h +++ b/plugins/GSdx/GSRendererSW.h @@ -87,7 +87,7 @@ protected: GSTexture* GetFeedbackOutput(); void Draw(); - void Queue(shared_ptr& item); + void Queue(std::shared_ptr& item); void Sync(int reason); void InvalidateVideoMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r); void InvalidateLocalMem(const GIFRegBITBLTBUF& BITBLTBUF, const GSVector4i& r, bool clut = false); diff --git a/plugins/GSdx/PSX/GPURendererSW.cpp b/plugins/GSdx/PSX/GPURendererSW.cpp index c0ada2fa58..cf6fb1cedc 100644 --- a/plugins/GSdx/PSX/GPURendererSW.cpp +++ b/plugins/GSdx/PSX/GPURendererSW.cpp @@ -71,7 +71,7 @@ void GPURendererSW::Draw() { GPUDrawScanline::SharedData* sd = new GPUDrawScanline::SharedData(); - shared_ptr data(sd); + std::shared_ptr data(sd); GPUScanlineGlobalData& gd = sd->global;