mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-11 02:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-04-17 23:16:55 +03:00
commit 8c9ef2eef4
3 changed files with 138 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
View file

@ -347,12 +347,13 @@ __noinline s32 savedata_op(
} }
// get save stats // get save stats
vm::stackvar<CellSaveDataStatGet> statGet(CPU);
vm::stackvar<CellSaveDataStatSet> statSet(CPU);
std::string dir_path = base_dir + save_entry.dirName + "/"; std::string dir_path = base_dir + save_entry.dirName + "/";
std::string sfo_path = dir_path + "PARAM.SFO"; std::string sfo_path = dir_path + "PARAM.SFO";
{
vm::stackvar<CellSaveDataStatGet> statGet(CPU);
vm::stackvar<CellSaveDataStatSet> statSet(CPU);
vfsFile f(sfo_path); vfsFile f(sfo_path);
PSFLoader psf(f); PSFLoader psf(f);
f.Close(); f.Close();
@ -496,6 +497,7 @@ __noinline s32 savedata_op(
psf.Save(f); psf.Save(f);
f.Close(); f.Close();
} }
}
// Enter the loop where the save files are read/created/deleted // Enter the loop where the save files are read/created/deleted
vm::stackvar<CellSaveDataFileGet> fileGet(CPU); vm::stackvar<CellSaveDataFileGet> fileGet(CPU);

2
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View file

@ -713,7 +713,7 @@ s32 cellVdecGetPicture(u32 handle, vm::ptr<const CellVdecPicFormat> format, vm::
std::unique_ptr<u8> alpha_plane; std::unique_ptr<u8> alpha_plane;
switch (const auto type = format->formatType) switch (const u32 type = format->formatType)
{ {
case CELL_VDEC_PICFMT_ARGB32_ILV: out_f = AV_PIX_FMT_ARGB; alpha_plane.reset(new u8[w * h]); break; case CELL_VDEC_PICFMT_ARGB32_ILV: out_f = AV_PIX_FMT_ARGB; alpha_plane.reset(new u8[w * h]); break;
case CELL_VDEC_PICFMT_RGBA32_ILV: out_f = AV_PIX_FMT_RGBA; alpha_plane.reset(new u8[w * h]); break; case CELL_VDEC_PICFMT_RGBA32_ILV: out_f = AV_PIX_FMT_RGBA; alpha_plane.reset(new u8[w * h]); break;

12
rpcs3/Emu/SysCalls/Modules/cellVdec.h
View file

@ -12,7 +12,7 @@ enum
CELL_VDEC_ERROR_FATAL = 0x80610180, CELL_VDEC_ERROR_FATAL = 0x80610180,
}; };
enum CellVdecCodecType enum CellVdecCodecType : u32
{ {
CELL_VDEC_CODEC_TYPE_MPEG2 = 0x00000000, CELL_VDEC_CODEC_TYPE_MPEG2 = 0x00000000,
CELL_VDEC_CODEC_TYPE_AVC = 0x00000001, CELL_VDEC_CODEC_TYPE_AVC = 0x00000001,
@ -20,7 +20,7 @@ enum CellVdecCodecType
}; };
// Callback Messages // Callback Messages
enum CellVdecMsgType enum CellVdecMsgType : u32
{ {
CELL_VDEC_MSG_TYPE_AUDONE, // decoding finished CELL_VDEC_MSG_TYPE_AUDONE, // decoding finished
CELL_VDEC_MSG_TYPE_PICOUT, // picture done CELL_VDEC_MSG_TYPE_PICOUT, // picture done
@ -37,7 +37,7 @@ enum CellVdecDecodeMode : u32
}; };
// Output Picture Format Type // Output Picture Format Type
enum CellVdecPicFormatType enum CellVdecPicFormatType : u32
{ {
CELL_VDEC_PICFMT_ARGB32_ILV, CELL_VDEC_PICFMT_ARGB32_ILV,
CELL_VDEC_PICFMT_RGBA32_ILV, CELL_VDEC_PICFMT_RGBA32_ILV,
@ -46,13 +46,13 @@ enum CellVdecPicFormatType
}; };
// Output Color Matrix Coef // Output Color Matrix Coef
enum CellVdecColorMatrixType enum CellVdecColorMatrixType : u32
{ {
CELL_VDEC_COLOR_MATRIX_TYPE_BT601, CELL_VDEC_COLOR_MATRIX_TYPE_BT601,
CELL_VDEC_COLOR_MATRIX_TYPE_BT709, CELL_VDEC_COLOR_MATRIX_TYPE_BT709,
}; };
enum CellVdecPicAttr enum CellVdecPicAttr : u32
{ {
CELL_VDEC_PICITEM_ATTR_NORMAL, CELL_VDEC_PICITEM_ATTR_NORMAL,
CELL_VDEC_PICITEM_ATTR_SKIPPED, CELL_VDEC_PICITEM_ATTR_SKIPPED,
@ -358,8 +358,6 @@ struct CellVdecAvcInfo
be_t<u64> reserved[2]; be_t<u64> reserved[2];
}; };
const int sz = sizeof(CellVdecAvcInfo);
// DIVX Profile // DIVX Profile
enum DIVX_level : u8 enum DIVX_level : u8
{ {