RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-23 03:02:53 +01:00
Code Issues Releases Wiki Activity

Remove fragment constants

Browse Source
This commit is contained in:
Vincent Lejeune 2015-10-11 19:45:27 +02:00
parent beabc88f79
commit 67f1f0fea3
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
View File

@ -331,16 +331,16 @@ void D3D12GSRender::FillPixelShaderConstantsBuffer()
// Is it assigned by color register in command buffer ? // Is it assigned by color register in command buffer ?
// TODO : we loop every iteration, we might do better... // TODO : we loop every iteration, we might do better...
bool isCommandBufferSetConstant = false; bool isCommandBufferSetConstant = false;
for (const RSXTransformConstant& c : m_fragment_constants) for (const auto& entry : fragment_constants)
{ {
size_t fragmentId = c.id - m_cur_fragment_prog->offset; size_t fragmentId = entry.first - m_cur_fragment_prog->offset;
if (fragmentId == offsetInFP) if (fragmentId == offsetInFP)
{ {
isCommandBufferSetConstant = true; isCommandBufferSetConstant = true;
vector[0] = (u32&)c.x; vector[0] = (u32&)entry.second.x;
vector[1] = (u32&)c.y; vector[1] = (u32&)entry.second.y;
vector[2] = (u32&)c.z; vector[2] = (u32&)entry.second.z;
vector[3] = (u32&)c.w; vector[3] = (u32&)entry.second.w;
break; break;
} }
} }

4
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -1090,7 +1090,7 @@ void GLGSRender::InitFragmentData()
checkForGlError("glUniform4f " + name + fmt::format(" %u [%f %f %f %f]", l, f0, f1, f2, f3)); checkForGlError("glUniform4f " + name + fmt::format(" %u [%f %f %f %f]", l, f0, f1, f2, f3));
} }
for (const RSXTransformConstant& c : m_fragment_constants) /* for (const RSXTransformConstant& c : m_fragment_constants)
{ {
u32 id = c.id - m_cur_fragment_prog->offset; u32 id = c.id - m_cur_fragment_prog->offset;
@ -1102,7 +1102,7 @@ void GLGSRender::InitFragmentData()
glUniform4f(l, c.x, c.y, c.z, c.w); glUniform4f(l, c.x, c.y, c.z, c.w);
checkForGlError("glUniform4f " + name + fmt::format(" %u [%f %f %f %f]", l, c.x, c.y, c.z, c.w)); checkForGlError("glUniform4f " + name + fmt::format(" %u [%f %f %f %f]", l, c.x, c.y, c.z, c.w));
} }*/
//if (m_fragment_constants.GetCount()) //if (m_fragment_constants.GetCount())

10
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -1783,8 +1783,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
case NV308A_COLOR: case NV308A_COLOR:
{ {
RSXTransformConstant c; color4f c;
c.id = m_dst_offset | ((u32)m_point_x << 2); u32 id = m_dst_offset | ((u32)m_point_x << 2);
if (count >= 1) if (count >= 1)
{ {
@ -1819,9 +1819,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
LOG_ERROR(RSX, "NV308A_COLOR: unknown arg count (%d)", count); LOG_ERROR(RSX, "NV308A_COLOR: unknown arg count (%d)", count);
} }
m_fragment_constants.push_back(c); fragment_constants[id] = c;
//LOG_WARNING(RSX, "NV308A_COLOR: [%d]: %f, %f, %f, %f", c.id, c.x, c.y, c.z, c.w);
break; break;
} }
@ -2147,7 +2145,7 @@ void RSXThread::End()
} }
m_indexed_array.Reset(); m_indexed_array.Reset();
m_fragment_constants.clear(); fragment_constants.clear();
m_cur_fragment_prog_num = 0; m_cur_fragment_prog_num = 0;
m_clear_surface_mask = 0; m_clear_surface_mask = 0;

4
rpcs3/Emu/RSX/RSXThread.h
View File

@ -154,9 +154,7 @@ public:
RSXIndexArrayData m_indexed_array; RSXIndexArrayData m_indexed_array;
std::unordered_map<u32, color4_base<f32>> transform_constants; std::unordered_map<u32, color4_base<f32>> transform_constants;
std::unordered_map<u32, color4_base<f32>> fragment_constants;
std::vector<RSXTransformConstant> m_fragment_constants;
u32 m_shader_ctrl, m_cur_fragment_prog_num; u32 m_shader_ctrl, m_cur_fragment_prog_num;
RSXFragmentProgram m_fragment_progs[rsx::limits::fragment_count]; RSXFragmentProgram m_fragment_progs[rsx::limits::fragment_count];