diff options
| author |  bunnei | 2018-04-14 20:40:39 -0400 |
|---|---|---|
| committer |  GitHub | 2018-04-14 20:40:39 -0400 |
| commit | fdca7b5f7a4ca626c15e70ae6f684e88686277f5 (patch) | |
| tree | 57b8c1f1952c53d54a0c14b00543dd21302d661b /src/video_core/utils.h | |
| parent | Merge pull request #323 from Hexagon12/stub-hid (diff) | |
| parent | shaders: Add NumTextureSamplers const, remove unused #pragma. (diff) | |
| download | yuzu-fdca7b5f7a4ca626c15e70ae6f684e88686277f5.tar.gz yuzu-fdca7b5f7a4ca626c15e70ae6f684e88686277f5.tar.xz yuzu-fdca7b5f7a4ca626c15e70ae6f684e88686277f5.zip | |
Merge pull request #329 from bunnei/shader-gen-part-1
OpenGL shader generation part 1
Diffstat (limited to 'src/video_core/utils.h')
| -rw-r--r-- | src/video_core/utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/utils.h b/src/video_core/utils.h index be0f7e22b..e0a14d48f 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h | |||
| @@ -151,7 +151,7 @@ static inline void MortonCopyPixels128(u32 width, u32 height, u32 bytes_per_pixe | |||
| 151 | const u32 coarse_y = y & ~127; | 151 | const u32 coarse_y = y & ~127; |
| 152 | u32 morton_offset = | 152 | u32 morton_offset = |
| 153 | GetMortonOffset128(x, y, bytes_per_pixel) + coarse_y * width * bytes_per_pixel; | 153 | GetMortonOffset128(x, y, bytes_per_pixel) + coarse_y * width * bytes_per_pixel; |
| 154 | u32 gl_pixel_index = (x + (height - 1 - y) * width) * gl_bytes_per_pixel; | 154 | u32 gl_pixel_index = (x + y * width) * gl_bytes_per_pixel; |
| 155 | 155 | ||
| 156 | data_ptrs[morton_to_gl] = morton_data + morton_offset; | 156 | data_ptrs[morton_to_gl] = morton_data + morton_offset; |
| 157 | data_ptrs[!morton_to_gl] = &gl_data[gl_pixel_index]; | 157 | data_ptrs[!morton_to_gl] = &gl_data[gl_pixel_index]; |