diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-07-10 23:34:50 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-07-10 23:34:54 -0400 |
| commit | d4337eebdeb999df380394cdd20d054f5e9fe375 (patch) | |
| tree | b2c04979677aa138cbc3202c510a96040ba9adcd /Source/Core/VideoBackends | |
| parent | 9802a5e16b5860d1c6b42beeb1b8ca883467e1b1 (diff) | |
VideoCommon/Statistics: Rename stats global to g_stats
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.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/VertexManager.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3D12/VertexManager.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/VertexManager.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/Clipper.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/DebugUtil.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/Rasterizer.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/Tev.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/VertexManager.cpp | 18 |
10 files changed, 49 insertions, 49 deletions
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp index e470c8192d..f2a844fde2 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp @@ -50,7 +50,7 @@ static void UpdateConstantBuffer(ID3D11Buffer* const buffer, const void* data, u memcpy(map.pData, data, data_size); 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> @@ -166,7 +166,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff *out_offset = m_texel_buffer_offset / elem_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; D3D::context->Unmap(m_texel_buffer.Get(), 0); @@ -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 + 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 = m_texel_buffer_offset / elem_size; *out_palette_offset = (m_texel_buffer_offset + palette_byte_offset) / palette_elem_size; m_texel_buffer_offset += palette_byte_offset + palette_size; @@ -251,8 +251,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in m_buffer_cursor = cursor + totalBufferSize; - ADDSTAT(stats.this_frame.bytes_vertex_streamed, vertexBufferSize); - ADDSTAT(stats.this_frame.bytes_index_streamed, indexBufferSize); + ADDSTAT(g_stats.this_frame.bytes_vertex_streamed, vertexBufferSize); + ADDSTAT(g_stats.this_frame.bytes_index_streamed, indexBufferSize); D3D::stateman->SetVertexBuffer(m_buffers[m_current_buffer].Get(), vertex_stride, 0); D3D::stateman->SetIndexBuffer(m_buffers[m_current_buffer].Get()); diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.cpp b/Source/Core/VideoBackends/D3D12/VertexManager.cpp index 2b6cb17117..235fa43750 100644 --- a/Source/Core/VideoBackends/D3D12/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D12/VertexManager.cpp @@ -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_index_stream_buffer.CommitMemory(index_data_size); - ADDSTAT(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_vertex_streamed, static_cast<int>(vertex_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, m_vertex_stream_buffer.GetSize()); @@ -137,7 +137,7 @@ void VertexManager::UpdateVertexShaderConstants() std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &VertexShaderManager::constants, 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; } @@ -150,7 +150,7 @@ void VertexManager::UpdateGeometryShaderConstants() std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &GeometryShaderManager::constants, 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; } @@ -163,7 +163,7 @@ void VertexManager::UpdatePixelShaderConstants() std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), &PixelShaderManager::constants, 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; } @@ -227,7 +227,7 @@ void VertexManager::UploadAllConstants() // Finally, flush buffer memory after copying 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 VertexShaderManager::dirty = false; @@ -250,7 +250,7 @@ void VertexManager::UploadUtilityUniforms(const void* data, u32 data_size) Renderer::GetInstance()->SetConstantBuffer(2, m_uniform_stream_buffer.GetCurrentGPUPointer()); std::memcpy(m_uniform_stream_buffer.GetCurrentHostPointer(), data, 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, @@ -275,7 +275,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff std::memcpy(m_texel_stream_buffer.GetCurrentHostPointer(), data, data_size); *out_offset = static_cast<u32>(m_texel_stream_buffer.GetCurrentOffset()) / elem_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); return true; } @@ -312,7 +312,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff palette_elem_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(1, m_texel_buffer_views[palette_format].cpu_handle); return true; diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 593a3186dc..c9bbdc2b36 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -158,7 +158,7 @@ void SHADER::Bind() const { if (CurrentProgram != glprogid) { - INCSTAT(stats.this_frame.num_shader_changes); + INCSTAT(g_stats.this_frame.num_shader_changes); glUseProgram(glprogid); CurrentProgram = glprogid; } @@ -248,7 +248,7 @@ void ProgramShaderCache::UploadConstants() VertexShaderManager::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); } } @@ -264,7 +264,7 @@ void ProgramShaderCache::UploadConstants(const void* data, u32 data_size) for (u32 index = 1; index <= 3; index++) 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) diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index 211b55d1c7..0170a20a0b 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -105,7 +105,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff const u32 elem_size = GetTexelBufferElementSize(format); const auto dst = m_texel_buffer->Map(data_size, elem_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; m_texel_buffer->Unmap(data_size); @@ -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); std::memcpy(dst.first, data, data_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_palette_offset = (dst.second + palette_byte_offset) / palette_elem_size; m_texel_buffer->Unmap(palette_byte_offset + palette_size); @@ -181,8 +181,8 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in m_vertex_buffer->Unmap(vertex_data_size); m_index_buffer->Unmap(index_data_size); - ADDSTAT(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_vertex_streamed, vertex_data_size); + ADDSTAT(g_stats.this_frame.bytes_index_streamed, index_data_size); } void VertexManager::UploadUniforms() diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index 5608ee5884..67712fa9da 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -221,7 +221,7 @@ static void ClipTriangle(int* indices, int* numIndices) POLY_CLIP(CLIP_POS_Z_BIT, 0, 0, 0, 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 indices[0] = inlist[0]; @@ -288,7 +288,7 @@ static void ClipLine(int* indices) 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; @@ -410,7 +410,7 @@ bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const Outp if (mask) { - INCSTAT(stats.this_frame.num_triangles_rejected) + INCSTAT(g_stats.this_frame.num_triangles_rejected) return false; } @@ -430,13 +430,13 @@ bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const Outp 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; } 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; } diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index fa54450780..7b9be6e503 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -106,7 +106,7 @@ void DumpActiveTextures() { SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png", 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); } } @@ -124,7 +124,7 @@ void DumpActiveTextures() { SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png", 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); } } @@ -192,8 +192,8 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* nam void OnObjectBegin() { if (g_ActiveConfig.bDumpTextures && - 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.drawStart && + g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) { DumpActiveTextures(); } @@ -202,11 +202,11 @@ void OnObjectBegin() void OnObjectEnd() { if (g_ActiveConfig.bDumpObjects && - 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.drawStart && + g_stats.this_frame.num_drawn_objects < g_ActiveConfig.drawEnd) { 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++) @@ -216,13 +216,13 @@ void OnObjectEnd() DrawnToBuffer[i] = false; std::string filename = StringFromFormat( "%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); 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 diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index a904d28498..5fc21340fe 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -72,7 +72,7 @@ void SetTevReg(int reg, int comp, s16 color) 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 dy = vertexOffsetY + (float)(y - vertex0Y); @@ -267,7 +267,7 @@ static void BuildBlock(s32 blockX, s32 blockY) void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1, 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 diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index f0cfb1c3b9..266f1046a1 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -91,7 +91,7 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_ // assemble and rasterize the primitive m_setup_unit.SetupVertex(); - INCSTAT(stats.this_frame.num_vertices_loaded) + INCSTAT(g_stats.this_frame.num_vertices_loaded) } DebugUtil::OnObjectEnd(); diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index cafb5f346e..b0285867b9 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -568,7 +568,7 @@ void Tev::Draw() ASSERT(Position[0] >= 0 && Position[0] < EFB_WIDTH); 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 for (int i = 0; i < 4; i++) @@ -869,7 +869,7 @@ void Tev::Draw() } #endif - INCSTAT(stats.this_frame.tev_pixels_out); + INCSTAT(g_stats.this_frame.tev_pixels_out); EfbInterface::IncPerfCounterQuadCount(PQ_BLEND_INPUT); EfbInterface::BlendTev(Position[0], Position[1], output); diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp index c6fdd90a4f..ffcf1f0927 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp @@ -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_index_stream_buffer->CommitMemory(index_data_size); - ADDSTAT(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_vertex_streamed, static_cast<int>(vertex_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()->SetIndexBuffer(m_index_stream_buffer->GetBuffer(), 0, @@ -207,7 +207,7 @@ void VertexManager::UpdateVertexShaderConstants() std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &VertexShaderManager::constants, 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; } @@ -222,7 +222,7 @@ void VertexManager::UpdateGeometryShaderConstants() std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &GeometryShaderManager::constants, 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; } @@ -237,7 +237,7 @@ void VertexManager::UpdatePixelShaderConstants() std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), &PixelShaderManager::constants, 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; } @@ -302,7 +302,7 @@ void VertexManager::UploadAllConstants() // Finally, flush buffer memory after copying 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 VertexShaderManager::dirty = false; @@ -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); std::memcpy(m_uniform_stream_buffer->GetCurrentHostPointer(), data, 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, @@ -349,7 +349,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff std::memcpy(m_texel_stream_buffer->GetCurrentHostPointer(), data, data_size); *out_offset = static_cast<u32>(m_texel_stream_buffer->GetCurrentOffset()) / elem_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]); return true; } @@ -386,7 +386,7 @@ bool VertexManager::UploadTexelBuffer(const void* data, u32 data_size, TexelBuff palette_elem_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(1, m_texel_buffer_views[palette_format]); return true; |
