mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2234 from itmo153277/master

Browse source 
Allow UE3 games to startup
This commit is contained in:
kd-11 2016-12-15 14:34:30 +03:00 • committed by GitHub
commit 9cbecbd8cb
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/Cell/Modules/cellGame.cpp
View file

@ -195,9 +195,14 @@ s32 cellHddGameExitBroken()
}
s32 cellGameDataGetSizeKB()
s32 cellGameDataGetSizeKB(vm::ptr<u32> size)
{
fmt::throw_exception("Unimplemented" HERE);
cellGame.warning("cellGameDataGetSizeKB(): Unimplemented, returning 0");
if (size)
{
*size = 0;
}
return CELL_OK;
}
s32 cellGameDataSetSystemVer()

25
rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
View file

@ -133,7 +133,12 @@ error_code cellVideoOutConfigure(u32 videoOut, vm::ptr<CellVideoOutConfiguration
switch (videoOut)
{
case CELL_VIDEO_OUT_PRIMARY:
// TODO
if (config->resolutionId != g_cfg_video_out_resolution.get()
|| config->format != CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8
|| (config->aspect != CELL_VIDEO_OUT_ASPECT_AUTO && config->aspect != g_cfg_video_out_aspect_ratio.get()))
{
return CELL_VIDEO_OUT_ERROR_ILLEGAL_CONFIGURATION;
}
return CELL_OK;
case CELL_VIDEO_OUT_SECONDARY:
@ -177,7 +182,7 @@ error_code cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr<Cell
// Use standard dummy values for now.
info->portType = CELL_VIDEO_OUT_PORT_HDMI;
info->colorSpace = CELL_VIDEO_OUT_COLOR_SPACE_RGB;
info->latency = 1000;
info->latency = 100;
info->availableModeCount = 1;
info->state = CELL_VIDEO_OUT_DEVICE_STATE_AVAILABLE;
info->rgbOutputRange = 1;
@ -190,12 +195,11 @@ error_code cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr<Cell
info->colorInfo.whiteX = 0xFFFF;
info->colorInfo.whiteY = 0xFFFF;
info->colorInfo.gamma = 100;
info->availableModes[0].aspect = 0;
info->availableModes[0].conversion = 0;
info->availableModes[0].refreshRates = 0xF;
info->availableModes[0].resolutionId = 1;
info->availableModes[0].scanMode = 0;
info->availableModes[0].aspect = g_cfg_video_out_aspect_ratio.get();
info->availableModes[0].conversion = CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE;
info->availableModes[0].refreshRates = CELL_VIDEO_OUT_REFRESH_RATE_60HZ;
info->availableModes[0].resolutionId = g_cfg_video_out_resolution.get();
info->availableModes[0].scanMode = CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE;
return CELL_OK;
}
@ -218,7 +222,10 @@ error_code cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId,
switch (videoOut)
{
case CELL_VIDEO_OUT_PRIMARY: return not_an_error(1);
case CELL_VIDEO_OUT_PRIMARY: return not_an_error(
resolutionId == g_cfg_video_out_resolution.get()
&& (aspect == CELL_VIDEO_OUT_ASPECT_AUTO || aspect == g_cfg_video_out_aspect_ratio.get())
);
case CELL_VIDEO_OUT_SECONDARY: return not_an_error(0);
}