mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix compile neutrino don't use USE_NEVIS_GXA

Browse Source
This commit is contained in:
Michael Liebmann
2013-05-28 13:01:52 +02:00
parent 820426eaaa
commit 2b03fd0ddc
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/framebuffer.cpp
View File

@@ -758,6 +758,7 @@ void CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, const int
#else #else
int swidth = stride / sizeof(fb_pixel_t); int swidth = stride / sizeof(fb_pixel_t);
fb_pixel_t *fbp = getFrameBufferPointer() + (swidth * y); fb_pixel_t *fbp = getFrameBufferPointer() + (swidth * y);
int line = 0;
while (line < dy) { while (line < dy) {
for (int pos = x; pos < x + dx; pos++) for (int pos = x; pos < x + dx; pos++)
*(fbp + pos) = col; *(fbp + pos) = col;
@@ -1745,7 +1746,7 @@ void * CFrameBuffer::convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, uns
return int_convertRGB2FB(rgbbuff, x, y, 0, true); return int_convertRGB2FB(rgbbuff, x, y, 0, true);
} }
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp) void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool /*transp*/)
{ {
int xc, yc; int xc, yc;
@@ -1808,7 +1809,7 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
d2 = (fb_pixel_t *) d; d2 = (fb_pixel_t *) d;
for (int count2 = 0; count2 < xc; count2++ ) { for (int count2 = 0; count2 < xc; count2++ ) {
fb_pixel_t pix = *(pixpos + xp); fb_pixel_t pix = *(pixpos + xp);
if (!transp || (pix & 0xff000000) == 0xff000000) if ((pix & 0xff000000) == 0xff000000)
*d2 = pix; *d2 = pix;
else { else {
uint8_t *in = (uint8_t *)(pixpos + xp); uint8_t *in = (uint8_t *)(pixpos + xp);
@@ -1825,11 +1826,6 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
} }
d += stride; d += stride;
} }
#if 0
for(int i = 0; i < yc; i++){
memmove(clfb + (i + yoff)*stride + xoff*4, ip + (i + yp)*width + xp, xc*4);
}
#endif
} }
void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, int x_pan, int y_pan, int x_offs, int y_offs, bool clearfb, int transp) void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, int x_pan, int y_pan, int x_offs, int y_offs, bool clearfb, int transp)

2
src/driver/framebuffer.h
View File

@@ -237,7 +237,7 @@ class CFrameBuffer
void add_gxa_sync_marker(void); void add_gxa_sync_marker(void);
void waitForIdle(const char* func=NULL); void waitForIdle(const char* func=NULL);
#else #else
inline void waitForIdle(void) {}; inline void waitForIdle(const char*) {};
#endif #endif
void* convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y, int transp = 0xFF); void* convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y, int transp = 0xFF);
void* convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y); void* convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y);