Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-09-27 09:56:08 +00:00
Code Issues Projects Releases Wiki Activity

Only render if necessary

Browse Source
This commit is contained in:
Aaron Culliney 2015-01-23 23:37:43 -08:00
parent b4516b49df
commit 780905155a
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/display.c
View File

@ -633,6 +633,7 @@ void video_shutdown(void) {
------------------------------------------------------------------------- */
void video_setpage(int p)
{
_vid_dirty = true;
video__current_page = p;
}
@ -643,6 +644,7 @@ const uint8_t * const video_current_framebuffer() {
// ----------------------------------------------------------------------------
static inline void _plot_character(const unsigned int font_off, uint8_t *fb_ptr) {
_vid_dirty = true;
uint8_t *font_ptr = video__wider_font+font_off;
_plot_char40(/*dst*/&fb_ptr, /*src*/&font_ptr);
_plot_char40(/*dst*/&fb_ptr, /*src*/&font_ptr);
@ -656,17 +658,16 @@ static inline void _plot_character(const unsigned int font_off, uint8_t *fb_ptr)
static inline void _plot_character0(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 0);
_plot_character(b<<7/* *128 */, video__fb1+video__screen_addresses[ea-0x0400]);
}
static inline void _plot_character1(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 1);
_plot_character(b<<7/* *128 */, video__fb2+video__screen_addresses[ea-0x0800]);
}
static inline void _plot_80character(const unsigned int font_off, uint8_t *fb_ptr) {
_vid_dirty = true;
uint8_t *font_ptr = video__font+font_off;
_plot_char80(/*dst*/&fb_ptr, /*src*/&font_ptr);
_plot_char80(/*dst*/&fb_ptr, /*src*/&font_ptr);
@ -681,7 +682,6 @@ static inline void _plot_80character(const unsigned int font_off, uint8_t *fb_pt
// FIXME TODO NOTE : dup'ing work here?
static inline void _plot_80character0(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 0);
b = apple_ii_64k[1][ea];
_plot_80character(b<<6/* *64 */, video__fb1+video__screen_addresses[ea-0x0400]);
b = apple_ii_64k[0][ea];
@ -690,7 +690,6 @@ static inline void _plot_80character0(uint16_t ea, uint8_t b)
static inline void _plot_80character1(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 1);
b = apple_ii_64k[1][ea];
_plot_80character(b<<6/* *64 */, video__fb2+video__screen_addresses[ea-0x0800]);
b = apple_ii_64k[0][ea];
@ -698,6 +697,7 @@ static inline void _plot_80character1(uint16_t ea, uint8_t b)
}
static inline void _plot_block(const uint32_t val, uint8_t *fb_ptr) {
_vid_dirty = true;
uint8_t color = (val & 0x0F) << 4;
uint32_t val32 = (color << 24) | (color << 16) | (color << 8) | color;
@ -725,13 +725,11 @@ static inline void _plot_block(const uint32_t val, uint8_t *fb_ptr) {
/* plot lores block first page */
static inline void _plot_block0(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 0);
_plot_block(b, video__fb1+video__screen_addresses[ea-0x0400]);
}
static inline void _plot_block1(uint16_t ea, uint8_t b)
{
_vid_dirty = (video__current_page == 1);
_plot_block(b, video__fb2+video__screen_addresses[ea-0x0800]);
}
@ -1032,14 +1030,13 @@ static inline void _draw_hires_graphics(uint16_t ea, uint8_t b, bool is_even, ui
return;
}
_vid_dirty = true;
uint16_t off = ea - 0x2000;
uint8_t *fb_base = NULL;
if (page) {
off -= 0x2000;
_vid_dirty = (video__current_page == 1);
fb_base = video__fb2;
} else {
_vid_dirty = (video__current_page == 0);
fb_base = video__fb1;
}
_plot_hires(ea, b, is_even, fb_base+video__screen_addresses[off]);

32
src/video/glvideo.c
View File

@ -604,12 +604,19 @@ static void gldriver_update(int unused) {
#endif
c_keys_handle_input(-1, 0, 0);
glutPostRedisplay();
if (_vid_dirty) {
glutPostRedisplay();
}
glutTimerFunc(17, gldriver_update, 0);
}
#endif
static void gldriver_render(void) {
const uint8_t * const fb = video_current_framebuffer();
if (UNLIKELY(!fb)) {
return;
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
#if PERSPECTIVE
@ -637,22 +644,17 @@ static void gldriver_render(void) {
// that we calculated above
glUniformMatrix4fv(uniformMVPIdx, 1, GL_FALSE, mvp);
// Update texture from Apple //e internal framebuffer
const uint8_t * const fb = video_current_framebuffer();
uint8_t index;
#warning FIXME TODO use memcpy ... or don't use indexed color so that we don't need to do this copy?
// Update texture from indexed-color Apple //e internal framebuffer
unsigned int count = SCANWIDTH * SCANHEIGHT;
char pixels[SCANWIDTH * SCANHEIGHT * 4];
if (fb != NULL) {
for (unsigned int i=0, j=0; i<count; i++, j+=4) {
index = *(fb + i);
*( (uint32_t*)(pixels + j) ) = (uint32_t)(
((uint32_t)(colormap[index].red) << 0 ) |
((uint32_t)(colormap[index].green) << 8 ) |
((uint32_t)(colormap[index].blue) << 16) |
((uint32_t)0xff << 24)
);
}
for (unsigned int i=0, j=0; i<count; i++, j+=4) {
uint8_t index = *(fb + i);
*( (uint32_t*)(pixels + j) ) = (uint32_t)(
((uint32_t)(colormap[index].red) << 0 ) |
((uint32_t)(colormap[index].green) << 8 ) |
((uint32_t)(colormap[index].blue) << 16) |
((uint32_t)0xff << 24)
);
}
glBindTexture(GL_TEXTURE_2D, a2TextureName);