1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

raspberry: remove unused screen size detection code

Browse Source 
The fbdev fallback code now resides in the default implemenatation of
the hooks.

Change-Id: Id3d2cd23ab826b90c0e6d442bfb222aa8c291646
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
This commit is contained in:
Johannes Zellner 2012-06-18 15:36:34 -07:00 committed by Qt by Nokia
parent e7836e6a9a
commit 60f2abff5e
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
View File

@ -49,15 +49,6 @@
#include <bcm_host.h> #include <bcm_host.h>
#if 0 //fb size query
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <linux/fb.h>
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static DISPMANX_DISPLAY_HANDLE_T dispman_display = 0; static DISPMANX_DISPLAY_HANDLE_T dispman_display = 0;
@ -268,29 +259,9 @@ void QEglFSPiHooks::platformDestroy()
QSize QEglFSPiHooks::screenSize() const QSize QEglFSPiHooks::screenSize() const
{ {
//both mechanisms work
#if 1
uint32_t width, height; uint32_t width, height;
graphics_get_display_size(0 /* LCD */, &width, &height); graphics_get_display_size(0 /* LCD */, &width, &height);
return QSize(width, height); return QSize(width, height);
#else
int fd = open("/dev/fb0", O_RDONLY);
if (fd == -1) {
fprintf(stderr, "Failed to open fb to detect screen resolution!\n");
return QSize();
}
struct fb_var_screeninfo vinfo;
if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) = -1) {
fprintf(stderr, "Could not query screen info variable\n");
close(fd);
return QSize();
}
close(fd);
return QSize(vinfo.xres, vinfo.yres);
#endif
} }
EGLNativeWindowType QEglFSPiHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) EGLNativeWindowType QEglFSPiHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)