mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

framebuffer: fix unscaled paintings; this fixes our starbar

Browse Source 
Origin commit data
------------------
Commit: f6f1a71b39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer: fix unscaled paintings; this fixes our starbar
This commit is contained in:
vanhofen
2017-03-28 12:36:26 +02:00
parent 3b59835dce
commit d98f9e816c
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -306,6 +306,12 @@ void CFbAccelCSHD1::blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_
uint32_t xc = (width > xRes) ? (uint32_t)xRes : width; uint32_t xc = (width > xRes) ? (uint32_t)xRes : width;
uint32_t yc = (height > yRes) ? (uint32_t)yRes : height; uint32_t yc = (height > yRes) ? (uint32_t)yRes : height;
//NI
if (unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w;
if (unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h;
void* uKva = cs_phys_addr((void*)boxBuf); void* uKva = cs_phys_addr((void*)boxBuf);
if(uKva != NULL) { if(uKva != NULL) {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);

6
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -169,6 +169,12 @@ void CFbAccelCSHD2::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint3
xc = (width > xRes) ? xRes : width; xc = (width > xRes) ? xRes : width;
yc = (height > yRes) ? yRes : height; yc = (height > yRes) ? yRes : height;
//NI
if (unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w;
if (unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h;
if(!(width%4)) { if(!(width%4)) {
fb_image image; fb_image image;
image.dx = xoff; image.dx = xoff;

7
src/driver/fb_generic.cpp
View File

@@ -1673,14 +1673,11 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
xc = (width > xRes) ? xRes : width; xc = (width > xRes) ? xRes : width;
yc = (height > yRes) ? yRes : height; yc = (height > yRes) ? yRes : height;
//FIXME
#if 0
//NI //NI
if(unscaled_w != 0 && (int)unscaled_w < xc) if (unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w; xc = unscaled_w;
if(unscaled_h != 0 && (int)unscaled_h < yc) if (unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h; yc = unscaled_h;
#endif
fb_pixel_t* data = (fb_pixel_t *) fbbuff; fb_pixel_t* data = (fb_pixel_t *) fbbuff;