Commit Graph

31 Commits

Author SHA1 Message Date
vanhofen
321a2f470f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-20 12:29:23 +01:00
Michael Liebmann
6fa6152445 framebuffer: Add fbCopyArea function
- Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
 without hardware acceleration


Origin commit data
------------------
Commit: cc5a1b3b31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
framebuffer: Add fbCopyArea function

 - Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
  without hardware acceleration
2017-02-20 00:09:46 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 21:52:59 +01:00
Michael Liebmann
15c81625d6 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


Origin commit data
------------------
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:11:08 +01:00
Stefan Seyfried
78419473da implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
2017-02-13 12:51:14 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:01:15 +01:00
Stefan Seyfried
75355dda2b fb_generic: add sanity check and missing mark() to painIcon8
Origin commit data
------------------
Commit: ec40cf7986
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:59:11 +01:00
Stefan Seyfried
f2bfc73bd5 fb_generic: initialization and deinitialization fixes
* initialize variables locked and cache_size in constructor
* set lfb pointer to NULL after munmap(), fd to -1 after close
* remove unused tty fd close()


Origin commit data
------------------
Commit: 1dd47e00c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:49:30 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
0e6e6db7bd pu/fb-modules: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 987dbe7f1d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:24:51 +01:00
vanhofen
4d15c4d61b Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
Stefan Seyfried
7a63618598 fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Commit: d498917594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
792a14b2f0 fb_accel: add TripleDragon framebuffer code
Origin commit data
------------------
Commit: b04b1d7f8c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
79931d6c88 fb_generic: open device O_CLOEXEC, better diagnostic output
Origin commit data
------------------
Commit: 8441a719cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
vanhofen
f7b4d9e941 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: 1e5b102802
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:38:28 +01:00
Michael Liebmann
adbb76744c fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: a4afe1e8e0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2

 Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp
2017-02-08 12:52:26 +01:00
Michael Liebmann
af6d3fb79a fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1
Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp


Origin commit data
------------------
Commit: 58bd8a4a63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1

 Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp
2017-02-08 12:52:25 +01:00
vanhofen
b2210d8a75 fix build; try to port our framebuffer changes (need fixes!)
Origin commit data
------------------
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)
2017-02-08 09:45:53 +01:00
Stefan Seyfried
e8c40d8b1d fb_accel: add backend for GL framebuffer
Origin commit data
------------------
Commit: 2498ebb314
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:23:42 +01:00
Michael Liebmann
d9aea52dba fb_accel: add accelerated framebuffer for Apollo graphic chips
Origin commit data
------------------
Commit: 6ff9ff695b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
b22ade9c3c fb_accel: add accelerated framebuffer for Nevis GXA chips
Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Commit: 0e63e5df3d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
b08de897ec fb_generic: fix blit2FB call
Origin commit data
------------------
Commit: ecb6531fd7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
3dfddef906 framebuffer: add accelerator for STi framebuffer
also add a generic helper class for other accelerated
framebuffer implementations


Origin commit data
------------------
Commit: 9fe5dfbe50
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
8d9c3702f6 fb_generic: nicer debug output, remove dead code
Origin commit data
------------------
Commit: beb2a67123
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
96e1de6a36 fb_generic: add fb_name member to identify fb implementation
Origin commit data
------------------
Commit: a58193dd56
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
48c1187acd fb_generic: add pointer for double-buffered fb
Origin commit data
------------------
Commit: 9ba84a629a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
6f744bcf77 fb_generic: remove all hardware specific code
Origin commit data
------------------
Commit: 3f63080454
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
59b946fc8d fb_generic: add stuff needed for compilation
Origin commit data
------------------
Commit: 3c381cd53b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
aaab6db1b9 start modularizing framebuffer acceleration architecture
This is just copied framebuffer.{h,cpp} => fb_generic.{h,cpp}
The idea is to implement CFrameBuffer as generic framebuffer class that
does work on almost every hardware without acceleration and / or
hardware dependencies.
CFbAccel will be a derived class (and different on many architectures)
which implements the accelerated functions.
This does not yet compile, verbatim copies to track development history.


Origin commit data
------------------
Commit: 5c2ee5e137
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00