AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 07:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Consoles: Add icon for Vita, try to fix blocking network sockets for PS3 build, try to fix crash with Xbox build on actual hardware

Browse Source
This commit is contained in:
UnknownShadow200 2023-12-07 19:54:35 +11:00
parent e582ca1f87
commit 0532bef3b3
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/vita/Makefile
View File

@ -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

BIN
misc/vita/sce_sys/ICON0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

4
src/Graphics_Xbox.c
View File

@ -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) {

9
src/Platform_PS3.c
View File

@ -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);