diff options
| author | Stenzek <stenzek@gmail.com> | 2017-03-04 16:42:21 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2017-03-04 16:42:21 +1000 |
| commit | afc25fdca07cc1cc80e05cd753027f1cd40328db (patch) | |
| tree | 512a2ddb80203faa8b57b05362b32c10712c92a3 /Source/Core/VideoBackends/D3D12/Render.cpp | |
| parent | 238a70b0060c1d45b12d4702bb41725e9ebb5fa6 (diff) | |
VideoCommon: Rename Renderer s_ prefixes to m_
Diffstat (limited to 'Source/Core/VideoBackends/D3D12/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D12/Render.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/Core/VideoBackends/D3D12/Render.cpp b/Source/Core/VideoBackends/D3D12/Render.cpp index d63af49a04..80ae8711d0 100644 --- a/Source/Core/VideoBackends/D3D12/Render.cpp +++ b/Source/Core/VideoBackends/D3D12/Render.cpp @@ -221,7 +221,7 @@ Renderer::Renderer() : ::Renderer(D3D::GetBackBufferWidth(), D3D::GetBackBufferH s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0; s_last_xfb_mode = g_ActiveConfig.bUseRealXFB; - g_framebuffer_manager = std::make_unique<FramebufferManager>(s_target_width, s_target_height); + g_framebuffer_manager = std::make_unique<FramebufferManager>(m_target_width, m_target_height); SetupDeviceObjects(); // Setup GX pipeline state @@ -257,8 +257,8 @@ Renderer::Renderer() : ::Renderer(D3D::GetBackBufferWidth(), D3D::GetBackBufferH D3D12_VIEWPORT vp = {0.f, 0.f, - static_cast<float>(s_target_width), - static_cast<float>(s_target_height), + static_cast<float>(m_target_width), + static_cast<float>(m_target_height), D3D12_MIN_DEPTH, D3D12_MAX_DEPTH}; D3D::current_command_list->RSSetViewports(1, &vp); @@ -634,7 +634,7 @@ void Renderer::SetBlendMode(bool force_update) void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, const EFBRectangle& rc, u64 ticks, float gamma) { - if ((!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fb_width || !fb_height) + if ((!m_xfb_written && !g_ActiveConfig.RealXFBEnabled()) || !fb_width || !fb_height) { Core::Callback_VideoCopiedToXFB(false); return; @@ -821,7 +821,7 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height // Resize the back buffers NOW to avoid flickering if (CalculateTargetSize() || xfb_changed || window_resized || - s_last_efb_scale != g_ActiveConfig.iEFBScale || + m_last_efb_scale != g_ActiveConfig.iEFBScale || s_last_multisamples != g_ActiveConfig.iMultisamples || s_last_stereo_mode != (g_ActiveConfig.iStereoMode > 0)) { @@ -848,13 +848,13 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height s_screenshot_texture = nullptr; } - s_backbuffer_width = D3D::GetBackBufferWidth(); - s_backbuffer_height = D3D::GetBackBufferHeight(); + m_backbuffer_width = D3D::GetBackBufferWidth(); + m_backbuffer_height = D3D::GetBackBufferHeight(); } UpdateDrawRectangle(); - s_last_efb_scale = g_ActiveConfig.iEFBScale; + m_last_efb_scale = g_ActiveConfig.iEFBScale; s_last_stereo_mode = g_ActiveConfig.iStereoMode > 0; PixelShaderManager::SetEfbScaleChanged(); @@ -865,7 +865,7 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height nullptr); g_framebuffer_manager.reset(); - g_framebuffer_manager = std::make_unique<FramebufferManager>(s_target_width, s_target_height); + g_framebuffer_manager = std::make_unique<FramebufferManager>(m_target_width, m_target_height); const float clear_color[4] = {0.f, 0.f, 0.f, 1.f}; FramebufferManager::GetEFBColorTexture()->TransitionToResourceState( @@ -1177,12 +1177,12 @@ u16 Renderer::BBoxRead(int index) if (index < 2) { // left/right - value = value * EFB_WIDTH / s_target_width; + value = value * EFB_WIDTH / m_target_width; } else { // up/down - value = value * EFB_HEIGHT / s_target_height; + value = value * EFB_HEIGHT / m_target_height; } if (index & 1) value++; // fix max values to describe the outer border @@ -1197,11 +1197,11 @@ void Renderer::BBoxWrite(int index, u16 value) local_value--; if (index < 2) { - local_value = local_value * s_target_width / EFB_WIDTH; + local_value = local_value * m_target_width / EFB_WIDTH; } else { - local_value = local_value * s_target_height / EFB_HEIGHT; + local_value = local_value * m_target_height / EFB_HEIGHT; } BBox::Set(index, local_value); |
