Skip to content

Commit

Permalink
VideoCommon/Statistics: Rename stats global to g_stats
Browse files Browse the repository at this point in the history 
Makes the global variable follow our convention of prefixing g_ on
global variables to make it obvious in surrounding code that it's not a
local variable.
  • Loading branch information
@lioncash
lioncash committed Jul 11, 2019
1 parent 9802a5e commit d4337ee
Show file tree
Hide file tree
Showing 20 changed files with 95 additions and 95 deletions.
10 changes: 5 additions & 5 deletions Source/Core/VideoBackends/D3D/VertexManager.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static void UpdateConstantBuffer(ID3D11Buffer* const buffer, const void* data, u
memcpy(map.pData, data, data_size); memcpy(map.pData, data, data_size);
D3D::context->Unmap(buffer, 0); D3D::context->Unmap(buffer, 0);


ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
} }


static ComPtr<ID3D11ShaderResourceView> static ComPtr<ID3D11ShaderResourceView>
Expand Down Expand Up @@ -166,7 +166,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff


*out_offset = m_texel_buffer_offset / elem_size; *out_offset = m_texel_buffer_offset / elem_size;
std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset, data, data_size); std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset, data, data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
m_texel_buffer_offset += data_size; m_texel_buffer_offset += data_size;


D3D::context->Unmap(m_texel_buffer.Get(), 0); D3D::context->Unmap(m_texel_buffer.Get(), 0);
Expand Down Expand Up @@ -194,7 +194,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset, data, data_size); std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset, data, data_size);
std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset + palette_byte_offset, std::memcpy(static_cast<u8*>(sr.pData) + m_texel_buffer_offset + palette_byte_offset,
palette_data, palette_size); palette_data, palette_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size);
*out_offset = m_texel_buffer_offset / elem_size; *out_offset = m_texel_buffer_offset / elem_size;
*out_palette_offset = (m_texel_buffer_offset + palette_byte_offset) / palette_elem_size; *out_palette_offset = (m_texel_buffer_offset + palette_byte_offset) / palette_elem_size;
m_texel_buffer_offset += palette_byte_offset + palette_size; m_texel_buffer_offset += palette_byte_offset + palette_size;
Expand Down Expand Up @@ -251,8 +251,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in


m_buffer_cursor = cursor + totalBufferSize; m_buffer_cursor = cursor + totalBufferSize;


ADDSTAT(stats.this_frame.bytes_vertex_streamed, vertexBufferSize); ADDSTAT(g_stats.this_frame.bytes_vertex_streamed, vertexBufferSize);
ADDSTAT(stats.this_frame.bytes_index_streamed, indexBufferSize); ADDSTAT(g_stats.this_frame.bytes_index_streamed, indexBufferSize);


D3D::stateman->SetVertexBuffer(m_buffers[m_current_buffer].Get(), vertex_stride, 0); D3D::stateman->SetVertexBuffer(m_buffers[m_current_buffer].Get(), vertex_stride, 0);
D3D::stateman->SetIndexBuffer(m_buffers[m_current_buffer].Get()); D3D::stateman->SetIndexBuffer(m_buffers[m_current_buffer].Get());
Expand Down
18 changes: 9 additions & 9 deletions Source/Core/VideoBackends/D3D12/VertexManager.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in
m_vertex_stream_buffer.CommitMemory(vertex_data_size); m_vertex_stream_buffer.CommitMemory(vertex_data_size);
m_index_stream_buffer.CommitMemory(index_data_size); m_index_stream_buffer.CommitMemory(index_data_size);


ADDSTAT(stats.this_frame.bytes_vertex_streamed, static_cast<int>(vertex_data_size)); ADDSTAT(g_stats.this_frame.bytes_vertex_streamed, static_cast<int>(vertex_data_size));
ADDSTAT(stats.this_frame.bytes_index_streamed, static_cast<int>(index_data_size)); ADDSTAT(g_stats.this_frame.bytes_index_streamed, static_cast<int>(index_data_size));


