The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/VideoCommon: Fix some weird (!eof) logic.

Browse Source
This commit is contained in:
Jordan Woyak 2024-11-07 16:52:39 -06:00
parent 05cad38abc
commit 0938fca6e3
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/DSP/DSPAssembler.cpp
View File

@ -776,14 +776,11 @@ bool DSPAssembler::AssemblePass(const std::string& text, int pass)
m_location.line_num = 0; m_location.line_num = 0;
m_cur_pass = pass; m_cur_pass = pass;
#define LINEBUF_SIZE 1024 constexpr int LINEBUF_SIZE = 1024;
char line[LINEBUF_SIZE] = {0}; char line[LINEBUF_SIZE] = {};
while (!m_failed && !fsrc.fail() && !fsrc.eof()) while (!m_failed && fsrc.getline(line, LINEBUF_SIZE))
{ {
int opcode_size = 0; int opcode_size = 0;
fsrc.getline(line, LINEBUF_SIZE);
if (fsrc.fail())
break;
m_location.line_text = line; m_location.line_text = line;
m_location.line_num++; m_location.line_num++;

5
Source/Core/VideoCommon/PostProcessing.cpp
View File

@ -137,10 +137,8 @@ void PostProcessingConfiguration::LoadOptions(const std::string& code)
std::vector<GLSLStringOption> option_strings; std::vector<GLSLStringOption> option_strings;
GLSLStringOption* current_strings = nullptr; GLSLStringOption* current_strings = nullptr;
while (!in.eof())
{
std::string line_str; std::string line_str;
if (std::getline(in, line_str)) while (std::getline(in, line_str))
{ {
std::string_view line = line_str; std::string_view line = line_str;
@ -177,7 +175,6 @@ void PostProcessingConfiguration::LoadOptions(const std::string& code)
} }
} }
} }
}
for (const auto& it : option_strings) for (const auto& it : option_strings)
{ {