N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
parent 7aae063844
commit e7719a52cd
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

8
src/core/hw/gpu.h
View file

@ -56,7 +56,7 @@ struct Regs {
"Structure size and register block length don't match")
#endif
enum class FramebufferFormat : u32 {
enum class PixelFormat : u32 {
RGBA8 = 0,
RGB8 = 1,
RGB565 = 2,
@ -84,8 +84,8 @@ struct Regs {
INSERT_PADDING_WORDS(0x10b);
struct {
using Format = Regs::FramebufferFormat;
struct FramebufferConfig {
using Format = Regs::PixelFormat;
union {
u32 size;
@ -130,7 +130,7 @@ struct Regs {
INSERT_PADDING_WORDS(0x169);
struct {
using Format = Regs::FramebufferFormat;
using Format = Regs::PixelFormat;
u32 input_address;
u32 output_address;