Skip to content

Commit

Permalink
Merge branch 'libretro:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanaobrien authored Jan 16, 2024
2 parents c8a6c20 + 019421c commit 055c227
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions platform/libretro/libretro.c
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,12 @@ void *retro_get_memory_data(unsigned type)
else
data = PicoMem.ram;
break;
case RETRO_MEMORY_VIDEO_RAM:
data = PicoMem.vram;
break;
case 4:
data = PicoMem.cram;
break;
default:
data = NULL;
break;
Expand Down Expand Up @@ -1705,6 +1711,15 @@ size_t retro_get_memory_size(unsigned type)
else
return sizeof(PicoMem.ram);

case RETRO_MEMORY_VIDEO_RAM:
return sizeof(PicoMem.vram);
break;

// Libretro doens't have a constant declared for CRAM
case 4:
return sizeof(PicoMem.cram);
break;

default:
return 0;
}
Expand Down

0 comments on commit 055c227

Please sign in to comment.