ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU/HW: Fix typo in –IncludeVRAMDirtyRectangle() name

This commit is contained in:
Connor McLaughlin 2021-02-07 20:00:16 +10:00
parent 4a240958ff
commit c043643c4d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/gpu_hw.cpp
View File

@ -947,7 +947,7 @@ GPU_HW::VRAMCopyUBOData GPU_HW::GetVRAMCopyUBOData(u32 src_x, u32 src_y, u32 dst
return uniforms; return uniforms;
} }
void GPU_HW::IncludeVRAMDityRectangle(const Common::Rectangle<u32>& rect) void GPU_HW::IncludeVRAMDirtyRectangle(const Common::Rectangle<u32>& rect)
{ {
m_vram_dirty_rect.Include(rect); m_vram_dirty_rect.Include(rect);
@ -1022,14 +1022,14 @@ void GPU_HW::ResetBatchVertexDepth()
void GPU_HW::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color) void GPU_HW::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color)
{ {
IncludeVRAMDityRectangle( IncludeVRAMDirtyRectangle(
Common::Rectangle<u32>::FromExtents(x, y, width, height).Clamped(0, 0, VRAM_WIDTH, VRAM_HEIGHT)); Common::Rectangle<u32>::FromExtents(x, y, width, height).Clamped(0, 0, VRAM_WIDTH, VRAM_HEIGHT));
} }
void GPU_HW::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void* data, bool set_mask, bool check_mask) void GPU_HW::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void* data, bool set_mask, bool check_mask)
{ {
DebugAssert((x + width) <= VRAM_WIDTH && (y + height) <= VRAM_HEIGHT); DebugAssert((x + width) <= VRAM_WIDTH && (y + height) <= VRAM_HEIGHT);
IncludeVRAMDityRectangle(Common::Rectangle<u32>::FromExtents(x, y, width, height)); IncludeVRAMDirtyRectangle(Common::Rectangle<u32>::FromExtents(x, y, width, height));
if (check_mask) if (check_mask)
{ {
@ -1040,7 +1040,7 @@ void GPU_HW::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void* data, b
void GPU_HW::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 width, u32 height) void GPU_HW::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 width, u32 height)
{ {
IncludeVRAMDityRectangle( IncludeVRAMDirtyRectangle(
Common::Rectangle<u32>::FromExtents(dst_x, dst_y, width, height).Clamped(0, 0, VRAM_WIDTH, VRAM_HEIGHT)); Common::Rectangle<u32>::FromExtents(dst_x, dst_y, width, height).Clamped(0, 0, VRAM_WIDTH, VRAM_HEIGHT));
if (m_GPUSTAT.check_mask_before_draw) if (m_GPUSTAT.check_mask_before_draw)

2
src/core/gpu_hw.h
View File

@ -194,7 +194,7 @@ protected:
m_draw_mode.SetTexturePageChanged(); m_draw_mode.SetTexturePageChanged();
} }
void ClearVRAMDirtyRectangle() { m_vram_dirty_rect.SetInvalid(); } void ClearVRAMDirtyRectangle() { m_vram_dirty_rect.SetInvalid(); }
void IncludeVRAMDityRectangle(const Common::Rectangle<u32>& rect); void IncludeVRAMDirtyRectangle(const Common::Rectangle<u32>& rect);
bool IsFlushed() const { return m_batch_current_vertex_ptr == m_batch_start_vertex_ptr; } bool IsFlushed() const { return m_batch_current_vertex_ptr == m_batch_start_vertex_ptr; }

2
src/core/gpu_hw_d3d11.cpp
View File

@ -1037,7 +1037,7 @@ void GPU_HW_D3D11::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 widt
const Common::Rectangle<u32> dst_bounds = GetVRAMTransferBounds(dst_x, dst_y, width, height); const Common::Rectangle<u32> dst_bounds = GetVRAMTransferBounds(dst_x, dst_y, width, height);
if (m_vram_dirty_rect.Intersects(src_bounds)) if (m_vram_dirty_rect.Intersects(src_bounds))
UpdateVRAMReadTexture(); UpdateVRAMReadTexture();
IncludeVRAMDityRectangle(dst_bounds); IncludeVRAMDirtyRectangle(dst_bounds);
const VRAMCopyUBOData uniforms = GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height); const VRAMCopyUBOData uniforms = GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height);

4
src/core/gpu_hw_opengl.cpp
View File

@ -1174,7 +1174,7 @@ void GPU_HW_OpenGL::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 wid
{ {
if (src_dirty) if (src_dirty)
UpdateVRAMReadTexture(); UpdateVRAMReadTexture();
IncludeVRAMDityRectangle(dst_bounds); IncludeVRAMDirtyRectangle(dst_bounds);
VRAMCopyUBOData uniforms = GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height); VRAMCopyUBOData uniforms = GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height);
uniforms.u_src_y = m_vram_texture.GetHeight() - uniforms.u_src_y - uniforms.u_height; uniforms.u_src_y = m_vram_texture.GetHeight() - uniforms.u_src_y - uniforms.u_height;
@ -1243,7 +1243,7 @@ void GPU_HW_OpenGL::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 wid
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
IncludeVRAMDityRectangle(dst_bounds); IncludeVRAMDirtyRectangle(dst_bounds);
} }
void GPU_HW_OpenGL::UpdateVRAMReadTexture() void GPU_HW_OpenGL::UpdateVRAMReadTexture()

2
src/core/gpu_hw_vulkan.cpp
View File

@ -1557,7 +1557,7 @@ void GPU_HW_Vulkan::CopyVRAM(u32 src_x, u32 src_y, u32 dst_x, u32 dst_y, u32 wid
const Common::Rectangle<u32> dst_bounds = GetVRAMTransferBounds(dst_x, dst_y, width, height); const Common::Rectangle<u32> dst_bounds = GetVRAMTransferBounds(dst_x, dst_y, width, height);
if (m_vram_dirty_rect.Intersects(src_bounds)) if (m_vram_dirty_rect.Intersects(src_bounds))
UpdateVRAMReadTexture(); UpdateVRAMReadTexture();
IncludeVRAMDityRectangle(dst_bounds); IncludeVRAMDirtyRectangle(dst_bounds);
const VRAMCopyUBOData uniforms(GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height)); const VRAMCopyUBOData uniforms(GetVRAMCopyUBOData(src_x, src_y, dst_x, dst_y, width, height));
const Common::Rectangle<u32> dst_bounds_scaled(dst_bounds * m_resolution_scale); const Common::Rectangle<u32> dst_bounds_scaled(dst_bounds * m_resolution_scale);