Renderer::GetInstance()->SetVertexBuffer(m_vertex_stream_buffer.GetGPUPointer(), vertex_stride, Renderer::GetInstance()->SetVertexBuffer(m_vertex_stream_buffer.GetGPUPointer(), vertex_stride,
m_vertex_stream_buffer.GetSize()); m_vertex_stream_buffer.GetSize());
Expand All @@ -137,7 +137,7 @@ void VertexManager::UpdateVertexShaderConstants()
std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &VertexShaderManager::constants, std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &VertexShaderManager::constants,
sizeof(VertexShaderConstants)); sizeof(VertexShaderConstants));
m_uniform_stream_buffer.CommitMemory(sizeof(VertexShaderConstants)); m_uniform_stream_buffer.CommitMemory(sizeof(VertexShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(VertexShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(VertexShaderConstants));
VertexShaderManager::dirty = false; VertexShaderManager::dirty = false;
} }


Expand All @@ -150,7 +150,7 @@ void VertexManager::UpdateGeometryShaderConstants()
std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &GeometryShaderManager::constants, std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &GeometryShaderManager::constants,
sizeof(GeometryShaderConstants)); sizeof(GeometryShaderConstants));
m_uniform_stream_buffer.CommitMemory(sizeof(GeometryShaderConstants)); m_uniform_stream_buffer.CommitMemory(sizeof(GeometryShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(GeometryShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(GeometryShaderConstants));
GeometryShaderManager::dirty = false; GeometryShaderManager::dirty = false;
} }


Expand All @@ -163,7 +163,7 @@ void VertexManager::UpdatePixelShaderConstants()
std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &PixelShaderManager::constants, std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &PixelShaderManager::constants,
sizeof(PixelShaderConstants)); sizeof(PixelShaderConstants));
m_uniform_stream_buffer.CommitMemory(sizeof(PixelShaderConstants)); m_uniform_stream_buffer.CommitMemory(sizeof(PixelShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(PixelShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(PixelShaderConstants));
PixelShaderManager::dirty = false; PixelShaderManager::dirty = false;
} }


Expand Down Expand Up @@ -227,7 +227,7 @@ void VertexManager::UploadAllConstants()


// Finally, flush buffer memory after copying // Finally, flush buffer memory after copying
m_uniform_stream_buffer.CommitMemory(allocation_size); m_uniform_stream_buffer.CommitMemory(allocation_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, allocation_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, allocation_size);


// Clear dirty flags // Clear dirty flags
VertexShaderManager::dirty = false; VertexShaderManager::dirty = false;
Expand All @@ -250,7 +250,7 @@ void VertexManager::UploadUtilityUniforms(const void* data, u32 data_size)
Renderer::GetInstance()->SetConstantBuffer(2, m_uniform_stream_buffer.GetCurrentGPUPointer()); Renderer::GetInstance()->SetConstantBuffer(2, m_uniform_stream_buffer.GetCurrentGPUPointer());
std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), data, data_size); std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), data, data_size);
m_uniform_stream_buffer.CommitMemory(data_size); m_uniform_stream_buffer.CommitMemory(data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
} }


bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBufferFormat format, bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBufferFormat format,
Expand All @@ -275,7 +275,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
std::memcpy(m_texel_stream_buffer.GetCurrentHostPointer(), data, data_size); std::memcpy(m_texel_stream_buffer.GetCurrentHostPointer(), data, data_size);
*out_offset = static_cast<u32>(m_texel_stream_buffer.GetCurrentOffset()) / elem_size; *out_offset = static_cast<u32>(m_texel_stream_buffer.GetCurrentOffset()) / elem_size;
m_texel_stream_buffer.CommitMemory(data_size); m_texel_stream_buffer.CommitMemory(data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
Renderer::GetInstance()->SetTextureDescriptor(0, m_texel_buffer_views[format].cpu_handle); Renderer::GetInstance()->SetTextureDescriptor(0, m_texel_buffer_views[format].cpu_handle);
return true; return true;
} }
Expand Down Expand Up @@ -312,7 +312,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
palette_elem_size; palette_elem_size;


