From 0532bef3b367686ca9f641c6713a279be1ff6dbf Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 7 Dec 2023 19:54:35 +1100 Subject: [PATCH] Consoles: Add icon for Vita, try to fix blocking network sockets for PS3 build, try to fix crash with Xbox build on actual hardware --- misc/vita/Makefile | 4 ++-- misc/vita/sce_sys/ICON0.png | Bin 0 -> 2319 bytes src/Graphics_Xbox.c | 4 ++-- src/Platform_PS3.c | 9 ++++----- 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 misc/vita/sce_sys/ICON0.png diff --git a/misc/vita/Makefile b/misc/vita/Makefile index 1889dbce0..4cb9c510e 100644 --- a/misc/vita/Makefile +++ b/misc/vita/Makefile @@ -10,7 +10,7 @@ C_FILES := $(foreach dir,$(SOURCE_DIRS),$(wildcard $(dir)/*.c)) OBJS := $(addprefix $(BUILD_DIR)/, $(notdir $(C_FILES:%.c=%.o))) # Needed by psvDebugScreenPrintf -LIBS += -lm -lSceDisplay_stub -lSceCtrl_stub -lSceTouch_stub -lSceGxm_stub -lScePvf_stub +LIBS += -lm -lSceDisplay_stub -lSceCtrl_stub -lSceTouch_stub -lSceGxm_stub #--------------------------------------------------------------------------------- @@ -22,7 +22,7 @@ $(BUILD_DIR): mkdir -p $(BUILD_DIR) $(TARGET).vpk: eboot.bin param.sfo - vita-pack-vpk -s param.sfo -b eboot.bin $(TARGET).vpk + vita-pack-vpk -s param.sfo -b eboot.bin -a misc/vita/sce_sys/ICON0.png=sce_sys/ICON0.png $(TARGET).vpk eboot.bin: $(TARGET).velf vita-make-fself $(TARGET).velf eboot.bin diff --git a/misc/vita/sce_sys/ICON0.png b/misc/vita/sce_sys/ICON0.png new file mode 100644 index 0000000000000000000000000000000000000000..190549b2bb50ac2af2ba78236d6e394a3dd97ae6 GIT binary patch literal 2319 zcmcIl`8V5%7fqVeNor##W}xs9iL+F4ihzskIwz z4P$BTQ>+8eA!;6cHD=RB=b8}z6eqCBxYHe+0 zu~AFib#-K9WM^mR+qZ9gK7V<6`Sa(`ZEbC{v$Gu? z9o^mCQ&Ur4zI^HG>gw(7{rK_Y`1ttr^fZUVk&=?CudlDGt3#nsH8nL75)z}MqqViQ zl9G~0B=XRqL&D2Azs-FkB)4E&tE=DtzXb~N=aYn4qJgINK_HNL%MXBS(|o^yKu2I^ zM#O9PT-tMe?+@Tk#kcJKTs-CfoEGSK3n#9MJn9ur(#-+-cE(tJW3Zi02p!9Nvd(xg$BpXAyxC#eAPdrNQrR) z;zd}Du0g@LEnfOG;K}hm?;;y+tV(9I7J@n3f*{$en$kyL%&Pt~+uB27@g5c6(6y#{ za_a9zJi`=91g961;K55`qEiLy`KtCOhZ7s(9#KA5l@PDyqyxcTCT&ZZSa(chyHuBr z_g6_pWnJ{n<*S~B4fEt#WlIX>H!l-X6HXK|)s-CY`xT_1q6 z4rncZa`G&XRXVTsz-x;_BwOx6yO)yTwIv1*K(ByCipLSZJ;w4$KjlDymUS@=Sx@wx zkX(LxHT?MQGD%e@f&+GdycA97{(Viacs`GKH}82%@x{PoGAq;p%S;LZcaunuJ82=% z%bN2~Ix+pfN*veEBERmHthMl?qr26KJ3dl&gv<9CG@w%blgCA>pj??5TY}S2ghg1B zv&xO`O)8Ho1dCc0sdlF3*j6IZ)o@+;0L?&8)8U&p^tjo_IccuqddXcb<%6(KHF zYv`Gt3)R5r+$pj?UlTNC>OOHQEpURFpBqsvEnfz_^*X}QODZ`hsY!5y7_VQ*jh96~ z2VS@5$8bfII$_eJj0EaUA|?FQcBr2cHt=Z2~((WpeFzAFJ}(l3EQKl zy0d94D0*^^Cz|0Z9Zd#x6qLaf02{rRZF_w&RleOF6nmcuM5ugSJQT~1)6E0!gl%20L1pX7 zhq;|XoEmHBxa}BHaPE9UPmF>1W^i_Fwp-J<33kjl$3mt=G8mw1?I4vzMaAMBKYKF@ zjPVOf@U6&%V~KJ`MyGwbJ=9!PP8E&_cYqv8(y~aaN3iX6bEvFqtfaDDG-6X>Fsf9% z`q#k#5wljinmh_GX=5oar|WUBX1xv@{WjT{+NDu(7pSjDp=NF5uO|2vFkR(JKWu3a zoxNpjx4(QlqufjyHQPY&kct17Jrr{*u>7R@ikV>D^;{<^kvD}fsJ?XY;w{h}d*W;| z?_~;{?^;&WuCZvSNX8ggIopCj{0+5R#^=cw&8{bsjnUOZ1*W1@*>mu2DXvVn(D_9^aT)> z%aoK9%7S=UPq!s6$Mi5hQ`VwFT}=&X%Ej9JQBQ`gH3eUu1lHNBv#{(-fB1^VpM9-z zn8Yg4NL8|ICG-mSa8L7-f-k)irK%TGrIUXT3tf2FmxVUnn@ciNH93f;zgE&^nj->zq literal 0 HcmV?d00001 diff --git a/src/Graphics_Xbox.c b/src/Graphics_Xbox.c index 048947459..e313aa520 100644 --- a/src/Graphics_Xbox.c +++ b/src/Graphics_Xbox.c @@ -196,7 +196,7 @@ static void ConvertTexture(cc_uint32* dst, struct Bitmap* bmp) { static GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, cc_uint8 flags, cc_bool mipmaps) { int size = 16 + bmp->width * bmp->height * 4; - CCTexture* tex = MmAllocateContiguousMemoryEx(size, 0, MAX_RAM_ADDR, 0, 0x404); + CCTexture* tex = MmAllocateContiguousMemoryEx(size, 0, MAX_RAM_ADDR, 16, PAGE_WRITECOMBINE | PAGE_READWRITE); tex->width = bmp->width; tex->height = bmp->height; @@ -391,7 +391,7 @@ static cc_uint8* gfx_vertices; static cc_uint16* gfx_indices; static void* AllocBuffer(int count, int elemSize) { - return MmAllocateContiguousMemoryEx(count * elemSize, 0, MAX_RAM_ADDR, 0, PAGE_WRITECOMBINE | PAGE_READWRITE); + return MmAllocateContiguousMemoryEx(count * elemSize, 0, MAX_RAM_ADDR, 16, PAGE_WRITECOMBINE | PAGE_READWRITE); } static void FreeBuffer(GfxResourceID* buffer) { diff --git a/src/Platform_PS3.c b/src/Platform_PS3.c index d7dab77cc..1ae8a35ab 100644 --- a/src/Platform_PS3.c +++ b/src/Platform_PS3.c @@ -378,11 +378,10 @@ cc_result Socket_Connect(cc_socket* s, const cc_string* address, int port, cc_bo if (res < 0) return res; *s = res; - // TODO: RPCS3 makes sockets non blocking by default anyways ? - /*if (nonblocking) { - int blocking_raw = -1; - ioctl(*s, FIONBIO, &blocking_raw); - }*/ + if (nonblocking) { + int on = 1; + netSetSockOpt(*s, SCE_NET_SOL_SOCKET, SCE_NET_SO_NBIO, &on, sizeof(int)); + } addr.v4.sin_family = AF_INET; addr.v4.sin_port = htons(port);