Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] fixed RGB support

Browse Source
This commit is contained in:
Geoffrey McRae 2017-11-19 10:46:11 +11:00
parent d1ef8d204a
commit 249801b52b
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/main.c
View File

@ -111,6 +111,8 @@ int renderThread(void * unused)
struct KVMGFXHeader format; struct KVMGFXHeader format;
SDL_Texture *texture = NULL; SDL_Texture *texture = NULL;
GLuint vboID[2] = {0, 0}; GLuint vboID[2] = {0, 0};
GLuint intFormat = 0;
GLuint vboFormat = 0;
GLuint vboTex = 0; GLuint vboTex = 0;
unsigned int texIndex = 0; unsigned int texIndex = 0;
uint8_t *pixels = (uint8_t*)state.shm; uint8_t *pixels = (uint8_t*)state.shm;
@ -192,8 +194,22 @@ int renderThread(void * unused)
uint8_t bpp; uint8_t bpp;
switch(state.shm->frameType) switch(state.shm->frameType)
{ {
case FRAME_TYPE_ARGB : sdlFormat = SDL_PIXELFORMAT_ARGB8888 ; drawFunc = drawFunc_ARGB ; bpp = 4; break; case FRAME_TYPE_ARGB:
case FRAME_TYPE_RGB : sdlFormat = SDL_PIXELFORMAT_RGB24 ; drawFunc = drawFunc_RGB ; bpp = 3; break; sdlFormat = SDL_PIXELFORMAT_ARGB8888;
drawFunc = drawFunc_ARGB;
bpp = 4;
intFormat = GL_RGBA8;
vboFormat = GL_BGRA;
break;
case FRAME_TYPE_RGB:
sdlFormat = SDL_PIXELFORMAT_RGB24;
drawFunc = drawFunc_RGB;
bpp = 3;
intFormat = GL_RGB8;
vboFormat = GL_BGR;
break;
default: default:
format.frameType = FRAME_TYPE_INVALID; format.frameType = FRAME_TYPE_INVALID;
continue; continue;
@ -243,10 +259,10 @@ int renderThread(void * unused)
glTexImage2D( glTexImage2D(
GL_TEXTURE_2D, GL_TEXTURE_2D,
0, 0,
GL_RGBA8, intFormat,
state.shm->width, state.shm->height, state.shm->width, state.shm->height,
0, 0,
GL_BGRA, vboFormat,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
(void*)0 (void*)0
); );
@ -278,7 +294,7 @@ int renderThread(void * unused)
0, 0,
0, 0, 0, 0,
state.shm->width, state.shm->height, state.shm->width, state.shm->height,
GL_BGRA, vboFormat,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
(void*)0 (void*)0
); );