archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename some methods.

Browse source
This commit is contained in:
Vincent Lejeune 2015-10-09 22:48:54 +02:00
parent bf474f0cdb
commit 28cdfa9feb
9 changed files with 33 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View file

@ -287,7 +287,7 @@ D3D12GSRender::~D3D12GSRender()
ReleaseD2DStructures(); ReleaseD2DStructures();
} }
void D3D12GSRender::OnExitThread() void D3D12GSRender::onexit_thread()
{ {
} }
@ -295,10 +295,9 @@ void D3D12GSRender::OnReset()
{ {
} }
void D3D12GSRender::Clear(u32 cmd) void D3D12GSRender::clear_surface(u32 arg)
{ {
std::chrono::time_point<std::chrono::system_clock> startDuration = std::chrono::system_clock::now(); std::chrono::time_point<std::chrono::system_clock> startDuration = std::chrono::system_clock::now();
assert(cmd == NV4097_CLEAR_SURFACE);
std::chrono::time_point<std::chrono::system_clock> rttDurationStart = std::chrono::system_clock::now(); std::chrono::time_point<std::chrono::system_clock> rttDurationStart = std::chrono::system_clock::now();
PrepareRenderTargets(getCurrentResourceStorage().m_commandList.Get()); PrepareRenderTargets(getCurrentResourceStorage().m_commandList.Get());
@ -379,7 +378,7 @@ void D3D12GSRender::Clear(u32 cmd)
} }
} }
void D3D12GSRender::Draw() void D3D12GSRender::end()
{ {
std::chrono::time_point<std::chrono::system_clock> startDuration = std::chrono::system_clock::now(); std::chrono::time_point<std::chrono::system_clock> startDuration = std::chrono::system_clock::now();
@ -631,7 +630,7 @@ isFlipSurfaceInLocalMemory(u32 surfaceColorTarget)
} }
} }
void D3D12GSRender::Flip() void D3D12GSRender::flip(int buffer)
{ {
ID3D12Resource *resourceToFlip; ID3D12Resource *resourceToFlip;
float viewport_w, viewport_h; float viewport_w, viewport_h;

8
rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
View file

@ -510,11 +510,11 @@ private:
void renderOverlay(); void renderOverlay();
protected: protected:
virtual void OnExitThread() override; virtual void onexit_thread() override;
virtual void OnReset() override; virtual void OnReset() override;
virtual void Clear(u32 cmd) override; virtual void clear_surface(u32 arg) override;
virtual void Draw() override; virtual void end() override;
virtual void Flip() override; virtual void flip(int buffer) override;
}; };
#endif #endif

10
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View file

@ -1382,7 +1382,7 @@ void GLGSRender::oninit_thread()
} }
void GLGSRender::OnExitThread() void GLGSRender::onexit_thread()
{ {
glDeleteTextures(1, &g_flip_tex); glDeleteTextures(1, &g_flip_tex);
glDeleteTextures(1, &g_depth_tex); glDeleteTextures(1, &g_depth_tex);
@ -1574,10 +1574,8 @@ void GLGSRender::InitDrawBuffers()
} }
} }
void GLGSRender::Clear(u32 cmd) void GLGSRender::clear_surface(u32 arg)
{ {
assert(cmd == NV4097_CLEAR_SURFACE);
InitDrawBuffers(); InitDrawBuffers();
if (m_set_color_mask) if (m_set_color_mask)
@ -1628,7 +1626,7 @@ void GLGSRender::Clear(u32 cmd)
WriteBuffers(); WriteBuffers();
} }
void GLGSRender::Draw() void GLGSRender::end()
{ {
//return; //return;
if (!LoadProgram()) if (!LoadProgram())
@ -1987,7 +1985,7 @@ void GLGSRender::Draw()
WriteBuffers(); WriteBuffers();
} }
void GLGSRender::Flip() void GLGSRender::flip(int buffer)
{ {
// Set scissor to FBO size // Set scissor to FBO size
if (m_set_scissor_horizontal && m_set_scissor_vertical) if (m_set_scissor_horizontal && m_set_scissor_vertical)

8
rpcs3/Emu/RSX/GL/GLGSRender.h
View file

@ -166,11 +166,11 @@ private:
protected: protected:
virtual void oninit() override; virtual void oninit() override;
virtual void oninit_thread() override; virtual void oninit_thread() override;
virtual void OnExitThread() override; virtual void onexit_thread() override;
virtual void OnReset() override; virtual void OnReset() override;
virtual void Clear(u32 cmd) override; virtual void clear_surface(u32 arg) override;
virtual void Draw() override; virtual void end() override;
virtual void Flip() override; virtual void flip(int buffer) override;
virtual void semaphorePGRAPHTextureReadRelease(u32 offset, u32 value) override; virtual void semaphorePGRAPHTextureReadRelease(u32 offset, u32 value) override;
virtual void semaphorePGRAPHBackendRelease(u32 offset, u32 value) override; virtual void semaphorePGRAPHBackendRelease(u32 offset, u32 value) override;

2
rpcs3/Emu/RSX/GSRender.cpp
View file

@ -54,7 +54,7 @@ void GSRender::close()
} }
} }
void GSRender::Flip() void GSRender::flip(int buffer)
{ {
if (m_frame) if (m_frame)
m_frame->flip(m_context); m_frame->flip(m_context);

2
rpcs3/Emu/RSX/GSRender.h
View file

@ -51,7 +51,7 @@ public:
void oninit_thread() override; void oninit_thread() override;
void close(); void close();
void Flip() override; void flip(int buffer) override;
}; };
enum GSLockType enum GSLockType

