diff --git a/Common/Timer.h b/Common/Timer.h index 6094c5e7c8..8d775b8423 100644 --- a/Common/Timer.h +++ b/Common/Timer.h @@ -51,7 +51,9 @@ public: private: u64 m_LastTime; u64 m_StartTime; +#ifdef _WIN32 u64 m_frequency; +#endif bool m_Running; }; diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index 5fb745b513..c1053fcf39 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -55,8 +55,6 @@ VulkanContext::VulkanContext(const char *app_name, int app_ver, uint32_t flags) #endif graphics_queue_family_index_(-1), surface_(VK_NULL_HANDLE), - prepared(false), - use_staging_buffer_(false), instance_(VK_NULL_HANDLE), width(0), height(0), diff --git a/Common/Vulkan/VulkanContext.h b/Common/Vulkan/VulkanContext.h index bc3a7d6d1b..6c03d0479e 100644 --- a/Common/Vulkan/VulkanContext.h +++ b/Common/Vulkan/VulkanContext.h @@ -255,8 +255,6 @@ private: VkQueue gfx_queue_; VkSurfaceKHR surface_; - bool prepared; - bool use_staging_buffer_; std::string init_error_; std::vector instance_layer_names; diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h index 9df22339ea..b971839906 100644 --- a/UI/ControlMappingScreen.h +++ b/UI/ControlMappingScreen.h @@ -64,7 +64,6 @@ protected: private: int pspBtn_; - bool replace_; std::function callback_; bool mapped_; // Prevent double registrations }; diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index 22cc35429c..dfc8a4d579 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -44,7 +44,6 @@ protected: private: UI::EventReturn OnCheckBox(UI::EventParams ¶ms); std::vector formattedList_; - bool anythingChanged_; }; // TODO: Instead just hook the OnClick event on a regular checkbox. diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 55781e4159..0447aaeacf 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -238,8 +238,8 @@ void DisplayLayoutScreen::CreateViews() { Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 74)); center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter); root_->Add(center); - PopupSliderChoiceFloat *zoomlvl_ = new PopupSliderChoiceFloat(&g_Config.fSmallDisplayZoomLevel, 1.0f, 10.0f, di->T("Zoom"), 1.0f, screenManager(), di->T("* PSP res"), new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 134)); - root_->Add(zoomlvl_); + PopupSliderChoiceFloat *zoomlvl = new PopupSliderChoiceFloat(&g_Config.fSmallDisplayZoomLevel, 1.0f, 10.0f, di->T("Zoom"), 1.0f, screenManager(), di->T("* PSP res"), new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 134)); + root_->Add(zoomlvl); mode_->AddChoice(di->T("Move")); mode_->AddChoice(di->T("Resize")); mode_->SetSelection(0); diff --git a/UI/DisplayLayoutScreen.h b/UI/DisplayLayoutScreen.h index a6d9c80082..07cf0019e2 100644 --- a/UI/DisplayLayoutScreen.h +++ b/UI/DisplayLayoutScreen.h @@ -42,7 +42,6 @@ private: UI::ChoiceStrip *mode_; UI::PopupMultiChoice *zoom_; UI::PopupMultiChoice *rotation_; - UI::PopupSliderChoiceFloat *zoomlvl_; bool displayRotEnable_; // Touch down state for drag to resize etc float startX_; diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index 3759057b9e..9895b0a47f 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -43,9 +43,6 @@ private: //edit the game-specific settings and restore the global settings after exiting bool bEditThenRestore; bool lastVertical_; - // As we load metadata in the background, we need to be able to update these after the fact. - UI::TextView *tvTitle_; - UI::TextView *tvGameSize_; UI::CheckBox *enableReportsCheckbox_; UI::Choice *layoutEditorChoice_; UI::Choice *postProcChoice_; diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h index eaebd5e9c8..377ca06433 100644 --- a/UI/GamepadEmu.h +++ b/UI/GamepadEmu.h @@ -127,8 +127,6 @@ private: int stick_; float stick_size_; float scale_; - bool dragging_[MAX_POINTERS]; - bool lastPointerDown_[MAX_POINTERS]; float centerX_; float centerY_; diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 95d863c63c..91e436b777 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -979,10 +979,6 @@ void Thin3DVKTexture::Finalize(int zim_flags) { // TODO } -static bool isPowerOf2(int n) { - return n == 1 || (n & (n - 1)) == 0; -} - Thin3DDepthStencilState *Thin3DVKContext::CreateDepthStencilState(bool depthTestEnabled, bool depthWriteEnabled, T3DComparison depthCompare) { Thin3DVKDepthStencilState *ds = new Thin3DVKDepthStencilState(); ds->depthTestEnabled = depthTestEnabled;