removed threaded rendering, made vsync an option
This commit is contained in:
Shaun Inman
parent
416e32bc53
commit
9e795ff1bc
3 changed files with 29 additions and 78 deletions
|
|
@ -98,8 +98,6 @@ struct owlfb_sync_info {
|
|||
///////////////////////////////
|
||||
|
||||
#define GFX_BUFFER_COUNT 3
|
||||
#define GFX_ENABLE_VSYNC
|
||||
#define GFX_ENABLE_BUFFER
|
||||
|
||||
///////////////////////////////
|
||||
|
||||
|
|
@ -111,6 +109,7 @@ uint32_t RGB_DARK_GRAY;
|
|||
|
||||
static struct GFX_Context {
|
||||
int mode;
|
||||
int vsync;
|
||||
int fb;
|
||||
int pitch;
|
||||
int buffer;
|
||||
|
|
@ -157,6 +156,7 @@ SDL_Surface* GFX_init(int mode) {
|
|||
SDL_ShowCursor(0);
|
||||
TTF_Init();
|
||||
|
||||
gfx.vsync = 1;
|
||||
gfx.mode = mode;
|
||||
|
||||
// we're drawing to the (triple-buffered) framebuffer directly
|
||||
|
|
@ -172,15 +172,10 @@ SDL_Surface* GFX_init(int mode) {
|
|||
gfx.vinfo.xres = SCREEN_WIDTH;
|
||||
gfx.vinfo.yres = SCREEN_HEIGHT;
|
||||
gfx.vinfo.xres_virtual = SCREEN_WIDTH;
|
||||
gfx.vinfo.yres_virtual = SCREEN_HEIGHT;
|
||||
#ifdef GFX_ENABLE_BUFFER
|
||||
gfx.vinfo.yres_virtual *= GFX_BUFFER_COUNT;
|
||||
#endif
|
||||
#if defined (GFX_ENABLE_BUFFER) && !defined (GFX_ENABLE_VSYNC)
|
||||
gfx.vinfo.yres_virtual = SCREEN_HEIGHT * GFX_BUFFER_COUNT;
|
||||
gfx.vinfo.xoffset = 0;
|
||||
gfx.vinfo.yoffset = 0;
|
||||
gfx.vinfo.activate = FB_ACTIVATE_VBL;
|
||||
#endif
|
||||
|
||||
if (ioctl(gfx.fb, FBIOPUT_VSCREENINFO, &gfx.vinfo)) {
|
||||
printf("FBIOPUT_VSCREENINFO failed: %s (%i)\n", strerror(errno), errno);
|
||||
|
|
@ -192,20 +187,14 @@ SDL_Surface* GFX_init(int mode) {
|
|||
gfx.map = mmap(0, gfx.map_size, PROT_READ | PROT_WRITE, MAP_SHARED, gfx.fb, 0);
|
||||
memset(gfx.map, 0, gfx.map_size);
|
||||
|
||||
#ifdef GFX_ENABLE_VSYNC
|
||||
struct owlfb_sync_info sinfo;
|
||||
sinfo.enabled = 1;
|
||||
if (ioctl(gfx.fb, OWLFB_VSYNC_EVENT_EN, &sinfo)) {
|
||||
printf("OWLFB_VSYNC_EVENT_EN failed: %s (%i)\n", strerror(errno), errno);
|
||||
}
|
||||
#endif
|
||||
|
||||
// buffer tracking
|
||||
#ifdef GFX_ENABLE_BUFFER
|
||||
gfx.buffer = 1;
|
||||
#else
|
||||
gfx.buffer = 0;
|
||||
#endif
|
||||
gfx.buffer_size = SCREEN_PITCH * SCREEN_HEIGHT;
|
||||
|
||||
// return screen
|
||||
|
|
@ -248,10 +237,10 @@ void GFX_quit(void) {
|
|||
TTF_CloseFont(font.tiny);
|
||||
|
||||
SDL_FreeSurface(gfx.assets);
|
||||
#ifdef GFX_ENABLE_VSYNC
|
||||
|
||||
int arg = 1;
|
||||
ioctl(gfx.fb, OWLFB_WAITFORVSYNC, &arg);
|
||||
#endif
|
||||
|
||||
GFX_clearAll();
|
||||
munmap(gfx.map, gfx.map_size);
|
||||
close(gfx.fb);
|
||||
|
|
@ -265,6 +254,13 @@ void GFX_clearAll(void) {
|
|||
memset(gfx.map, 0, gfx.map_size);
|
||||
}
|
||||
|
||||
int GFX_getVsync(void) {
|
||||
return gfx.vsync;
|
||||
}
|
||||
void GFX_setVsync(int vsync) {
|
||||
gfx.vsync = vsync;
|
||||
}
|
||||
|
||||
static uint32_t frame_start = 0;
|
||||
void GFX_startFrame(void) {
|
||||
frame_start = SDL_GetTicks();
|
||||
|
|
@ -272,23 +268,20 @@ void GFX_startFrame(void) {
|
|||
void GFX_flip(SDL_Surface* screen) {
|
||||
static int ticks = 0;
|
||||
ticks += 1;
|
||||
#ifdef GFX_ENABLE_VSYNC
|
||||
// TODO: this condition doesn't make sense when using the threaded renderer
|
||||
if (gfx.vsync) {
|
||||
#define FRAME_BUDGET 17 // 60fps
|
||||
if (frame_start==0 || SDL_GetTicks()-frame_start<FRAME_BUDGET) { // only wait if we're under frame budget
|
||||
int arg = 1;
|
||||
ioctl(gfx.fb, OWLFB_WAITFORVSYNC, &arg);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef GFX_ENABLE_BUFFER
|
||||
gfx.vinfo.yoffset = gfx.buffer * SCREEN_HEIGHT;
|
||||
ioctl(gfx.fb, FBIOPAN_DISPLAY, &gfx.vinfo);
|
||||
|
||||
gfx.buffer += 1;
|
||||
if (gfx.buffer>=GFX_BUFFER_COUNT) gfx.buffer -= GFX_BUFFER_COUNT;
|
||||
screen->pixels = gfx.map + (gfx.buffer * gfx.buffer_size);
|
||||
#endif
|
||||
}
|
||||
|
||||
SDL_Surface* GFX_getBufferCopy(void) { // must be freed by caller
|
||||
|
|
|
|||
|
|
@ -72,6 +72,9 @@ void GFX_startFrame(void);
|
|||
void GFX_flip(SDL_Surface* screen);
|
||||
void GFX_quit(void);
|
||||
|
||||
int GFX_getVsync(void);
|
||||
void GFX_setVsync(int vsync);
|
||||
|
||||
SDL_Surface* GFX_getBufferCopy(void); // must be freed by caller
|
||||
int GFX_truncateDisplayName(const char* in_name, char* out_name, int max_width); // returns final width (including pill padding)
|
||||
|
||||
|
|
|
|||
|
|
@ -521,14 +521,19 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
|
|||
break;
|
||||
}
|
||||
// TODO: RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION 59
|
||||
// TODO: I'm not sure what uses this...not gambatte, not snes9x, not pcsx
|
||||
case RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK: { /* 62 */
|
||||
puts("RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK");
|
||||
const struct retro_audio_buffer_status_callback *cb =
|
||||
(const struct retro_audio_buffer_status_callback *)data;
|
||||
if (cb) {
|
||||
puts("has audo_buffer_status callback");
|
||||
core.audio_buffer_status = cb->callback;
|
||||
} else {
|
||||
puts("missing audo_buffer_status callback");
|
||||
core.audio_buffer_status = NULL;
|
||||
}
|
||||
fflush(stdout);
|
||||
break;
|
||||
}
|
||||
// TODO: not used by gambatte
|
||||
|
|
@ -685,8 +690,6 @@ static double cpu_double = 0;
|
|||
static double use_double = 0;
|
||||
static uint32_t sec_start = 0;
|
||||
|
||||
// TODO: flesh out
|
||||
#include <pthread.h>
|
||||
static struct {
|
||||
void* src;
|
||||
int src_w;
|
||||
|
|
@ -697,9 +700,7 @@ static struct {
|
|||
int dst_w;
|
||||
int dst_h;
|
||||
|
||||
int do_flip;
|
||||
scale_neon_t scaler;
|
||||
pthread_t flip_pt;
|
||||
} renderer;
|
||||
static void scaleNull(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {}
|
||||
static void scale1x(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
|
||||
|
|
@ -1190,43 +1191,6 @@ static void selectScaler(int width, int height, int pitch) {
|
|||
}
|
||||
}
|
||||
|
||||
static void* Flip_thread(void* param) {
|
||||
while (1) {
|
||||
if (!renderer.do_flip) {
|
||||
SDL_Delay(1); // TODO: this seems arbitrary
|
||||
continue;
|
||||
}
|
||||
fps_ticks += 1;
|
||||
|
||||
renderer.scaler(renderer.src,screen->pixels+renderer.dst_offset,renderer.src_w,renderer.src_h,renderer.src_p,SCREEN_PITCH);
|
||||
|
||||
int x = 0;
|
||||
int y = SCREEN_HEIGHT - DIGIT_HEIGHT;
|
||||
if (fps_double) x = MSG_blitDouble(fps_double, x,y);
|
||||
if (cpu_double) {
|
||||
x = MSG_blitChar(DIGIT_SLASH,x,y);
|
||||
MSG_blitDouble(cpu_double, x,y);
|
||||
}
|
||||
|
||||
GFX_flip(screen);
|
||||
|
||||
renderer.do_flip = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
static void Flip_request(void) {
|
||||
renderer.do_flip = 1;
|
||||
}
|
||||
static void Flip_init(void) {
|
||||
memset(&renderer, 0, sizeof(renderer));
|
||||
pthread_create(&renderer.flip_pt, NULL, Flip_thread, NULL);
|
||||
}
|
||||
static void Flip_quit(void) {
|
||||
renderer.do_flip = 0;
|
||||
pthread_cancel(renderer.flip_pt);
|
||||
pthread_join(renderer.flip_pt,NULL);
|
||||
}
|
||||
|
||||
static void video_refresh_callback(const void *data, unsigned width, unsigned height, size_t pitch) {
|
||||
if (!data) return;
|
||||
fps_ticks += 1; // comment out with threaded renderer
|
||||
|
|
@ -1246,11 +1210,6 @@ static void video_refresh_callback(const void *data, unsigned width, unsigned he
|
|||
renderer.src = malloc(height * pitch);
|
||||
}
|
||||
|
||||
// TODO: we can maintain 60fps where frame rate is an issue without blitting...
|
||||
// memcpy(renderer.src, data, pitch * height); // copy for threaded scaling/rendering
|
||||
// Flip_request();
|
||||
// return;
|
||||
|
||||
static int top_width = 0;
|
||||
static int bottom_width = 0;
|
||||
|
||||
|
|
@ -1306,7 +1265,7 @@ static void video_refresh_callback(const void *data, unsigned width, unsigned he
|
|||
x = MSG_blitChar(DIGIT_PERCENT,x,y);
|
||||
}
|
||||
|
||||
bottom_width = x;
|
||||
if (x>bottom_width) bottom_width = x; // keep the largest width because triple buffer
|
||||
|
||||
x = 0;
|
||||
y = 0;
|
||||
|
|
@ -1325,7 +1284,7 @@ static void video_refresh_callback(const void *data, unsigned width, unsigned he
|
|||
x = MSG_blitInt(renderer.dst_h,x,y);
|
||||
x = MSG_blitChar(DIGIT_CP,x,y);
|
||||
|
||||
top_width = x;
|
||||
if (x>top_width) top_width = x; // keep the largest width because triple buffer
|
||||
}
|
||||
|
||||
GFX_flip(screen);
|
||||
|
|
@ -1621,8 +1580,6 @@ void Menu_afterSleep(void) {
|
|||
unlink(AUTO_RESUME_PATH);
|
||||
}
|
||||
void Menu_loop(void) {
|
||||
// while (renderer.do_flip) SDL_Delay(1); // TODO:// this seems arbitrary
|
||||
|
||||
POW_enableAutosleep();
|
||||
PAD_reset();
|
||||
|
||||
|
|
@ -2028,7 +1985,6 @@ int main(int argc , char* argv[]) {
|
|||
|
||||
screen = GFX_init(MODE_MENU);
|
||||
MSG_init();
|
||||
// Flip_init();
|
||||
InitSettings();
|
||||
|
||||
Core_open(core_path, tag_name); // LOG_info("after Core_open\n");
|
||||
|
|
@ -2082,7 +2038,6 @@ int main(int argc , char* argv[]) {
|
|||
Core_close(); // LOG_info("after Core_close\n");
|
||||
|
||||
SDL_FreeSurface(screen);
|
||||
// Flip_quit();
|
||||
MSG_quit();
|
||||
GFX_quit();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue