AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 09:35:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

PSP: Fix crashing if you try to bind null/missing texture

Browse Source
This commit is contained in:
UnknownShadow200 2023-04-22 13:33:16 +10:00
parent 1aa975bd6f
commit 159f0d5f56
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Graphics_PSP.c
View File

@ -5,6 +5,7 @@
#include "Logger.h" #include "Logger.h"
#include "Window.h" #include "Window.h"
#include <malloc.h>
#include <pspkernel.h> #include <pspkernel.h>
#include <pspdisplay.h> #include <pspdisplay.h>
#include <pspdebug.h> #include <pspdebug.h>
@ -71,7 +72,7 @@ static void guInit(void) {
sceGuDisplay(GU_TRUE); sceGuDisplay(GU_TRUE);
} }
static void GLBackend_Init(void); static GfxResourceID white_square;
void Gfx_Create(void) { void Gfx_Create(void) {
Gfx.MaxTexWidth = 512; Gfx.MaxTexWidth = 512;
Gfx.MaxTexHeight = 512; Gfx.MaxTexHeight = 512;
@ -79,11 +80,20 @@ void Gfx_Create(void) {
MakeIndices(gfx_indices, GFX_MAX_INDICES); MakeIndices(gfx_indices, GFX_MAX_INDICES);
guInit(); guInit();
InitDefaultResources(); InitDefaultResources();
// 1x1 dummy white texture
struct Bitmap bmp;
BitmapCol pixels[1] = { BITMAPCOLOR_WHITE };
Bitmap_Init(bmp, 1, 1, pixels);
white_square = Gfx_CreateTexture(&bmp, 0, false);
}
void Gfx_Free(void) {
FreeDefaultResources();
Gfx_DeleteTexture(&white_square);
} }
cc_bool Gfx_TryRestoreContext(void) { return true; } cc_bool Gfx_TryRestoreContext(void) { return true; }
void Gfx_Free(void) { FreeDefaultResources(); }
void Gfx_RestoreState(void) { } void Gfx_RestoreState(void) { }
void Gfx_FreeState(void) { } void Gfx_FreeState(void) { }
#define GU_Toggle(cap) if (enabled) { sceGuEnable(cap); } else { sceGuDisable(cap); } #define GU_Toggle(cap) if (enabled) { sceGuEnable(cap); } else { sceGuDisable(cap); }
@ -139,6 +149,8 @@ void Gfx_DisableMipmaps(void) { }
void Gfx_BindTexture(GfxResourceID texId) { void Gfx_BindTexture(GfxResourceID texId) {
CCTexture* tex = (CCTexture*)texId; CCTexture* tex = (CCTexture*)texId;
if (!tex) tex = white_square;
sceGuTexMode(GU_PSM_8888,0,0,0); sceGuTexMode(GU_PSM_8888,0,0,0);
sceGuTexImage(0, tex->width, tex->height, tex->width, tex->pixels); sceGuTexImage(0, tex->width, tex->height, tex->width, tex->pixels);
} }

4
src/Platform_PSP.c
View File

@ -15,10 +15,8 @@
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h>
#include <pspkernel.h> #include <pspkernel.h>
#include <pspnet_inet.h> #include <pspnet_inet.h>
#include <pspnet_resolver.h> #include <pspnet_resolver.h>
@ -33,6 +31,8 @@ const cc_result ReturnCode_DirectoryExists = EEXIST;
PSP_MODULE_INFO("ClassiCube", PSP_MODULE_USER, 1, 0); PSP_MODULE_INFO("ClassiCube", PSP_MODULE_USER, 1, 0);
PSP_MAIN_THREAD_ATTR(PSP_THREAD_ATTR_USER); PSP_MAIN_THREAD_ATTR(PSP_THREAD_ATTR_USER);
PSP_DISABLE_AUTOSTART_PTHREAD() // reduces .elf size by 140 kb
/*########################################################################################################################* /*########################################################################################################################*
*---------------------------------------------------------Memory----------------------------------------------------------* *---------------------------------------------------------Memory----------------------------------------------------------*