m_texel_stream_buffer.CommitMemory(palette_byte_offset + palette_size); m_texel_stream_buffer.CommitMemory(palette_byte_offset + palette_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size);
Renderer::GetInstance()->SetTextureDescriptor(0, m_texel_buffer_views[format].cpu_handle); Renderer::GetInstance()->SetTextureDescriptor(0, m_texel_buffer_views[format].cpu_handle);
Renderer::GetInstance()->SetTextureDescriptor(1, m_texel_buffer_views[palette_format].cpu_handle); Renderer::GetInstance()->SetTextureDescriptor(1, m_texel_buffer_views[palette_format].cpu_handle);
return true; return true;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void SHADER::Bind() const
{ {
if (CurrentProgram != glprogid) if (CurrentProgram != glprogid)
{ {
INCSTAT(stats.this_frame.num_shader_changes); INCSTAT(g_stats.this_frame.num_shader_changes);
glUseProgram(glprogid); glUseProgram(glprogid);
CurrentProgram = glprogid; CurrentProgram = glprogid;
} }
Expand Down Expand Up @@ -248,7 +248,7 @@ void ProgramShaderCache::UploadConstants()
VertexShaderManager::dirty = false; VertexShaderManager::dirty = false;
GeometryShaderManager::dirty = false; GeometryShaderManager::dirty = false;


ADDSTAT(stats.this_frame.bytes_uniform_streamed, s_ubo_buffer_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, s_ubo_buffer_size);
} }
} }


Expand All @@ -264,7 +264,7 @@ void ProgramShaderCache::UploadConstants(const void* data, u32 data_size)
for (u32 index = 1; index <= 3; index++) for (u32 index = 1; index <= 3; index++)
glBindBufferRange(GL_UNIFORM_BUFFER, index, s_buffer->m_buffer, buffer.second, data_size); glBindBufferRange(GL_UNIFORM_BUFFER, index, s_buffer->m_buffer, buffer.second, data_size);


ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
} }


bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string& code) bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string& code)
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/VideoBackends/OGL/VertexManager.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
const u32 elem_size = GetTexelBufferElementSize(format); const u32 elem_size = GetTexelBufferElementSize(format);
const auto dst = m_texel_buffer->Map(data_size, elem_size); const auto dst = m_texel_buffer->Map(data_size, elem_size);
std::memcpy(dst.first, data, data_size); std::memcpy(dst.first, data, data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
*out_offset = dst.second / elem_size; *out_offset = dst.second / elem_size;
m_texel_buffer->Unmap(data_size); m_texel_buffer->Unmap(data_size);


Expand All @@ -130,7 +130,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
const u32 palette_byte_offset = Common::AlignUp(data_size, palette_elem_size); const u32 palette_byte_offset = Common::AlignUp(data_size, palette_elem_size);
std::memcpy(dst.first, data, data_size); std::memcpy(dst.first, data, data_size);
std::memcpy(dst.first + palette_byte_offset, palette_data, palette_size); std::memcpy(dst.first + palette_byte_offset, palette_data, palette_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size);
*out_offset = dst.second / elem_size; *out_offset = dst.second / elem_size;
*out_palette_offset = (dst.second + palette_byte_offset) / palette_elem_size; *out_palette_offset = (dst.second + palette_byte_offset) / palette_elem_size;
m_texel_buffer->Unmap(palette_byte_offset + palette_size); m_texel_buffer->Unmap(palette_byte_offset + palette_size);
Expand Down Expand Up @@ -181,8 +181,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in
m_vertex_buffer->Unmap(vertex_data_size); m_vertex_buffer->Unmap(vertex_data_size);
m_index_buffer->Unmap(index_data_size); m_index_buffer->Unmap(index_data_size);


ADDSTAT(stats.this_frame.bytes_vertex_streamed, vertex_data_size); ADDSTAT(g_stats.this_frame.bytes_vertex_streamed, vertex_data_size);
ADDSTAT(stats.this_frame.bytes_index_streamed, index_data_size); ADDSTAT(g_stats.this_frame.bytes_index_streamed, index_data_size);
} }


void VertexManager::UploadUniforms() void VertexManager::UploadUniforms()
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/VideoBackends/Software/Clipper.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static void ClipTriangle(int* indices, int* numIndices)
POLY_CLIP(CLIP_POS_Z_BIT, 0, 0, 0, 1); POLY_CLIP(CLIP_POS_Z_BIT, 0, 0, 0, 1);
POLY_CLIP(CLIP_NEG_Z_BIT, 0, 0, 1, 1); POLY_CLIP(CLIP_NEG_Z_BIT, 0, 0, 1, 1);


INCSTAT(stats.this_frame.num_triangles_clipped); INCSTAT(g_stats.this_frame.num_triangles_clipped);


// transform the poly in inlist into triangles // transform the poly in inlist into triangles
indices[0] = inlist[0]; indices[0] = inlist[0];
Expand Down Expand Up @@ -288,7 +288,7 @@ static void ClipLine(int* indices)


