diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-03-06 19:54:40 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-10-06 21:00:52 +0200 |
commit | ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5 (patch) | |
tree | defc91f25d4430b62bdf45af4933edbf46171f93 /src/video_core/renderer_opengl | |
parent | Shader Decompiler: Fix dangerous behavior of invalid iterator insertion. (diff) | |
download | yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar.gz yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar.bz2 yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar.lz yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar.xz yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.tar.zst yuzu-ba34cf0a691bc73ae6b2d8db6019b1f10d22dde5.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_compute_pipeline.cpp | 5 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_graphics_pipeline.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index 26b51f442..26d066004 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -100,8 +100,9 @@ void ComputePipeline::Configure() { const u32 secondary_offset{desc.secondary_cbuf_offset + index_offset}; const GPUVAddr separate_addr{cbufs[desc.secondary_cbuf_index].Address() + secondary_offset}; - const u32 lhs_raw{gpu_memory->Read<u32>(addr)}; - const u32 rhs_raw{gpu_memory->Read<u32>(separate_addr)}; + const u32 lhs_raw{gpu_memory->Read<u32>(addr) << desc.shift_left}; + const u32 rhs_raw{gpu_memory->Read<u32>(separate_addr) + << desc.secondary_shift_left}; return TexturePair(lhs_raw | rhs_raw, via_header_index); } } diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index c877d7792..41493a7da 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -312,8 +312,9 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const u32 second_offset{desc.secondary_cbuf_offset + index_offset}; const GPUVAddr separate_addr{cbufs[desc.secondary_cbuf_index].address + second_offset}; - const u32 lhs_raw{gpu_memory->Read<u32>(addr)}; - const u32 rhs_raw{gpu_memory->Read<u32>(separate_addr)}; + const u32 lhs_raw{gpu_memory->Read<u32>(addr) << desc.shift_left}; + const u32 rhs_raw{gpu_memory->Read<u32>(separate_addr) + << desc.secondary_shift_left}; const u32 raw{lhs_raw | rhs_raw}; return TexturePair(raw, via_header_index); } |