diff options
| author | 2017-01-27 20:51:59 -0800 | |
|---|---|---|
| committer | 2017-02-04 13:59:09 -0800 | |
| commit | 9017093f58fb08b85cfb842f305efa667d62cecb (patch) | |
| tree | 98a1e77b197a562a8f13565e62f2e8bb9220ff94 /src/citra_qt/debugger/graphics/graphics_surface.cpp | |
| parent | VideoCore: Split rasterizer regs from Regs struct (diff) | |
| download | yuzu-9017093f58fb08b85cfb842f305efa667d62cecb.tar.gz yuzu-9017093f58fb08b85cfb842f305efa667d62cecb.tar.xz yuzu-9017093f58fb08b85cfb842f305efa667d62cecb.zip | |
VideoCore: Split texturing regs from Regs struct
Diffstat (limited to 'src/citra_qt/debugger/graphics/graphics_surface.cpp')
| -rw-r--r-- | src/citra_qt/debugger/graphics/graphics_surface.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/citra_qt/debugger/graphics/graphics_surface.cpp b/src/citra_qt/debugger/graphics/graphics_surface.cpp index bd82b00d4..406a49f42 100644 --- a/src/citra_qt/debugger/graphics/graphics_surface.cpp +++ b/src/citra_qt/debugger/graphics/graphics_surface.cpp | |||
| @@ -512,7 +512,7 @@ void GraphicsSurfaceWidget::OnUpdate() { | |||
| 512 | break; | 512 | break; |
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | const auto texture = Pica::g_state.regs.GetTextures()[texture_index]; | 515 | const auto texture = Pica::g_state.regs.texturing.GetTextures()[texture_index]; |
| 516 | auto info = Pica::Texture::TextureInfo::FromPicaRegister(texture.config, texture.format); | 516 | auto info = Pica::Texture::TextureInfo::FromPicaRegister(texture.config, texture.format); |
| 517 | 517 | ||
| 518 | surface_address = info.physical_address; | 518 | surface_address = info.physical_address; |
| @@ -574,7 +574,7 @@ void GraphicsSurfaceWidget::OnUpdate() { | |||
| 574 | info.physical_address = surface_address; | 574 | info.physical_address = surface_address; |
| 575 | info.width = surface_width; | 575 | info.width = surface_width; |
| 576 | info.height = surface_height; | 576 | info.height = surface_height; |
| 577 | info.format = static_cast<Pica::Regs::TextureFormat>(surface_format); | 577 | info.format = static_cast<Pica::TexturingRegs::TextureFormat>(surface_format); |
| 578 | info.SetDefaultStride(); | 578 | info.SetDefaultStride(); |
| 579 | 579 | ||
| 580 | for (unsigned int y = 0; y < surface_height; ++y) { | 580 | for (unsigned int y = 0; y < surface_height; ++y) { |
| @@ -689,7 +689,8 @@ void GraphicsSurfaceWidget::SaveSurface() { | |||
| 689 | 689 | ||
| 690 | unsigned int GraphicsSurfaceWidget::NibblesPerPixel(GraphicsSurfaceWidget::Format format) { | 690 | unsigned int GraphicsSurfaceWidget::NibblesPerPixel(GraphicsSurfaceWidget::Format format) { |
| 691 | if (format <= Format::MaxTextureFormat) { | 691 | if (format <= Format::MaxTextureFormat) { |
| 692 | return Pica::Regs::NibblesPerPixel(static_cast<Pica::Regs::TextureFormat>(format)); | 692 | return Pica::TexturingRegs::NibblesPerPixel( |
| 693 | static_cast<Pica::TexturingRegs::TextureFormat>(format)); | ||
| 693 | } | 694 | } |
| 694 | 695 | ||
| 695 | switch (format) { | 696 | switch (format) { |