void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2) void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2)
{ {
INCSTAT(stats.this_frame.num_triangles_in) INCSTAT(g_stats.this_frame.num_triangles_in)


bool backface; bool backface;


Expand Down Expand Up @@ -410,7 +410,7 @@ bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const Outp


if (mask) if (mask)
{ {
INCSTAT(stats.this_frame.num_triangles_rejected) INCSTAT(g_stats.this_frame.num_triangles_rejected)
return false; return false;
} }


Expand All @@ -430,13 +430,13 @@ bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const Outp


if ((bpmem.genMode.cullmode & 1) && !backface) // cull frontfacing if ((bpmem.genMode.cullmode & 1) && !backface) // cull frontfacing
{ {
INCSTAT(stats.this_frame.num_triangles_culled) INCSTAT(g_stats.this_frame.num_triangles_culled)
return false; return false;
} }


if ((bpmem.genMode.cullmode & 2) && backface) // cull backfacing if ((bpmem.genMode.cullmode & 2) && backface) // cull backfacing
{ {
INCSTAT(stats.this_frame.num_triangles_culled) INCSTAT(g_stats.this_frame.num_triangles_culled)
return false; return false;
} }


Expand Down
18 changes: 9 additions & 9 deletions Source/Core/VideoBackends/Software/DebugUtil.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void DumpActiveTextures()
{ {
SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png", SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png",
File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
stats.this_frame.num_drawn_objects, stageNum, texmap, mip), g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip),
texmap, mip); texmap, mip);
} }
} }
Expand All @@ -124,7 +124,7 @@ void DumpActiveTextures()
{ {
SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png", SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png",
File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
stats.this_frame.num_drawn_objects, stageNum, texmap, mip), g_stats.this_frame.num_drawn_objects, stageNum, texmap, mip),
texmap, mip); texmap, mip);
} }
} }
Expand Down Expand Up @@ -192,8 +192,8 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* nam
void OnObjectBegin() void OnObjectBegin()
{ {
if (g_ActiveConfig.bDumpTextures && if (g_ActiveConfig.bDumpTextures &&
stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart && g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart &&
stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd)
{ {
DumpActiveTextures(); DumpActiveTextures();
} }
Expand All @@ -202,11 +202,11 @@ void OnObjectBegin()
void OnObjectEnd() void OnObjectEnd()
{ {
if (g_ActiveConfig.bDumpObjects && if (g_ActiveConfig.bDumpObjects &&
stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart && g_stats.this_frame.num_drawn_objects >= g_ActiveConfig.drawStart &&
stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd)
{ {
DumpEfb(StringFromFormat("%sobject%i.png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(), DumpEfb(StringFromFormat("%sobject%i.png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(),
stats.this_frame.num_drawn_objects)); g_stats.this_frame.num_drawn_objects));
} }


for (int i = 0; i < NUM_OBJECT_BUFFERS; i++) for (int i = 0; i < NUM_OBJECT_BUFFERS; i++)
Expand All @@ -216,13 +216,13 @@ void OnObjectEnd()
DrawnToBuffer[i] = false; DrawnToBuffer[i] = false;
std::string filename = StringFromFormat( std::string filename = StringFromFormat(
"%sobject%i_%s(%i).png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(), "%sobject%i_%s(%i).png", File::GetUserPath(D_DUMPOBJECTS_IDX).c_str(),
stats.this_frame.num_drawn_objects, ObjectBufferName[i], i - BufferBase[i]); g_stats.this_frame.num_drawn_objects, ObjectBufferName[i], i - BufferBase[i]);


TextureToPng((u8*)ObjectBuffer[i], EFB_WIDTH * 4, filename, EFB_WIDTH, EFB_HEIGHT, true); TextureToPng((u8*)ObjectBuffer[i], EFB_WIDTH * 4, filename, EFB_WIDTH, EFB_HEIGHT, true);
memset(ObjectBuffer[i], 0, EFB_WIDTH * EFB_HEIGHT * sizeof(u32)); memset(ObjectBuffer[i], 0, EFB_WIDTH * EFB_HEIGHT * sizeof(u32));
} }
} }


stats.this_frame.num_drawn_objects++; g_stats.this_frame.num_drawn_objects++;
} }
} // namespace DebugUtil } // namespace DebugUtil
4 changes: 2 additions & 2 deletions Source/Core/VideoBackends/Software/Rasterizer.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void SetTevReg(int reg, int comp, s16 color)