8
rpcs3/Emu/RSX/Null/NullGSRender.h
View file

@ -22,7 +22,7 @@ private:
{ {
} }
virtual void OnExitThread() override virtual void onexit_thread() override
{ {
} }
@ -30,15 +30,15 @@ private:
{ {
} }
virtual void Clear(u32 cmd) override virtual void clear_surface(u32 arg) override
{ {
} }
virtual void Draw() override virtual void end() override
{ {
} }
virtual void Flip() override virtual void flip(int buffer) override
{ {
} }

12
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -286,7 +286,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
// NV4097 // NV4097
case 0x0003fead: case 0x0003fead:
{ {
Flip(); flip(0);
last_flip_time = get_system_time(); last_flip_time = get_system_time();
gcm_current_buffer = ARGS(0); gcm_current_buffer = ARGS(0);
@ -920,7 +920,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
if (a0 & 0x80) m_clear_surface_color_a = m_clear_color_a; if (a0 & 0x80) m_clear_surface_color_a = m_clear_color_a;
m_clear_surface_mask = a0; m_clear_surface_mask = a0;
Clear(NV4097_CLEAR_SURFACE); clear_surface(a0);
break; break;
} }
@ -1090,7 +1090,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
if (a0) if (a0)
{ {
Begin(a0); begin(a0);
} }
else else
{ {
@ -2503,7 +2503,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
} }
} }
void RSXThread::Begin(u32 drawMode) void RSXThread::begin(u32 drawMode)
{ {
m_begin_end = 1; m_begin_end = 1;
draw_mode = drawMode; draw_mode = drawMode;
@ -2513,7 +2513,7 @@ void RSXThread::Begin(u32 drawMode)
void RSXThread::End() void RSXThread::End()
{ {
Draw(); end();
for (auto &vdata : m_vertex_data) for (auto &vdata : m_vertex_data)
{ {
@ -2639,7 +2639,7 @@ void RSXThread::Task()
m_ctrl->get += (count + 1) * 4; m_ctrl->get += (count + 1) * 4;
} }
OnExitThread(); onexit_thread();
} }
void RSXThread::Init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress) void RSXThread::Init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress)

10
rpcs3/Emu/RSX/RSXThread.h
View file

@ -649,7 +649,7 @@ protected:
} }
} }
void Begin(u32 draw_mode); void begin(u32 draw_mode);
void End(); void End();
u32 OutOfArgsCount(const uint x, const u32 cmd, const u32 count, const u32 args_addr); u32 OutOfArgsCount(const uint x, const u32 cmd, const u32 count, const u32 args_addr);
@ -657,25 +657,25 @@ protected:
virtual void oninit() = 0; virtual void oninit() = 0;
virtual void oninit_thread() = 0; virtual void oninit_thread() = 0;
virtual void OnExitThread() = 0; virtual void onexit_thread() = 0;
virtual void OnReset() = 0; virtual void OnReset() = 0;
/** /**
* This member is called when the backend is expected to render a draw call, either * This member is called when the backend is expected to render a draw call, either
* indexed or not. * indexed or not.
*/ */
virtual void Draw() = 0; virtual void end() = 0;
/** /**
* This member is called when the backend is expected to clear a target surface. * This member is called when the backend is expected to clear a target surface.
*/ */
virtual void Clear(u32 cmd) = 0; virtual void clear_surface(u32 arg) = 0;
/** /**
* This member is called when the backend is expected to present a target surface in * This member is called when the backend is expected to present a target surface in
* either local or main memory. * either local or main memory.
*/ */
virtual void Flip() = 0; virtual void flip(int buffer) = 0;
/** /**
* This member is called when RSXThread parse a TEXTURE_READ_SEMAPHORE_RELEASE * This member is called when RSXThread parse a TEXTURE_READ_SEMAPHORE_RELEASE