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 000000000..190549b2b Binary files /dev/null and b/misc/vita/sce_sys/ICON0.png differ 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);