static void Draw(s32 x, s32 y, s32 xi, s32 yi) static void Draw(s32 x, s32 y, s32 xi, s32 yi)
{ {
INCSTAT(stats.this_frame.rasterized_pixels); INCSTAT(g_stats.this_frame.rasterized_pixels);


float dx = vertexOffsetX + (float)(x - vertex0X); float dx = vertexOffsetX + (float)(x - vertex0X);
float dy = vertexOffsetY + (float)(y - vertex0Y); float dy = vertexOffsetY + (float)(y - vertex0Y);
Expand Down Expand Up @@ -267,7 +267,7 @@ static void BuildBlock(s32 blockX, s32 blockY)
void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1, void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1,
const OutputVertexData* v2) const OutputVertexData* v2)
{ {
INCSTAT(stats.this_frame.num_triangles_drawn); INCSTAT(g_stats.this_frame.num_triangles_drawn);


// adapted from http://devmaster.net/posts/6145/advanced-rasterization // adapted from http://devmaster.net/posts/6145/advanced-rasterization


Expand Down
2 changes: 1 addition & 1 deletion Source/Core/VideoBackends/Software/SWVertexLoader.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_
// assemble and rasterize the primitive // assemble and rasterize the primitive
m_setup_unit.SetupVertex(); m_setup_unit.SetupVertex();


INCSTAT(stats.this_frame.num_vertices_loaded) INCSTAT(g_stats.this_frame.num_vertices_loaded)
} }


DebugUtil::OnObjectEnd(); DebugUtil::OnObjectEnd();
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/VideoBackends/Software/Tev.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void Tev::Draw()
ASSERT(Position[0] >= 0 && Position[0] < EFB_WIDTH); ASSERT(Position[0] >= 0 && Position[0] < EFB_WIDTH);
ASSERT(Position[1] >= 0 && Position[1] < EFB_HEIGHT); ASSERT(Position[1] >= 0 && Position[1] < EFB_HEIGHT);


INCSTAT(stats.this_frame.tev_pixels_in); INCSTAT(g_stats.this_frame.tev_pixels_in);


// initial color values // initial color values
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
Expand Down Expand Up @@ -869,7 +869,7 @@ void Tev::Draw()
} }
#endif #endif


INCSTAT(stats.this_frame.tev_pixels_out); INCSTAT(g_stats.this_frame.tev_pixels_out);
EfbInterface::IncPerfCounterQuadCount(PQ_BLEND_INPUT); EfbInterface::IncPerfCounterQuadCount(PQ_BLEND_INPUT);


EfbInterface::BlendTev(Position[0], Position[1], output); EfbInterface::BlendTev(Position[0], Position[1], output);
Expand Down
18 changes: 9 additions & 9 deletions Source/Core/VideoBackends/Vulkan/VertexManager.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in
m_vertex_stream_buffer->CommitMemory(vertex_data_size); m_vertex_stream_buffer->CommitMemory(vertex_data_size);
m_index_stream_buffer->CommitMemory(index_data_size); m_index_stream_buffer->CommitMemory(index_data_size);


ADDSTAT(stats.this_frame.bytes_vertex_streamed, static_cast<int>(vertex_data_size)); ADDSTAT(g_stats.this_frame.bytes_vertex_streamed, static_cast<int>(vertex_data_size));
ADDSTAT(stats.this_frame.bytes_index_streamed, static_cast<int>(index_data_size)); ADDSTAT(g_stats.this_frame.bytes_index_streamed, static_cast<int>(index_data_size));


StateTracker::GetInstance()->SetVertexBuffer(m_vertex_stream_buffer->GetBuffer(), 0); StateTracker::GetInstance()->SetVertexBuffer(m_vertex_stream_buffer->GetBuffer(), 0);
StateTracker::GetInstance()->SetIndexBuffer(m_index_stream_buffer->GetBuffer(), 0, StateTracker::GetInstance()->SetIndexBuffer(m_index_stream_buffer->GetBuffer(), 0,
Expand All @@ -207,7 +207,7 @@ void VertexManager::UpdateVertexShaderConstants()
std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &VertexShaderManager::constants, std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &VertexShaderManager::constants,
sizeof(VertexShaderConstants)); sizeof(VertexShaderConstants));
m_uniform_stream_buffer->CommitMemory(sizeof(VertexShaderConstants)); m_uniform_stream_buffer->CommitMemory(sizeof(VertexShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(VertexShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(VertexShaderConstants));
VertexShaderManager::dirty = false; VertexShaderManager::dirty = false;
} }


