diff options
| author | Ed Heyl <ed@google.com> | 2012-07-26 13:56:55 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-26 13:57:07 -0700 |
| commit | 64c5a59be97ce8c6d05fb16a9c9f49ba520a35b3 (patch) | |
| tree | 5373a38153aafe7621f5db37afb27753022bfa24 /minui | |
| parent | 17495277b1a6328f5cae68523ad00be1f1107950 (diff) | |
| parent | 862d026fb2aebb3e30be68ce2f48ef226e8c3a20 (diff) | |
| download | bootable_recovery-64c5a59be97ce8c6d05fb16a9c9f49ba520a35b3.zip bootable_recovery-64c5a59be97ce8c6d05fb16a9c9f49ba520a35b3.tar.gz bootable_recovery-64c5a59be97ce8c6d05fb16a9c9f49ba520a35b3.tar.bz2 | |
fix conflicts with merge of jb-dev-mako
Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800
Diffstat (limited to 'minui')
| -rw-r--r-- | minui/graphics.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/minui/graphics.c b/minui/graphics.c index 296e2e0..81f13ad 100644 --- a/minui/graphics.c +++ b/minui/graphics.c @@ -44,6 +44,8 @@ #define PIXEL_SIZE 2 #endif +#define NUM_BUFFERS 2 + typedef struct { GGLSurface texture; unsigned cwidth; @@ -54,7 +56,7 @@ typedef struct { static GRFont *gr_font = 0; static GGLContext *gr_context = 0; static GGLSurface gr_font_texture; -static GGLSurface gr_framebuffer[2]; +static GGLSurface gr_framebuffer[NUM_BUFFERS]; static GGLSurface gr_mem_surface; static unsigned gr_active_fb = 0; static unsigned double_buffering = 0; @@ -169,7 +171,7 @@ static void get_memory_surface(GGLSurface* ms) { static void set_active_framebuffer(unsigned n) { if (n > 1 || !double_buffering) return; - vi.yres_virtual = vi.yres * PIXEL_SIZE; + vi.yres_virtual = vi.yres * NUM_BUFFERS; vi.yoffset = n * vi.yres; vi.bits_per_pixel = PIXEL_SIZE * 8; if (ioctl(gr_fb_fd, FBIOPUT_VSCREENINFO, &vi) < 0) { |