Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-10 10:30:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix graphics tearing and stuttering for disk images that sync to video scanner

Browse Source 
- Use a second framebuffer to avoid tearing
    - Occasionally stall graphics thread for ~4ms until CPU thread (video scanner) completes drawing a frame
    - These fixes seem to essentially fix graphics issues with Dagen Brock's Flappie Bird (flapple140.po.gz disk image)
This commit is contained in:
Aaron Culliney 2018-11-24 15:16:38 -08:00
parent db4a71ca6f
commit 1d2f521e0b
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/display.c
View File

@ -73,6 +73,7 @@ static PIXEL_TYPE *general_colors[NUM_COLOROPTS] = { 0 };
#define FB_SIZ (SCANWIDTH*SCANHEIGHT) #define FB_SIZ (SCANWIDTH*SCANHEIGHT)
static PIXEL_TYPE fbFull[FB_SIZ + (SCANWIDTH<<1)] = { 0 }; // HACK NOTE: extra scanlines used for sampling static PIXEL_TYPE fbFull[FB_SIZ + (SCANWIDTH<<1)] = { 0 }; // HACK NOTE: extra scanlines used for sampling
static PIXEL_TYPE fbDone[FB_SIZ] = { 0 };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Initialization routines // Initialization routines
@ -956,7 +957,7 @@ void display_flashText(void) {
} }
PIXEL_TYPE *display_getCurrentFramebuffer(void) { PIXEL_TYPE *display_getCurrentFramebuffer(void) {
return fbFull; return fbDone;
} }
void display_flushScanline(scan_data_t *scandata) { void display_flushScanline(scan_data_t *scandata) {
@ -996,6 +997,7 @@ void display_frameComplete(void) {
SCOPE_TRACE_CPU("frameComplete"); SCOPE_TRACE_CPU("frameComplete");
memcpy(/*dst:*/fbDone, /*src:*/fbFull, sizeof(fbDone));
video_setDirty(FB_DIRTY_FLAG); video_setDirty(FB_DIRTY_FLAG);
#if TESTING #if TESTING

19
src/video/glvideo.c
View File

@ -13,6 +13,7 @@
#include <regex.h> #include <regex.h>
// HACK NOTE : display.c "fbDone" buffer is the crtModel->texPixels to avoid a memcpy
#define FB_PIXELS_PASS_THRU 1 #define FB_PIXELS_PASS_THRU 1
static int viewportX = 0; static int viewportX = 0;
@ -331,11 +332,25 @@ static void glvideo_render(void) {
glUniformMatrix4fv(uniformMVPIdx, 1, GL_FALSE, mvpIdentity); glUniformMatrix4fv(uniformMVPIdx, 1, GL_FALSE, mvpIdentity);
#endif #endif
unsigned long wasDirty = (video_clearDirty(FB_DIRTY_FLAG) & FB_DIRTY_FLAG);
glActiveTexture(TEXTURE_ACTIVE_FRAMEBUFFER); glActiveTexture(TEXTURE_ACTIVE_FRAMEBUFFER);
glBindTexture(GL_TEXTURE_2D, crtModel->textureName); glBindTexture(GL_TEXTURE_2D, crtModel->textureName);
glUniform1i(texSamplerLoc, TEXTURE_ID_FRAMEBUFFER); glUniform1i(texSamplerLoc, TEXTURE_ID_FRAMEBUFFER);
unsigned long wasDirty = (video_clearDirty(FB_DIRTY_FLAG) & FB_DIRTY_FLAG);
if (!wasDirty) {
// Framebuffer is not dirty, so stall here to wait for cpu thread to (potentially) complete the video frame ...
// This seems to improve "stuttering" of Dagen Brock's Flappy Bird
SCOPE_TRACE_VIDEO("sleep");
struct timespec deltat = {
.tv_sec = 0,
.tv_nsec = NANOSECONDS_PER_SECOND / 240,
};
nanosleep(&deltat, NULL); // approx 4.714ms
wasDirty = (video_clearDirty(FB_DIRTY_FLAG) & FB_DIRTY_FLAG);
}
if (wasDirty) { if (wasDirty) {
SCOPE_TRACE_VIDEO("glvideo texImage2D"); SCOPE_TRACE_VIDEO("glvideo texImage2D");
_HACKAROUND_GLTEXIMAGE2D_PRE(TEXTURE_ACTIVE_FRAMEBUFFER, crtModel->textureName); _HACKAROUND_GLTEXIMAGE2D_PRE(TEXTURE_ACTIVE_FRAMEBUFFER, crtModel->textureName);