Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix compilation under clang-9

Browse source 
Fixes #23.
This commit is contained in:
Connor McLaughlin 2020-02-13 16:52:30 +09:00
parent 9c82096f8f
commit d7f8884291
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/gpu_hw.cpp
View file

@ -274,7 +274,7 @@ void GPU_HW::IncludeVRAMDityRectangle(const Common::Rectangle<u32>& rect)
// shadow texture is updated // shadow texture is updated
if (!m_draw_mode.IsTexturePageChanged() && if (!m_draw_mode.IsTexturePageChanged() &&
(m_draw_mode.GetTexturePageRectangle().Intersects(rect) || (m_draw_mode.GetTexturePageRectangle().Intersects(rect) ||
m_draw_mode.IsUsingPalette() && m_draw_mode.GetTexturePaletteRectangle().Intersects(rect))) (m_draw_mode.IsUsingPalette() && m_draw_mode.GetTexturePaletteRectangle().Intersects(rect))))
{ {
m_draw_mode.SetTexturePageChanged(); m_draw_mode.SetTexturePageChanged();
} }
@ -433,4 +433,4 @@ void GPU_HW::DrawRendererStats(bool is_idle_frame)
ImGui::Columns(1); ImGui::Columns(1);
} }
} }

5
src/duckstation-qt/qthostinterface.cpp
View file

@ -319,8 +319,11 @@ void QtHostInterface::updateControllerInputMap()
continue; continue;
const auto button_names = Controller::GetButtonNames(ctype); const auto button_names = Controller::GetButtonNames(ctype);
for (const auto& [button_name, button_code] : button_names) for (const auto& it : button_names)
{ {
const std::string& button_name = it.first;
const s32 button_code = it.second;
QVariant var = m_qsettings.value( QVariant var = m_qsettings.value(
QStringLiteral("Controller%1/Button%2").arg(controller_index + 1).arg(QString::fromStdString(button_name))); QStringLiteral("Controller%1/Button%2").arg(controller_index + 1).arg(QString::fromStdString(button_name)));
if (!var.isValid()) if (!var.isValid())

2
src/duckstation-sdl/d3d11_host_display.h
View file

@ -44,7 +44,7 @@ private:
bool CreateSwapChainRTV(); bool CreateSwapChainRTV();
bool CreateImGuiContext(); bool CreateImGuiContext();
void Render(); void Render() override;
void RenderDisplay(); void RenderDisplay();
SDL_Window* m_window = nullptr; SDL_Window* m_window = nullptr;

2
src/duckstation-sdl/opengl_host_display.h
View file

@ -39,7 +39,7 @@ private:
bool CreateImGuiContext(); bool CreateImGuiContext();
bool CreateGLResources(); bool CreateGLResources();
void Render(); void Render() override;
void RenderDisplay(); void RenderDisplay();
SDL_Window* m_window = nullptr; SDL_Window* m_window = nullptr;