Expand All @@ -222,7 +222,7 @@ void VertexManager::UpdateGeometryShaderConstants()
std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &GeometryShaderManager::constants, std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &GeometryShaderManager::constants,
sizeof(GeometryShaderConstants)); sizeof(GeometryShaderConstants));
m_uniform_stream_buffer->CommitMemory(sizeof(GeometryShaderConstants)); m_uniform_stream_buffer->CommitMemory(sizeof(GeometryShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(GeometryShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(GeometryShaderConstants));
GeometryShaderManager::dirty = false; GeometryShaderManager::dirty = false;
} }


Expand All @@ -237,7 +237,7 @@ void VertexManager::UpdatePixelShaderConstants()
std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &PixelShaderManager::constants, std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &PixelShaderManager::constants,
sizeof(PixelShaderConstants)); sizeof(PixelShaderConstants));
m_uniform_stream_buffer->CommitMemory(sizeof(PixelShaderConstants)); m_uniform_stream_buffer->CommitMemory(sizeof(PixelShaderConstants));
ADDSTAT(stats.this_frame.bytes_uniform_streamed, sizeof(PixelShaderConstants)); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, sizeof(PixelShaderConstants));
PixelShaderManager::dirty = false; PixelShaderManager::dirty = false;
} }


Expand Down Expand Up @@ -302,7 +302,7 @@ void VertexManager::UploadAllConstants()


// Finally, flush buffer memory after copying // Finally, flush buffer memory after copying
m_uniform_stream_buffer->CommitMemory(allocation_size); m_uniform_stream_buffer->CommitMemory(allocation_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, allocation_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, allocation_size);


// Clear dirty flags // Clear dirty flags
VertexShaderManager::dirty = false; VertexShaderManager::dirty = false;
Expand All @@ -324,7 +324,7 @@ void VertexManager::UploadUtilityUniforms(const void* data, u32 data_size)
m_uniform_stream_buffer->GetBuffer(), m_uniform_stream_buffer->GetCurrentOffset(), data_size); m_uniform_stream_buffer->GetBuffer(), m_uniform_stream_buffer->GetCurrentOffset(), data_size);
std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), data, data_size); std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), data, data_size);
m_uniform_stream_buffer->CommitMemory(data_size); m_uniform_stream_buffer->CommitMemory(data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
} }


bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBufferFormat format, bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBufferFormat format,
Expand All @@ -349,7 +349,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
std::memcpy(m_texel_stream_buffer->GetCurrentHostPointer(), data, data_size); std::memcpy(m_texel_stream_buffer->GetCurrentHostPointer(), data, data_size);
*out_offset = static_cast<u32>(m_texel_stream_buffer->GetCurrentOffset()) / elem_size; *out_offset = static_cast<u32>(m_texel_stream_buffer->GetCurrentOffset()) / elem_size;
m_texel_stream_buffer->CommitMemory(data_size); m_texel_stream_buffer->CommitMemory(data_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, data_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
StateTracker::GetInstance()->SetTexelBuffer(0, m_texel_buffer_views[format]); StateTracker::GetInstance()->SetTexelBuffer(0, m_texel_buffer_views[format]);
return true; return true;
} }
Expand Down Expand Up @@ -386,7 +386,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff
palette_elem_size; palette_elem_size;


m_texel_stream_buffer->CommitMemory(palette_byte_offset + palette_size); m_texel_stream_buffer->CommitMemory(palette_byte_offset + palette_size);
ADDSTAT(stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size); ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, palette_byte_offset + palette_size);
StateTracker::GetInstance()->SetTexelBuffer(0, m_texel_buffer_views[format]); StateTracker::GetInstance()->SetTexelBuffer(0, m_texel_buffer_views[format]);
StateTracker::GetInstance()->SetTexelBuffer(1, m_texel_buffer_views[palette_format]); StateTracker::GetInstance()->SetTexelBuffer(1, m_texel_buffer_views[palette_format]);
return true; return true;
Expand Down
Loading

0 comments on commit d4337ee

Please sign in to comment.