diff options
| author | 2014-08-28 15:17:09 -0300 | |
|---|---|---|
| committer | 2014-10-12 14:37:24 +0200 | |
| commit | fec7f6b035c1328cefac8a97cd26f3a79d033fa4 (patch) | |
| tree | 0451cf6cd83d19aa4bcb8e033546bae3b8cc5bcb /src/core/hw/gpu.cpp | |
| parent | OpenGL renderer: Shuffle initialization code around and rename functions. (diff) | |
| download | yuzu-fec7f6b035c1328cefac8a97cd26f3a79d033fa4.tar.gz yuzu-fec7f6b035c1328cefac8a97cd26f3a79d033fa4.tar.xz yuzu-fec7f6b035c1328cefac8a97cd26f3a79d033fa4.zip | |
Rename GPU::Regs::FramebufferFormat to PixelFormat
This name better represents what the enum does, and is less overloaded
in the context. (The whole register the enum is part of is also called
'format'.)
Diffstat (limited to 'src/core/hw/gpu.cpp')
| -rw-r--r-- | src/core/hw/gpu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 9c7192313..33a0e0fe7 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -89,7 +89,7 @@ inline void Write(u32 addr, const T data) { | |||
| 89 | } source_color = { 0, 0, 0, 0 }; | 89 | } source_color = { 0, 0, 0, 0 }; |
| 90 | 90 | ||
| 91 | switch (config.input_format) { | 91 | switch (config.input_format) { |
| 92 | case Regs::FramebufferFormat::RGBA8: | 92 | case Regs::PixelFormat::RGBA8: |
| 93 | { | 93 | { |
| 94 | // TODO: Most likely got the component order messed up. | 94 | // TODO: Most likely got the component order messed up. |
| 95 | u8* srcptr = source_pointer + x * 4 + y * config.input_width * 4; | 95 | u8* srcptr = source_pointer + x * 4 + y * config.input_width * 4; |
| @@ -106,7 +106,7 @@ inline void Write(u32 addr, const T data) { | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | switch (config.output_format) { | 108 | switch (config.output_format) { |
| 109 | /*case Regs::FramebufferFormat::RGBA8: | 109 | /*case Regs::PixelFormat::RGBA8: |
| 110 | { | 110 | { |
| 111 | // TODO: Untested | 111 | // TODO: Untested |
| 112 | u8* dstptr = (u32*)(dest_pointer + x * 4 + y * config.output_width * 4); | 112 | u8* dstptr = (u32*)(dest_pointer + x * 4 + y * config.output_width * 4); |
| @@ -117,7 +117,7 @@ inline void Write(u32 addr, const T data) { | |||
| 117 | break; | 117 | break; |
| 118 | }*/ | 118 | }*/ |
| 119 | 119 | ||
| 120 | case Regs::FramebufferFormat::RGB8: | 120 | case Regs::PixelFormat::RGB8: |
| 121 | { | 121 | { |
| 122 | // TODO: Most likely got the component order messed up. | 122 | // TODO: Most likely got the component order messed up. |
| 123 | u8* dstptr = dest_pointer + x * 3 + y * config.output_width * 3; | 123 | u8* dstptr = dest_pointer + x * 3 + y * config.output_width * 3; |
| @@ -236,13 +236,13 @@ void Init() { | |||
| 236 | framebuffer_top.width = 240; | 236 | framebuffer_top.width = 240; |
| 237 | framebuffer_top.height = 400; | 237 | framebuffer_top.height = 400; |
| 238 | framebuffer_top.stride = 3 * 240; | 238 | framebuffer_top.stride = 3 * 240; |
| 239 | framebuffer_top.color_format = Regs::FramebufferFormat::RGB8; | 239 | framebuffer_top.color_format = Regs::PixelFormat::RGB8; |
| 240 | framebuffer_top.active_fb = 0; | 240 | framebuffer_top.active_fb = 0; |
| 241 | 241 | ||
| 242 | framebuffer_sub.width = 240; | 242 | framebuffer_sub.width = 240; |
| 243 | framebuffer_sub.height = 320; | 243 | framebuffer_sub.height = 320; |
| 244 | framebuffer_sub.stride = 3 * 240; | 244 | framebuffer_sub.stride = 3 * 240; |
| 245 | framebuffer_sub.color_format = Regs::FramebufferFormat::RGB8; | 245 | framebuffer_sub.color_format = Regs::PixelFormat::RGB8; |
| 246 | framebuffer_sub.active_fb = 0; | 246 | framebuffer_sub.active_fb = 0; |
| 247 | 247 | ||
| 248 | NOTICE_LOG(GPU, "initialized OK"); | 248 | NOTICE_LOG(GPU, "initialized OK"); |