Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 14:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] removed deprectaed drawFunc and improved error handling

Browse Source
This commit is contained in:
Geoffrey McRae 2017-11-25 17:26:26 +11:00
parent b221382420
commit e774a0bb06
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
client/main.c
View File

@ -66,18 +66,6 @@ inline bool areFormatsSame(const struct KVMGFXHeader s1, const struct KVMGFXHead
(s1.height == s2.height ); (s1.height == s2.height );
} }
void drawFunc_ARGB(uint8_t * dst, const uint8_t * src)
{
memcpySSE(dst, src, state.shm->height * state.shm->stride * 4);
ivshmem_kick_irq(state.shm->guestID, 0);
}
void drawFunc_RGB(uint8_t * dst, const uint8_t * src)
{
memcpySSE(dst, src, state.shm->height * state.shm->stride * 3);
ivshmem_kick_irq(state.shm->guestID, 0);
}
int renderThread(void * unused) int renderThread(void * unused)
{ {
struct KVMGFXHeader format; struct KVMGFXHeader format;
@ -87,9 +75,9 @@ int renderThread(void * unused)
GLuint vboFormat = 0; GLuint vboFormat = 0;
GLuint vboTex = 0; GLuint vboTex = 0;
unsigned int texIndex = 0; unsigned int texIndex = 0;
unsigned int texSize = 0;
uint8_t *pixels = (uint8_t*)state.shm; uint8_t *pixels = (uint8_t*)state.shm;
uint8_t *texPixels[2] = {NULL, NULL}; uint8_t *texPixels[2] = {NULL, NULL};
DrawFunc drawFunc = NULL;
format.version = 1; format.version = 1;
format.frameType = FRAME_TYPE_INVALID; format.frameType = FRAME_TYPE_INVALID;
@ -166,12 +154,11 @@ int renderThread(void * unused)
} }
Uint32 sdlFormat; Uint32 sdlFormat;
uint8_t bpp; unsigned int bpp;
switch(state.shm->frameType) switch(state.shm->frameType)
{ {
case FRAME_TYPE_ARGB: case FRAME_TYPE_ARGB:
sdlFormat = SDL_PIXELFORMAT_ARGB8888; sdlFormat = SDL_PIXELFORMAT_ARGB8888;
drawFunc = drawFunc_ARGB;
bpp = 4; bpp = 4;
intFormat = GL_RGBA8; intFormat = GL_RGBA8;
vboFormat = GL_BGRA; vboFormat = GL_BGRA;
@ -179,7 +166,6 @@ int renderThread(void * unused)
case FRAME_TYPE_RGB: case FRAME_TYPE_RGB:
sdlFormat = SDL_PIXELFORMAT_RGB24; sdlFormat = SDL_PIXELFORMAT_RGB24;
drawFunc = drawFunc_RGB;
bpp = 3; bpp = 3;
intFormat = GL_RGB8; intFormat = GL_RGB8;
vboFormat = GL_BGR; vboFormat = GL_BGR;
@ -196,25 +182,31 @@ int renderThread(void * unused)
if (state.hasBufferStorage) if (state.hasBufferStorage)
{ {
// calculate the texture size in bytes
texSize = state.shm->width * state.shm->stride * bpp;
// setup two buffers so we don't have to use fences // setup two buffers so we don't have to use fences
const size_t bufferSize = state.shm->width * state.shm->height * bpp;
glGenBuffers(2, vboID); glGenBuffers(2, vboID);
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
{ {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, vboID[i]); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, vboID[i]);
glBufferStorage (GL_PIXEL_UNPACK_BUFFER, bufferSize, 0, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); glBufferStorage (GL_PIXEL_UNPACK_BUFFER, texSize, 0, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
texPixels[i] = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, bufferSize, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); texPixels[i] = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, texSize, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
if (!texPixels[i]) if (!texPixels[i])
{ {
DEBUG_ERROR("Failed to map buffer range, turning off buffer storage"); DEBUG_ERROR("Failed to map buffer range, turning off buffer storage");
state.hasBufferStorage = false; state.hasBufferStorage = false;
texIndex = 0;
glDeleteBuffers(2, vboID); glDeleteBuffers(2, vboID);
memset(vboID, 0, sizeof(vboID)); memset(vboID, 0, sizeof(vboID));
continue; break;
} }
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
} }
if (!state.hasBufferStorage)
continue;
// create the texture // create the texture
glGenTextures(1, &vboTex); glGenTextures(1, &vboTex);
glBindTexture(GL_TEXTURE_2D, vboTex); glBindTexture(GL_TEXTURE_2D, vboTex);
@ -237,9 +229,11 @@ int renderThread(void * unused)
else else
{ {
texture = SDL_CreateTexture(state.renderer, sdlFormat, SDL_TEXTUREACCESS_STREAMING, state.shm->width, state.shm->height); texture = SDL_CreateTexture(state.renderer, sdlFormat, SDL_TEXTUREACCESS_STREAMING, state.shm->width, state.shm->height);
// this doesnt "lock" anything, pre-fetch the pointers for later use if (!texture)
int unused; {
SDL_LockTexture(texture, NULL, (void**)&texPixels, &unused); DEBUG_ERROR("Failed to create a texture");
break;
}
} }
memcpy(&format, state.shm, sizeof(format)); memcpy(&format, state.shm, sizeof(format));
@ -248,8 +242,9 @@ int renderThread(void * unused)
if (state.hasBufferStorage) if (state.hasBufferStorage)
{ {
// update the pixels // copy the buffer to the texture and let the guest advance
drawFunc(texPixels[texIndex ? 0 : 1], pixels + state.shm->dataPos); memcpySSE(texPixels[texIndex], pixels + state.shm->dataPos, texSize);
ivshmem_kick_irq(state.shm->guestID, 0);
// update the texture // update the texture
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
@ -282,7 +277,18 @@ int renderThread(void * unused)
} }
else else
{ {
drawFunc(texPixels[0], pixels + state.shm->dataPos); int pitch;
if (SDL_LockTexture(texture, NULL, (void**)&texPixels[0], &pitch) != 0)
{
DEBUG_ERROR("Failed to lock the texture for update");
break;
}
texSize = state.shm->height * pitch;
// copy the buffer to the texture and let the guest advance
memcpySSE(texPixels[texIndex], pixels + state.shm->dataPos, texSize);
ivshmem_kick_irq(state.shm->guestID, 0);
SDL_UnlockTexture(texture); SDL_UnlockTexture(texture);
SDL_RenderCopy(state.renderer, texture, NULL, NULL); SDL_RenderCopy(state.renderer, texture, NULL, NULL);
} }
@ -292,6 +298,7 @@ int renderThread(void * unused)
state.started = true; state.started = true;
} }
state.running = false;
if (state.hasBufferStorage) if (state.hasBufferStorage)
{ {
glDeleteTextures(1, &vboTex ); glDeleteTextures(1, &vboTex );
@ -299,6 +306,7 @@ int renderThread(void * unused)
glDeleteBuffers (2, vboID ); glDeleteBuffers (2, vboID );
} }
else else
if (texture)
SDL_DestroyTexture(texture); SDL_DestroyTexture(texture);
return 0; return 0;

8
common/KVMGFXHeader.h
View File

@ -33,13 +33,6 @@ typedef enum FrameType
FRAME_TYPE_MAX , // sentinel value FRAME_TYPE_MAX , // sentinel value
} FrameType; } FrameType;
typedef enum FrameComp
{
FRAME_COMP_NONE , // no compression
FRAME_COMP_BLACK_RLE , // basic run length encoding of black pixels for XOR mode
FRAME_COMP_MAX , // sentinel valule
} FrameComp;
struct KVMGFXHeader struct KVMGFXHeader
{ {
char magic[sizeof(KVMGFX_HEADER_MAGIC)]; char magic[sizeof(KVMGFX_HEADER_MAGIC)];
@ -47,7 +40,6 @@ struct KVMGFXHeader
uint16_t hostID; // the host ivshmem client id uint16_t hostID; // the host ivshmem client id
uint16_t guestID; // the guest ivshmem client id uint16_t guestID; // the guest ivshmem client id
FrameType frameType; // the frame type FrameType frameType; // the frame type
FrameComp compType; // frame compression mode
uint32_t width; // the width uint32_t width; // the width
uint32_t height; // the height uint32_t height; // the height
uint32_t stride; // the row stride uint32_t stride; // the row stride