ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d3d12: Fix some warnings

This commit is contained in:
vlj 2015-05-14 19:51:15 +02:00 committed by Vincent Lejeune
parent 3960555e45
commit 16f40fb69c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.cpp
View File

@ -410,14 +410,14 @@ std::string VertexDecompiler::BuildCode()
lvl -= m_instructions[i].close_scopes; lvl -= m_instructions[i].close_scopes;
if (lvl < 1) lvl = 1; if (lvl < 1) lvl = 1;
//assert(lvl >= 1); //assert(lvl >= 1);
for (uint j = 0; j < m_instructions[i].put_close_scopes; ++j) for (int j = 0; j < m_instructions[i].put_close_scopes; ++j)
{ {
--lvl; --lvl;
if (lvl < 1) lvl = 1; if (lvl < 1) lvl = 1;
main_body.append(lvl, '\t') += "}\n"; main_body.append(lvl, '\t') += "}\n";
} }
for (uint j = 0; j < m_instructions[i].do_count; ++j) for (int j = 0; j < m_instructions[i].do_count; ++j)
{ {
main_body.append(lvl, '\t') += "do\n"; main_body.append(lvl, '\t') += "do\n";
main_body.append(lvl, '\t') += "{\n"; main_body.append(lvl, '\t') += "{\n";

8
rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.h
View File

@ -81,9 +81,8 @@ struct ParamArray
} }
else else
{ {
const u32 num = params[flag].size();
params[flag].emplace_back(flag, type); params[flag].emplace_back(flag, type);
params[flag][num].items.emplace_back(name, -1, value); params[flag].back().items.emplace_back(name, -1, value);
} }
return name; return name;
@ -99,9 +98,8 @@ struct ParamArray
} }
else else
{ {
const u32 num = params[flag].size();
params[flag].emplace_back(flag, type); params[flag].emplace_back(flag, type);
params[flag][num].items.emplace_back(name, location); params[flag].back().items.emplace_back(name, location);
} }
return name; return name;
@ -136,7 +134,7 @@ public:
} }
} }
int get_vector_size() const size_t get_vector_size() const
{ {
return swizzles[swizzles.size() - 1].length(); return swizzles[swizzles.size() - 1].length();
} }