OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 19:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/condut/citra

Browse Source
This commit is contained in:
condut 2015-07-10 00:58:01 +03:00
commit a19dd23926
4 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -13,7 +13,7 @@ configuration:
- Release - Release
install: install:
- git submodule update --init --recursive --depth 20 - git submodule update --init --recursive
before_build: before_build:
- mkdir build - mkdir build

18
src/core/hle/service/soc_u.cpp
View File

@ -328,6 +328,7 @@ static void Socket(Service::Interface* self) {
if ((s32)socket_handle == SOCKET_ERROR_VALUE) if ((s32)socket_handle == SOCKET_ERROR_VALUE)
result = TranslateError(GET_ERRNO); result = TranslateError(GET_ERRNO);
cmd_buffer[0] = IPC::MakeHeader(2, 2, 0);
cmd_buffer[1] = result; cmd_buffer[1] = result;
cmd_buffer[2] = socket_handle; cmd_buffer[2] = socket_handle;
} }
@ -351,8 +352,9 @@ static void Bind(Service::Interface* self) {
if (res != 0) if (res != 0)
result = TranslateError(GET_ERRNO); result = TranslateError(GET_ERRNO);
cmd_buffer[2] = res; cmd_buffer[0] = IPC::MakeHeader(5, 2, 0);
cmd_buffer[1] = result; cmd_buffer[1] = result;
cmd_buffer[2] = res;
} }
static void Fcntl(Service::Interface* self) { static void Fcntl(Service::Interface* self) {
@ -434,8 +436,9 @@ static void Listen(Service::Interface* self) {
if (ret != 0) if (ret != 0)
result = TranslateError(GET_ERRNO); result = TranslateError(GET_ERRNO);
cmd_buffer[2] = ret; cmd_buffer[0] = IPC::MakeHeader(3, 2, 0);
cmd_buffer[1] = result; cmd_buffer[1] = result;
cmd_buffer[2] = ret;
} }
static void Accept(Service::Interface* self) { static void Accept(Service::Interface* self) {
@ -460,8 +463,10 @@ static void Accept(Service::Interface* self) {
Memory::WriteBlock(cmd_buffer[0x104 >> 2], (const u8*)&ctr_addr, max_addr_len); Memory::WriteBlock(cmd_buffer[0x104 >> 2], (const u8*)&ctr_addr, max_addr_len);
} }
cmd_buffer[2] = ret; cmd_buffer[0] = IPC::MakeHeader(4, 2, 2);
cmd_buffer[1] = result; cmd_buffer[1] = result;
cmd_buffer[2] = ret;
cmd_buffer[3] = IPC::StaticBufferDesc(static_cast<u32>(max_addr_len), 0);
} }
static void GetHostId(Service::Interface* self) { static void GetHostId(Service::Interface* self) {
@ -669,8 +674,10 @@ static void Connect(Service::Interface* self) {
int result = 0; int result = 0;
if (ret != 0) if (ret != 0)
result = TranslateError(GET_ERRNO); result = TranslateError(GET_ERRNO);
cmd_buffer[2] = ret;
cmd_buffer[0] = IPC::MakeHeader(6, 2, 0);
cmd_buffer[1] = result; cmd_buffer[1] = result;
cmd_buffer[2] = ret;
} }
static void InitializeSockets(Service::Interface* self) { static void InitializeSockets(Service::Interface* self) {
@ -681,7 +688,8 @@ static void InitializeSockets(Service::Interface* self) {
#endif #endif
u32* cmd_buffer = Kernel::GetCommandBuffer(); u32* cmd_buffer = Kernel::GetCommandBuffer();
cmd_buffer[1] = 0; cmd_buffer[0] = IPC::MakeHeader(1, 1, 0);
cmd_buffer[1] = RESULT_SUCCESS.raw;
} }
static void ShutdownSockets(Service::Interface* self) { static void ShutdownSockets(Service::Interface* self) {

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

@ -53,6 +53,29 @@ inline void Read(T &var, const u32 raw_addr) {
var = g_regs[addr / 4]; var = g_regs[addr / 4];
} }
static Math::Vec4<u8> DecodePixel(Regs::PixelFormat input_format, const u8* src_pixel) {
switch (input_format) {
case Regs::PixelFormat::RGBA8:
return Color::DecodeRGBA8(src_pixel);
case Regs::PixelFormat::RGB8:
return Color::DecodeRGB8(src_pixel);
case Regs::PixelFormat::RGB565:
return Color::DecodeRGB565(src_pixel);
case Regs::PixelFormat::RGB5A1:
return Color::DecodeRGB5A1(src_pixel);
case Regs::PixelFormat::RGBA4:
return Color::DecodeRGBA4(src_pixel);
default:
LOG_ERROR(HW_GPU, "Unknown source framebuffer format %x", input_format);
return {0, 0, 0, 0};
}
}
template <typename T> template <typename T>
inline void Write(u32 addr, const T data) { inline void Write(u32 addr, const T data) {
addr -= HW::VADDR_GPU; addr -= HW::VADDR_GPU;
@ -125,11 +148,18 @@ inline void Write(u32 addr, const T data) {
break; break;
} }
unsigned horizontal_scale = (config.scaling != config.NoScale) ? 2 : 1; if (config.output_tiled &&
unsigned vertical_scale = (config.scaling == config.ScaleXY) ? 2 : 1; (config.scaling == config.ScaleXY || config.scaling == config.ScaleX)) {
LOG_CRITICAL(HW_GPU, "Scaling is only implemented on tiled input");
UNIMPLEMENTED();
break;
}
u32 output_width = config.output_width / horizontal_scale; bool horizontal_scale = config.scaling != config.NoScale;
u32 output_height = config.output_height / vertical_scale; bool vertical_scale = config.scaling == config.ScaleXY;
u32 output_width = config.output_width >> horizontal_scale;
u32 output_height = config.output_height >> vertical_scale;
u32 input_size = config.input_width * config.input_height * GPU::Regs::BytesPerPixel(config.input_format); u32 input_size = config.input_width * config.input_height * GPU::Regs::BytesPerPixel(config.input_format);
u32 output_size = output_width * output_height * GPU::Regs::BytesPerPixel(config.output_format); u32 output_size = output_width * output_height * GPU::Regs::BytesPerPixel(config.output_format);
@ -153,16 +183,14 @@ inline void Write(u32 addr, const T data) {
break; break;
} }
// TODO(Subv): Implement the box filter when scaling is enabled
// right now we're just skipping the extra pixels.
for (u32 y = 0; y < output_height; ++y) { for (u32 y = 0; y < output_height; ++y) {
for (u32 x = 0; x < output_width; ++x) { for (u32 x = 0; x < output_width; ++x) {
Math::Vec4<u8> src_color = { 0, 0, 0, 0 }; Math::Vec4<u8> src_color;
// Calculate the [x,y] position of the input image // Calculate the [x,y] position of the input image
// based on the current output position and the scale // based on the current output position and the scale
u32 input_x = x * horizontal_scale; u32 input_x = x << horizontal_scale;
u32 input_y = y * vertical_scale; u32 input_y = y << vertical_scale;
if (config.flip_vertically) { if (config.flip_vertically) {
// Flip the y value of the output data, // Flip the y value of the output data,
@ -193,30 +221,15 @@ inline void Write(u32 addr, const T data) {
} }
const u8* src_pixel = src_pointer + src_offset; const u8* src_pixel = src_pointer + src_offset;
switch (config.input_format) { src_color = DecodePixel(config.input_format, src_pixel);
case Regs::PixelFormat::RGBA8: if (config.scaling == config.ScaleX) {
src_color = Color::DecodeRGBA8(src_pixel); Math::Vec4<u8> pixel = DecodePixel(config.input_format, src_pixel + src_bytes_per_pixel);
break; src_color = ((src_color + pixel) / 2).Cast<u8>();
} else if (config.scaling == config.ScaleXY) {
case Regs::PixelFormat::RGB8: Math::Vec4<u8> pixel1 = DecodePixel(config.input_format, src_pixel + 1 * src_bytes_per_pixel);
src_color = Color::DecodeRGB8(src_pixel); Math::Vec4<u8> pixel2 = DecodePixel(config.input_format, src_pixel + 2 * src_bytes_per_pixel);
break; Math::Vec4<u8> pixel3 = DecodePixel(config.input_format, src_pixel + 3 * src_bytes_per_pixel);
src_color = (((src_color + pixel1) + (pixel2 + pixel3)) / 4).Cast<u8>();
case Regs::PixelFormat::RGB565:
src_color = Color::DecodeRGB565(src_pixel);
break;
case Regs::PixelFormat::RGB5A1:
src_color = Color::DecodeRGB5A1(src_pixel);
break;
case Regs::PixelFormat::RGBA4:
src_color = Color::DecodeRGBA4(src_pixel);
break;
default:
LOG_ERROR(HW_GPU, "Unknown source framebuffer format %x", config.input_format.Value());
break;
} }
u8* dst_pixel = dst_pointer + dst_offset; u8* dst_pixel = dst_pointer + dst_offset;

1
src/core/loader/ncch.cpp
View File

@ -239,7 +239,6 @@ ResultStatus AppLoader_NCCH::Load() {
LOG_DEBUG(Loader, "Bss size: 0x%08X", bss_size); LOG_DEBUG(Loader, "Bss size: 0x%08X", bss_size);
LOG_DEBUG(Loader, "Core version: %d" , core_version); LOG_DEBUG(Loader, "Core version: %d" , core_version);
LOG_DEBUG(Loader, "Thread priority: 0x%X" , priority); LOG_DEBUG(Loader, "Thread priority: 0x%X" , priority);
LOG_DEBUG(Loader, "Resource limit descriptor: 0x%08X", exheader_header.arm11_system_local_caps.resource_limit_descriptor);
LOG_DEBUG(Loader, "Resource limit category: %d" , resource_limit_category); LOG_DEBUG(Loader, "Resource limit category: %d" , resource_limit_category);
// Read ExeFS... // Read ExeFS...