From 9fc9e8912ed58dbf55c69fdd172544e620b0a5c4 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 9 Nov 2013 15:55:01 +0100 Subject: [PATCH] fbaccel: get rid of USE_OPENGL it's not really OpenGL we are using but glfb, and this is on all generic-hw boxes, so use the HAVE_GENERIC_HARDWARE define. --- src/driver/fbaccel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/driver/fbaccel.cpp b/src/driver/fbaccel.cpp index 8826dd38d..bcdffc3db 100644 --- a/src/driver/fbaccel.cpp +++ b/src/driver/fbaccel.cpp @@ -52,7 +52,7 @@ #include #include #endif -#ifdef USE_OPENGL +#if HAVE_GENERIC_HARDWARE #include extern GLFramebuffer *glfb; #endif @@ -317,7 +317,7 @@ CFbAccel::~CFbAccel() if (devmem_fd != -1) close(devmem_fd); #endif -#ifndef USE_OPENGL +#if ! HAVE_GENERIC_HARDWARE if (fb->lfb) munmap(fb->lfb, fb->available); if (fb->fd > -1) @@ -921,7 +921,7 @@ void CFbAccel::_blit() /* not azbox and not spark -> no blit() needed */ void CFbAccel::_blit() { -#ifdef USE_OPENGL +#if HAVE_GENERIC_HARDWARE if (glfb) glfb->blit(); #endif @@ -945,7 +945,7 @@ bool CFbAccel::init(void) fb_pixel_t *lfb; fb->lfb = NULL; fb->fd = -1; -#ifdef USE_OPENGL +#if HAVE_GENERIC_HARDWARE if (!glfb) { fprintf(stderr, "CFbAccel::init: GL Framebuffer is not set up? we are doomed...\n"); return false; @@ -988,7 +988,7 @@ bool CFbAccel::init(void) perror("mmap"); return false;; } -#endif +#endif /* ! GENERIC_HARDWARE */ memset(lfb, 0, fb->available); fb->lfb = lfb; @@ -1051,7 +1051,7 @@ int CFbAccel::setMode(void) si->bits_per_pixel = DEFAULT_BPP; fb->stride = si->xres * si->bits_per_pixel / 8; #else -#ifndef USE_OPENGL +#if ! HAVE_GENERIC_HARDWARE fb_fix_screeninfo _fix; if (ioctl(fd, FBIOGET_FSCREENINFO, &_fix) < 0) {