code: Address more compiler warnings
This commit is contained in:
6
externals/microprofile/microprofile.h
vendored
6
externals/microprofile/microprofile.h
vendored
@ -847,7 +847,7 @@ inline MicroProfileLogEntry MicroProfileMakeLogIndex(uint64_t nBegin, MicroProfi
|
|||||||
MicroProfileLogEntry Entry = (nBegin<<62) | ((0x3fff&nToken)<<48) | (MP_LOG_TICK_MASK&nTick);
|
MicroProfileLogEntry Entry = (nBegin<<62) | ((0x3fff&nToken)<<48) | (MP_LOG_TICK_MASK&nTick);
|
||||||
int t = MicroProfileLogType(Entry);
|
int t = MicroProfileLogType(Entry);
|
||||||
uint64_t nTimerIndex = MicroProfileLogTimerIndex(Entry);
|
uint64_t nTimerIndex = MicroProfileLogTimerIndex(Entry);
|
||||||
MP_ASSERT(t == nBegin);
|
MP_ASSERT(static_cast<uint64_t>(t) == nBegin);
|
||||||
MP_ASSERT(nTimerIndex == (nToken&0x3fff));
|
MP_ASSERT(nTimerIndex == (nToken&0x3fff));
|
||||||
return Entry;
|
return Entry;
|
||||||
|
|
||||||
@ -1579,10 +1579,10 @@ void MicroProfileFlip()
|
|||||||
|
|
||||||
pFramePut->nFrameStartCpu = MP_TICK();
|
pFramePut->nFrameStartCpu = MP_TICK();
|
||||||
pFramePut->nFrameStartGpu = (uint32_t)MicroProfileGpuInsertTimeStamp();
|
pFramePut->nFrameStartGpu = (uint32_t)MicroProfileGpuInsertTimeStamp();
|
||||||
if(pFrameNext->nFrameStartGpu != (uint64_t)-1)
|
if(static_cast<uint64_t>(pFrameNext->nFrameStartGpu) != (uint64_t)-1)
|
||||||
pFrameNext->nFrameStartGpu = MicroProfileGpuGetTimeStamp((uint32_t)pFrameNext->nFrameStartGpu);
|
pFrameNext->nFrameStartGpu = MicroProfileGpuGetTimeStamp((uint32_t)pFrameNext->nFrameStartGpu);
|
||||||
|
|
||||||
if(pFrameCurrent->nFrameStartGpu == (uint64_t)-1)
|
if(static_cast<uint64_t>(pFrameCurrent->nFrameStartGpu) == (uint64_t)-1)
|
||||||
pFrameCurrent->nFrameStartGpu = pFrameNext->nFrameStartGpu + 1;
|
pFrameCurrent->nFrameStartGpu = pFrameNext->nFrameStartGpu + 1;
|
||||||
|
|
||||||
uint64_t nFrameStartCpu = pFrameCurrent->nFrameStartCpu;
|
uint64_t nFrameStartCpu = pFrameCurrent->nFrameStartCpu;
|
||||||
|
12
externals/microprofile/microprofileui.h
vendored
12
externals/microprofile/microprofileui.h
vendored
@ -354,7 +354,7 @@ void MicroProfileInitUI()
|
|||||||
if(!bInitialized)
|
if(!bInitialized)
|
||||||
{
|
{
|
||||||
bInitialized = true;
|
bInitialized = true;
|
||||||
memset(&g_MicroProfileUI, 0, sizeof(g_MicroProfileUI));
|
g_MicroProfileUI = {};
|
||||||
UI.nActiveMenu = UINT32_MAX;
|
UI.nActiveMenu = UINT32_MAX;
|
||||||
UI.fDetailedOffsetTarget = UI.fDetailedOffset = 0.f;
|
UI.fDetailedOffsetTarget = UI.fDetailedOffset = 0.f;
|
||||||
UI.fDetailedRangeTarget = UI.fDetailedRange = 50.f;
|
UI.fDetailedRangeTarget = UI.fDetailedRange = 50.f;
|
||||||
@ -845,8 +845,8 @@ void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int nBaseY,
|
|||||||
MicroProfile& S = *MicroProfileGet();
|
MicroProfile& S = *MicroProfileGet();
|
||||||
MP_DEBUG_DUMP_RANGE();
|
MP_DEBUG_DUMP_RANGE();
|
||||||
int nY = nBaseY - UI.nOffsetY;
|
int nY = nBaseY - UI.nOffsetY;
|
||||||
int64_t nNumBoxes = 0;
|
[[maybe_unused]] int64_t nNumBoxes = 0;
|
||||||
int64_t nNumLines = 0;
|
[[maybe_unused]] int64_t nNumLines = 0;
|
||||||
|
|
||||||
uint32_t nFrameNext = (S.nFrameCurrent+1) % MICROPROFILE_MAX_FRAME_HISTORY;
|
uint32_t nFrameNext = (S.nFrameCurrent+1) % MICROPROFILE_MAX_FRAME_HISTORY;
|
||||||
MicroProfileFrameState* pFrameCurrent = &S.Frames[S.nFrameCurrent];
|
MicroProfileFrameState* pFrameCurrent = &S.Frames[S.nFrameCurrent];
|
||||||
@ -1988,7 +1988,7 @@ const char* MicroProfileUIMenuGroups(int nIndex, bool* bSelected)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
nIndex = nIndex-1;
|
nIndex = nIndex-1;
|
||||||
if(nIndex < UI.GroupMenuCount)
|
if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount)
|
||||||
{
|
{
|
||||||
MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
|
MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
|
||||||
static char buffer[MICROPROFILE_NAME_MAX_LEN+32];
|
static char buffer[MICROPROFILE_NAME_MAX_LEN+32];
|
||||||
@ -2135,7 +2135,7 @@ const char* MicroProfileUIMenuCustom(int nIndex, bool* bSelected)
|
|||||||
case 1: return "--";
|
case 1: return "--";
|
||||||
default:
|
default:
|
||||||
nIndex -= 2;
|
nIndex -= 2;
|
||||||
if(nIndex < UI.nCustomCount)
|
if(static_cast<uint32_t>(nIndex) < UI.nCustomCount)
|
||||||
{
|
{
|
||||||
return UI.Custom[nIndex].pName;
|
return UI.Custom[nIndex].pName;
|
||||||
}
|
}
|
||||||
@ -2185,7 +2185,7 @@ void MicroProfileUIClickGroups(int nIndex)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
nIndex -= 1;
|
nIndex -= 1;
|
||||||
if(nIndex < UI.GroupMenuCount)
|
if(static_cast<uint32_t>(nIndex) < UI.GroupMenuCount)
|
||||||
{
|
{
|
||||||
MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
|
MicroProfileGroupMenuItem& Item = UI.GroupMenu[nIndex];
|
||||||
if(Item.nIsCategory)
|
if(Item.nIsCategory)
|
||||||
|
@ -190,8 +190,9 @@ void CheatDialog::OnDeleteCheat() {
|
|||||||
if (newly_created) {
|
if (newly_created) {
|
||||||
newly_created = false;
|
newly_created = false;
|
||||||
} else {
|
} else {
|
||||||
Core::System::GetInstance().CheatEngine().RemoveCheat(ui->tableCheats->currentRow());
|
auto& cheat_engine = Core::System::GetInstance().CheatEngine();
|
||||||
Core::System::GetInstance().CheatEngine().SaveCheatFile();
|
cheat_engine.RemoveCheat(ui->tableCheats->currentRow());
|
||||||
|
cheat_engine.SaveCheatFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadCheats();
|
LoadCheats();
|
||||||
|
@ -192,10 +192,10 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
if (!button_map[button_id])
|
if (!button_map[button_id])
|
||||||
continue;
|
continue;
|
||||||
button_map[button_id]->setContextMenuPolicy(Qt::CustomContextMenu);
|
button_map[button_id]->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
connect(button_map[button_id], &QPushButton::clicked, [=]() {
|
connect(button_map[button_id], &QPushButton::clicked, [this, button_id]() {
|
||||||
HandleClick(
|
HandleClick(
|
||||||
button_map[button_id],
|
button_map[button_id],
|
||||||
[=](const Common::ParamPackage& params) {
|
[this, button_id](const Common::ParamPackage& params) {
|
||||||
buttons_param[button_id] = params;
|
buttons_param[button_id] = params;
|
||||||
// If the user closes the dialog, the changes are reverted in
|
// If the user closes the dialog, the changes are reverted in
|
||||||
// `GMainWindow::OnConfigure()`
|
// `GMainWindow::OnConfigure()`
|
||||||
@ -205,7 +205,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
InputCommon::Polling::DeviceType::Button);
|
InputCommon::Polling::DeviceType::Button);
|
||||||
});
|
});
|
||||||
connect(button_map[button_id], &QPushButton::customContextMenuRequested, this,
|
connect(button_map[button_id], &QPushButton::customContextMenuRequested, this,
|
||||||
[=](const QPoint& menu_location) {
|
[this, button_id](const QPoint& menu_location) {
|
||||||
QMenu context_menu;
|
QMenu context_menu;
|
||||||
context_menu.addAction(tr("Clear"), this, [&] {
|
context_menu.addAction(tr("Clear"), this, [&] {
|
||||||
buttons_param[button_id].Clear();
|
buttons_param[button_id].Clear();
|
||||||
@ -230,10 +230,10 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
continue;
|
continue;
|
||||||
analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy(
|
analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy(
|
||||||
Qt::CustomContextMenu);
|
Qt::CustomContextMenu);
|
||||||
connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::clicked, this, [=]() {
|
connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::clicked, this, [this, analog_id, sub_button_id]() {
|
||||||
HandleClick(
|
HandleClick(
|
||||||
analog_map_buttons[analog_id][sub_button_id],
|
analog_map_buttons[analog_id][sub_button_id],
|
||||||
[=](const Common::ParamPackage& params) {
|
[this, analog_id, sub_button_id](const Common::ParamPackage& params) {
|
||||||
SetAnalogButton(params, analogs_param[analog_id],
|
SetAnalogButton(params, analogs_param[analog_id],
|
||||||
analog_sub_buttons[sub_button_id]);
|
analog_sub_buttons[sub_button_id]);
|
||||||
ApplyConfiguration();
|
ApplyConfiguration();
|
||||||
@ -242,7 +242,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
InputCommon::Polling::DeviceType::Button);
|
InputCommon::Polling::DeviceType::Button);
|
||||||
});
|
});
|
||||||
connect(analog_map_buttons[analog_id][sub_button_id],
|
connect(analog_map_buttons[analog_id][sub_button_id],
|
||||||
&QPushButton::customContextMenuRequested, this, [=](const QPoint& menu_location) {
|
&QPushButton::customContextMenuRequested, this, [this, analog_id, sub_button_id](const QPoint& menu_location) {
|
||||||
QMenu context_menu;
|
QMenu context_menu;
|
||||||
context_menu.addAction(tr("Clear"), this, [&] {
|
context_menu.addAction(tr("Clear"), this, [&] {
|
||||||
analogs_param[analog_id].Erase(analog_sub_buttons[sub_button_id]);
|
analogs_param[analog_id].Erase(analog_sub_buttons[sub_button_id]);
|
||||||
@ -264,7 +264,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
menu_location));
|
menu_location));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
connect(analog_map_stick[analog_id], &QPushButton::clicked, this, [=]() {
|
connect(analog_map_stick[analog_id], &QPushButton::clicked, this, [this, analog_id]() {
|
||||||
if (QMessageBox::information(
|
if (QMessageBox::information(
|
||||||
this, tr("Information"),
|
this, tr("Information"),
|
||||||
tr("After pressing OK, first move your joystick horizontally, "
|
tr("After pressing OK, first move your joystick horizontally, "
|
||||||
@ -272,7 +272,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
|
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
|
||||||
HandleClick(
|
HandleClick(
|
||||||
analog_map_stick[analog_id],
|
analog_map_stick[analog_id],
|
||||||
[=](const Common::ParamPackage& params) {
|
[this, analog_id](const Common::ParamPackage& params) {
|
||||||
analogs_param[analog_id] = params;
|
analogs_param[analog_id] = params;
|
||||||
ApplyConfiguration();
|
ApplyConfiguration();
|
||||||
Settings::SaveProfile(ui->profile->currentIndex());
|
Settings::SaveProfile(ui->profile->currentIndex());
|
||||||
@ -280,7 +280,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
InputCommon::Polling::DeviceType::Analog);
|
InputCommon::Polling::DeviceType::Analog);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
connect(analog_map_deadzone_and_modifier_slider[analog_id], &QSlider::valueChanged, this, [=] {
|
connect(analog_map_deadzone_and_modifier_slider[analog_id], &QSlider::valueChanged, this, [this, analog_id] {
|
||||||
const int slider_value = analog_map_deadzone_and_modifier_slider[analog_id]->value();
|
const int slider_value = analog_map_deadzone_and_modifier_slider[analog_id]->value();
|
||||||
const auto engine = analogs_param[analog_id].Get("engine", "");
|
const auto engine = analogs_param[analog_id].Get("engine", "");
|
||||||
if (engine == "sdl" || engine == "gcpad") {
|
if (engine == "sdl" || engine == "gcpad") {
|
||||||
@ -299,10 +299,10 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||||||
|
|
||||||
// The Circle Mod button is common for both the sticks, so update the modifier settings
|
// The Circle Mod button is common for both the sticks, so update the modifier settings
|
||||||
// for both the sticks.
|
// for both the sticks.
|
||||||
connect(ui->buttonCircleMod, &QPushButton::clicked, this, [=]() {
|
connect(ui->buttonCircleMod, &QPushButton::clicked, this, [this]() {
|
||||||
HandleClick(
|
HandleClick(
|
||||||
ui->buttonCircleMod,
|
ui->buttonCircleMod,
|
||||||
[=](const Common::ParamPackage& params) {
|
[this](const Common::ParamPackage& params) {
|
||||||
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs;
|
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs;
|
||||||
analog_id++) {
|
analog_id++) {
|
||||||
SetAnalogButton(params, analogs_param[analog_id], "modifier");
|
SetAnalogButton(params, analogs_param[analog_id], "modifier");
|
||||||
|
@ -205,7 +205,7 @@ void ConfigureMotionTouch::ConnectEvents() {
|
|||||||
connect(ui->touch_provider,
|
connect(ui->touch_provider,
|
||||||
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
||||||
[this]([[maybe_unused]] int index) { UpdateUiDisplay(); });
|
[this]([[maybe_unused]] int index) { UpdateUiDisplay(); });
|
||||||
connect(ui->motion_controller_button, &QPushButton::clicked, this, [=]() {
|
connect(ui->motion_controller_button, &QPushButton::clicked, this, [this]() {
|
||||||
if (QMessageBox::information(this, tr("Information"),
|
if (QMessageBox::information(this, tr("Information"),
|
||||||
tr("After pressing OK, press a button on the controller whose "
|
tr("After pressing OK, press a button on the controller whose "
|
||||||
"motion you want to track."),
|
"motion you want to track."),
|
||||||
|
@ -261,6 +261,8 @@ u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) const {
|
|||||||
default:
|
default:
|
||||||
UNREACHABLE_MSG("Unknown CP15 register: {}", reg);
|
UNREACHABLE_MSG("Unknown CP15 register: {}", reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
|
void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
|
||||||
|
@ -47,7 +47,7 @@ void CheatEngine::AddCheat(const std::shared_ptr<CheatBase>& cheat) {
|
|||||||
|
|
||||||
void CheatEngine::RemoveCheat(int index) {
|
void CheatEngine::RemoveCheat(int index) {
|
||||||
std::unique_lock<std::shared_mutex> lock(cheats_list_mutex);
|
std::unique_lock<std::shared_mutex> lock(cheats_list_mutex);
|
||||||
if (index < 0 || index >= cheats_list.size()) {
|
if (index < 0 || index >= static_cast<int>(cheats_list.size())) {
|
||||||
LOG_ERROR(Core_Cheats, "Invalid index {}", index);
|
LOG_ERROR(Core_Cheats, "Invalid index {}", index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -56,7 +56,7 @@ void CheatEngine::RemoveCheat(int index) {
|
|||||||
|
|
||||||
void CheatEngine::UpdateCheat(int index, const std::shared_ptr<CheatBase>& new_cheat) {
|
void CheatEngine::UpdateCheat(int index, const std::shared_ptr<CheatBase>& new_cheat) {
|
||||||
std::unique_lock<std::shared_mutex> lock(cheats_list_mutex);
|
std::unique_lock<std::shared_mutex> lock(cheats_list_mutex);
|
||||||
if (index < 0 || index >= cheats_list.size()) {
|
if (index < 0 || index >= static_cast<int>(cheats_list.size())) {
|
||||||
LOG_ERROR(Core_Cheats, "Invalid index {}", index);
|
LOG_ERROR(Core_Cheats, "Invalid index {}", index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1393,7 +1393,7 @@ ResultCode SVC::AcceptSession(Handle* out_server_session, Handle server_port_han
|
|||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CopyStringPart(char* out, const char* in, int offset, int max_length) {
|
static void CopyStringPart(char* out, const char* in, size_t offset, size_t max_length) {
|
||||||
size_t str_size = strlen(in);
|
size_t str_size = strlen(in);
|
||||||
if (offset < str_size) {
|
if (offset < str_size) {
|
||||||
strncpy(out, in + offset, max_length - 1);
|
strncpy(out, in + offset, max_length - 1);
|
||||||
|
@ -83,7 +83,9 @@ u32 GSP_GPU::GetUnusedThreadId() const {
|
|||||||
if (!used_thread_ids[id])
|
if (!used_thread_ids[id])
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
ASSERT_MSG(false, "All GSP threads are in use");
|
|
||||||
|
UNREACHABLE_MSG("All GSP threads are in use");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets a pointer to a thread command buffer in GSP shared memory
|
/// Gets a pointer to a thread command buffer in GSP shared memory
|
||||||
|
@ -68,9 +68,11 @@ struct Regs {
|
|||||||
case PixelFormat::RGB5A1:
|
case PixelFormat::RGB5A1:
|
||||||
case PixelFormat::RGBA4:
|
case PixelFormat::RGBA4:
|
||||||
return 2;
|
return 2;
|
||||||
|
default:
|
||||||
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
|
|
||||||
UNREACHABLE();
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
INSERT_PADDING_WORDS(0x4);
|
INSERT_PADDING_WORDS(0x4);
|
||||||
|
@ -275,9 +275,11 @@ struct FramebufferRegs {
|
|||||||
case DepthFormat::D24:
|
case DepthFormat::D24:
|
||||||
case DepthFormat::D24S8:
|
case DepthFormat::D24S8:
|
||||||
return 24;
|
return 24;
|
||||||
|
default:
|
||||||
|
UNREACHABLE_MSG("Unknown depth format {}", format);
|
||||||
}
|
}
|
||||||
|
|
||||||
ASSERT_MSG(false, "Unknown depth format {}", format);
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
INSERT_PADDING_WORDS(0x10); // Gas related registers
|
INSERT_PADDING_WORDS(0x10); // Gas related registers
|
||||||
|
@ -430,6 +430,8 @@ static GLenum GetCurrentPrimitiveMode() {
|
|||||||
default:
|
default:
|
||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return GL_TRIANGLES;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed) {
|
bool RasterizerOpenGL::AccelerateDrawBatchInternal(bool is_indexed) {
|
||||||
|
@ -89,7 +89,7 @@ void OGLTexture::CopyFrom(const OGLTexture& other, GLenum target, GLsizei levels
|
|||||||
glActiveTexture(GL_TEXTURE0);
|
glActiveTexture(GL_TEXTURE0);
|
||||||
glBindTexture(GL_TEXTURE_2D, handle);
|
glBindTexture(GL_TEXTURE_2D, handle);
|
||||||
|
|
||||||
for (u32 level = 0; level < levels; level++) {
|
for (GLsizei level = 0; level < levels; level++) {
|
||||||
glCopyImageSubData(other.handle, target, level, 0, 0, 0, handle, target, level, 0, 0, 0,
|
glCopyImageSubData(other.handle, target, level, 0, 0, 0, handle, target, level, 0, 0, 0,
|
||||||
width >> level, height >> level, 1);
|
width >> level, height >> level, 1);
|
||||||
}
|
}
|
||||||
|
@ -766,7 +766,7 @@ void RendererOpenGL::ReloadShader() {
|
|||||||
void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
|
void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
|
||||||
const GPU::Regs::FramebufferConfig& framebuffer) {
|
const GPU::Regs::FramebufferConfig& framebuffer) {
|
||||||
GPU::Regs::PixelFormat format = framebuffer.color_format;
|
GPU::Regs::PixelFormat format = framebuffer.color_format;
|
||||||
GLint internal_format;
|
GLint internal_format{};
|
||||||
|
|
||||||
texture.format = format;
|
texture.format = format;
|
||||||
texture.width = framebuffer.width;
|
texture.width = framebuffer.width;
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <fmt/chrono.h>
|
#include <fmt/chrono.h>
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "video_core/rasterizer_cache/utils.h"
|
|
||||||
#include "video_core/renderer_opengl/gl_state.h"
|
#include "video_core/renderer_opengl/gl_state.h"
|
||||||
#include "video_core/renderer_opengl/gl_texture_runtime.h"
|
#include "video_core/renderer_opengl/gl_texture_runtime.h"
|
||||||
#include "video_core/renderer_opengl/texture_downloader_es.h"
|
#include "video_core/renderer_opengl/texture_downloader_es.h"
|
||||||
@ -73,7 +72,7 @@ void TextureDownloaderES::Test() {
|
|||||||
auto time = std::chrono::high_resolution_clock::now() - start;
|
auto time = std::chrono::high_resolution_clock::now() - start;
|
||||||
LOG_INFO(Render_OpenGL, "test took {}", std::chrono::duration<double, std::milli>(time));
|
LOG_INFO(Render_OpenGL, "test took {}", std::chrono::duration<double, std::milli>(time));
|
||||||
|
|
||||||
int diff = 0;
|
T diff = 0;
|
||||||
for (std::size_t idx = 0; idx < original_data.size(); ++idx)
|
for (std::size_t idx = 0; idx < original_data.size(); ++idx)
|
||||||
if (new_data[idx] - original_data[idx] != diff) {
|
if (new_data[idx] - original_data[idx] != diff) {
|
||||||
diff = new_data[idx] - original_data[idx];
|
diff = new_data[idx] - original_data[idx];
|
||||||
@ -207,7 +206,7 @@ GLuint TextureDownloaderES::ConvertDepthToColor(GLuint level, GLenum& format, GL
|
|||||||
void TextureDownloaderES::GetTexImage(GLenum target, GLuint level, GLenum format, GLenum type,
|
void TextureDownloaderES::GetTexImage(GLenum target, GLuint level, GLenum format, GLenum type,
|
||||||
GLint height, GLint width, void* pixels) const {
|
GLint height, GLint width, void* pixels) const {
|
||||||
OpenGLState state = OpenGLState::GetCurState();
|
OpenGLState state = OpenGLState::GetCurState();
|
||||||
GLuint texture;
|
GLuint texture{};
|
||||||
const GLuint old_read_buffer = state.draw.read_framebuffer;
|
const GLuint old_read_buffer = state.draw.read_framebuffer;
|
||||||
switch (target) {
|
switch (target) {
|
||||||
case GL_TEXTURE_2D:
|
case GL_TEXTURE_2D:
|
||||||
|
@ -251,6 +251,9 @@ inline vk::CullModeFlags CullMode(Pica::RasterizerRegs::CullMode mode) {
|
|||||||
case Pica::RasterizerRegs::CullMode::KeepClockWise:
|
case Pica::RasterizerRegs::CullMode::KeepClockWise:
|
||||||
case Pica::RasterizerRegs::CullMode::KeepCounterClockWise:
|
case Pica::RasterizerRegs::CullMode::KeepCounterClockWise:
|
||||||
return vk::CullModeFlagBits::eBack;
|
return vk::CullModeFlagBits::eBack;
|
||||||
|
default:
|
||||||
|
LOG_CRITICAL(Render_Vulkan, "Unknown cull mode {}", mode);
|
||||||
|
return vk::CullModeFlagBits::eNone;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,6 +265,9 @@ inline vk::FrontFace FrontFace(Pica::RasterizerRegs::CullMode mode) {
|
|||||||
return vk::FrontFace::eCounterClockwise;
|
return vk::FrontFace::eCounterClockwise;
|
||||||
case Pica::RasterizerRegs::CullMode::KeepCounterClockWise:
|
case Pica::RasterizerRegs::CullMode::KeepCounterClockWise:
|
||||||
return vk::FrontFace::eClockwise;
|
return vk::FrontFace::eClockwise;
|
||||||
|
default:
|
||||||
|
LOG_CRITICAL(Render_Vulkan, "Unknown cull mode {}", mode);
|
||||||
|
return vk::FrontFace::eClockwise;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user