emu-mirror/citra-nightly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename GPU::Regs::FramebufferFormat to PixelFormat

Browse Source 
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'.)
This commit is contained in:
Yuri Kunde Schlesner 2014-08-28 15:17:09 -03:00 committed by Tony Wasserka
parent 5f598a5e2c
commit fec7f6b035
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/hw/gpu.cpp
View File

@ -89,7 +89,7 @@ inline void Write(u32 addr, const T data) {
} source_color = { 0, 0, 0, 0 }; } source_color = { 0, 0, 0, 0 };
switch (config.input_format) { switch (config.input_format) {
case Regs::FramebufferFormat::RGBA8: case Regs::PixelFormat::RGBA8:
{ {
// TODO: Most likely got the component order messed up. // TODO: Most likely got the component order messed up.
u8* srcptr = source_pointer + x * 4 + y * config.input_width * 4; u8* srcptr = source_pointer + x * 4 + y * config.input_width * 4;
@ -106,7 +106,7 @@ inline void Write(u32 addr, const T data) {
} }
switch (config.output_format) { switch (config.output_format) {
/*case Regs::FramebufferFormat::RGBA8: /*case Regs::PixelFormat::RGBA8:
{ {
// TODO: Untested // TODO: Untested
u8* dstptr = (u32*)(dest_pointer + x * 4 + y * config.output_width * 4); u8* dstptr = (u32*)(dest_pointer + x * 4 + y * config.output_width * 4);
@ -117,7 +117,7 @@ inline void Write(u32 addr, const T data) {
break; break;
}*/ }*/
case Regs::FramebufferFormat::RGB8: case Regs::PixelFormat::RGB8:
{ {
// TODO: Most likely got the component order messed up. // TODO: Most likely got the component order messed up.
u8* dstptr = dest_pointer + x * 3 + y * config.output_width * 3; u8* dstptr = dest_pointer + x * 3 + y * config.output_width * 3;
@ -236,13 +236,13 @@ void Init() {
framebuffer_top.width = 240; framebuffer_top.width = 240;
framebuffer_top.height = 400; framebuffer_top.height = 400;
framebuffer_top.stride = 3 * 240; framebuffer_top.stride = 3 * 240;
framebuffer_top.color_format = Regs::FramebufferFormat::RGB8; framebuffer_top.color_format = Regs::PixelFormat::RGB8;
framebuffer_top.active_fb = 0; framebuffer_top.active_fb = 0;
framebuffer_sub.width = 240; framebuffer_sub.width = 240;
framebuffer_sub.height = 320; framebuffer_sub.height = 320;
framebuffer_sub.stride = 3 * 240; framebuffer_sub.stride = 3 * 240;
framebuffer_sub.color_format = Regs::FramebufferFormat::RGB8; framebuffer_sub.color_format = Regs::PixelFormat::RGB8;
framebuffer_sub.active_fb = 0; framebuffer_sub.active_fb = 0;
NOTICE_LOG(GPU, "initialized OK"); NOTICE_LOG(GPU, "initialized OK");

14
src/core/hw/gpu.h
View File

@ -56,7 +56,7 @@ struct Regs {
"Structure size and register block length don't match") "Structure size and register block length don't match")
#endif #endif
enum class FramebufferFormat : u32 { enum class PixelFormat : u32 {
RGBA8 = 0, RGBA8 = 0,
RGB8 = 1, RGB8 = 1,
RGB565 = 2, RGB565 = 2,
@ -84,9 +84,7 @@ struct Regs {
INSERT_PADDING_WORDS(0x10b); INSERT_PADDING_WORDS(0x10b);
struct { struct FramebufferConfig {
using Format = Regs::FramebufferFormat;
union { union {
u32 size; u32 size;
@ -102,7 +100,7 @@ struct Regs {
union { union {
u32 format; u32 format;
BitField< 0, 3, Format> color_format; BitField< 0, 3, PixelFormat> color_format;
}; };
INSERT_PADDING_WORDS(0x1); INSERT_PADDING_WORDS(0x1);
@ -130,8 +128,6 @@ struct Regs {
INSERT_PADDING_WORDS(0x169); INSERT_PADDING_WORDS(0x169);
struct { struct {
using Format = Regs::FramebufferFormat;
u32 input_address; u32 input_address;
u32 output_address; u32 output_address;
@ -161,8 +157,8 @@ struct Regs {
u32 flags; u32 flags;
BitField< 0, 1, u32> flip_data; // flips input data horizontally (TODO) if true BitField< 0, 1, u32> flip_data; // flips input data horizontally (TODO) if true
BitField< 8, 3, Format> input_format; BitField< 8, 3, PixelFormat> input_format;
BitField<12, 3, Format> output_format; BitField<12, 3, PixelFormat> output_format;
BitField<16, 1, u32> output_tiled; // stores output in a tiled format BitField<16, 1, u32> output_tiled; // stores output in a tiled format
}; };