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

[client] egl: only use a single texture but multiple PBOs

Browse Source
This commit is contained in:
Geoffrey McRae 2020-12-31 14:18:38 +11:00
parent 678ba0f484
commit 1e4e582f67
1 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
client/renderers/EGL/texture.c
View File

@ -32,18 +32,17 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <SDL2/SDL_egl.h> #include <SDL2/SDL_egl.h>
/* this must be a multiple of 2 */ /* this must be a multiple of 2 */
#define TEXTURE_COUNT 2 #define BUFFER_COUNT 2
struct Tex struct Buffer
{ {
GLuint t;
bool hasPBO; bool hasPBO;
GLuint pbo; GLuint pbo;
void * map; void * map;
GLsync sync; GLsync sync;
}; };
struct TexState struct BufferState
{ {
_Atomic(uint8_t) w, u, s, d; _Atomic(uint8_t) w, u, s, d;
}; };
@ -66,9 +65,10 @@ struct EGL_Texture
unsigned int fourcc; unsigned int fourcc;
size_t pboBufferSize; size_t pboBufferSize;
struct TexState state; struct BufferState state;
int textureCount; int bufferCount;
struct Tex tex[TEXTURE_COUNT]; GLuint tex;
struct Buffer buf[BUFFER_COUNT];
}; };
bool egl_texture_init(EGL_Texture ** texture, EGLDisplay * display) bool egl_texture_init(EGL_Texture ** texture, EGLDisplay * display)
@ -92,25 +92,24 @@ void egl_texture_free(EGL_Texture ** texture)
glDeleteSamplers(1, &(*texture)->sampler); glDeleteSamplers(1, &(*texture)->sampler);
for(int i = 0; i < (*texture)->textureCount; ++i) for(int i = 0; i < (*texture)->bufferCount; ++i)
{ {
struct Tex * t = &(*texture)->tex[i]; struct Buffer * b = &(*texture)->buf[i];
if (t->hasPBO) if (b->hasPBO)
{ {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, t->pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, b->pbo);
if ((*texture)->tex[i].map) if ((*texture)->buf[i].map)
{ {
glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
(*texture)->tex[i].map = NULL; (*texture)->buf[i].map = NULL;
} }
glDeleteBuffers(1, &t->pbo); glDeleteBuffers(1, &b->pbo);
if (t->sync) if (b->sync)
glDeleteSync(t->sync); glDeleteSync(b->sync);
} }
glDeleteTextures(1, &t->t);
} }
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
glDeleteTextures(1, &(*texture)->tex);
free(*texture); free(*texture);
*texture = NULL; *texture = NULL;
@ -118,18 +117,19 @@ void egl_texture_free(EGL_Texture ** texture)
static bool egl_texture_map(EGL_Texture * texture, uint8_t i) static bool egl_texture_map(EGL_Texture * texture, uint8_t i)
{ {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->tex[i].pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->buf[i].pbo);
texture->tex[i].map = glMapBufferRange( texture->buf[i].map = glMapBufferRange(
GL_PIXEL_UNPACK_BUFFER, GL_PIXEL_UNPACK_BUFFER,
0, 0,
texture->pboBufferSize, texture->pboBufferSize,
GL_MAP_WRITE_BIT | GL_MAP_WRITE_BIT |
GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_UNSYNCHRONIZED_BIT |
GL_MAP_INVALIDATE_BUFFER_BIT GL_MAP_INVALIDATE_BUFFER_BIT |
GL_MAP_PERSISTENT_BIT
); );
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
if (!texture->tex[i].map) if (!texture->buf[i].map)
{ {
EGL_ERROR("glMapBufferRange failed for %d of %lu bytes", i, texture->pboBufferSize); EGL_ERROR("glMapBufferRange failed for %d of %lu bytes", i, texture->pboBufferSize);
return false; return false;
@ -140,26 +140,26 @@ static bool egl_texture_map(EGL_Texture * texture, uint8_t i)
static void egl_texture_unmap(EGL_Texture * texture, uint8_t i) static void egl_texture_unmap(EGL_Texture * texture, uint8_t i)
{ {
if (!texture->tex[i].map) if (!texture->buf[i].map)
return; return;
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->tex[i].pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->buf[i].pbo);
glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
texture->tex[i].map = NULL; texture->buf[i].map = NULL;
} }
bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_t width, size_t height, size_t stride, bool streaming, bool useDMA) bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_t width, size_t height, size_t stride, bool streaming, bool useDMA)
{ {
if (texture->streaming && !useDMA) if (texture->streaming && !useDMA)
{ {
for(int i = 0; i < texture->textureCount; ++i) for(int i = 0; i < texture->bufferCount; ++i)
{ {
egl_texture_unmap(texture, i); egl_texture_unmap(texture, i);
if (texture->tex[i].hasPBO) if (texture->buf[i].hasPBO)
{ {
glDeleteBuffers(1, &texture->tex[i].pbo); glDeleteBuffers(1, &texture->buf[i].pbo);
texture->tex[i].hasPBO = false; texture->buf[i].hasPBO = false;
} }
} }
} }
@ -169,7 +169,7 @@ bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_
texture->height = height; texture->height = height;
texture->stride = stride; texture->stride = stride;
texture->streaming = streaming; texture->streaming = streaming;
texture->textureCount = streaming ? TEXTURE_COUNT : 1; texture->bufferCount = streaming ? BUFFER_COUNT : 1;
texture->ready = false; texture->ready = false;
atomic_store_explicit(&texture->state.w, 0, memory_order_relaxed); atomic_store_explicit(&texture->state.w, 0, memory_order_relaxed);
@ -222,12 +222,9 @@ bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_
texture->pitch = stride / texture->bpp; texture->pitch = stride / texture->bpp;
for(int i = 0; i < texture->textureCount; ++i) if (texture->tex)
{ glDeleteTextures(1, &texture->tex);
if (texture->tex[0].t) glGenTextures(1, &texture->tex);
glDeleteTextures(1, &texture->tex[i].t);
glGenTextures(1, &texture->tex[i].t);
}
if (!texture->sampler) if (!texture->sampler)
{ {
@ -241,29 +238,30 @@ bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_
if (useDMA) if (useDMA)
return true; return true;
for(int i = 0; i < texture->textureCount; ++i) glBindTexture(GL_TEXTURE_2D, texture->tex);
{
glBindTexture(GL_TEXTURE_2D, texture->tex[i].t);
glTexImage2D(GL_TEXTURE_2D, 0, texture->intFormat, texture->width, glTexImage2D(GL_TEXTURE_2D, 0, texture->intFormat, texture->width,
texture->height, 0, texture->format, texture->dataType, NULL); texture->height, 0, texture->format, texture->dataType, NULL);
}
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
if (!streaming) if (!streaming)
return true; return true;
for(int i = 0; i < texture->textureCount; ++i) for(int i = 0; i < texture->bufferCount; ++i)
{ {
glGenBuffers(1, &texture->tex[i].pbo); glGenBuffers(1, &texture->buf[i].pbo);
texture->tex[i].hasPBO = true; texture->buf[i].hasPBO = true;
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->tex[i].pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->buf[i].pbo);
glBufferStorage( glBufferStorage(
GL_PIXEL_UNPACK_BUFFER, GL_PIXEL_UNPACK_BUFFER,
texture->pboBufferSize, texture->pboBufferSize,
NULL, NULL,
GL_MAP_WRITE_BIT GL_MAP_WRITE_BIT |
GL_MAP_PERSISTENT_BIT
); );
if (!egl_texture_map(texture, i))
return false;
} }
return true; return true;
@ -295,17 +293,13 @@ bool egl_texture_update(EGL_Texture * texture, const uint8_t * buffer)
return true; return true;
} }
const uint8_t t = sw % TEXTURE_COUNT; const uint8_t b = sw % BUFFER_COUNT;
if (!egl_texture_map(texture, t)) memcpy(texture->buf[b].map, buffer, texture->pboBufferSize);
return EGL_TEX_STATUS_ERROR;
memcpy(texture->tex[t].map, buffer, texture->pboBufferSize);
atomic_fetch_add_explicit(&texture->state.w, 1, memory_order_release); atomic_fetch_add_explicit(&texture->state.w, 1, memory_order_release);
egl_texture_unmap(texture, t);
} }
else else
{ {
glBindTexture(GL_TEXTURE_2D, texture->tex[0].t); glBindTexture(GL_TEXTURE_2D, texture->tex);
glPixelStorei(GL_UNPACK_ROW_LENGTH, texture->pitch); glPixelStorei(GL_UNPACK_ROW_LENGTH, texture->pitch);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texture->width, texture->height, glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texture->width, texture->height,
texture->format, texture->dataType, buffer); texture->format, texture->dataType, buffer);
@ -328,13 +322,11 @@ bool egl_texture_update_from_frame(EGL_Texture * texture, const FrameBuffer * fr
return true; return true;
} }
const uint8_t t = sw % TEXTURE_COUNT; const uint8_t b = sw % BUFFER_COUNT;
if (!egl_texture_map(texture, t))
return EGL_TEX_STATUS_ERROR;
framebuffer_read( framebuffer_read(
frame, frame,
texture->tex[t].map, texture->buf[b].map,
texture->stride, texture->stride,
texture->height, texture->height,
texture->width, texture->width,
@ -343,7 +335,6 @@ bool egl_texture_update_from_frame(EGL_Texture * texture, const FrameBuffer * fr
); );
atomic_fetch_add_explicit(&texture->state.w, 1, memory_order_release); atomic_fetch_add_explicit(&texture->state.w, 1, memory_order_release);
egl_texture_unmap(texture, t);
return true; return true;
} }
@ -362,7 +353,6 @@ bool egl_texture_update_from_dma(EGL_Texture * texture, const FrameBuffer * fram
return true; return true;
} }
const uint8_t t = sw % TEXTURE_COUNT;
EGLAttrib const attribs[] = EGLAttrib const attribs[] =
{ {
EGL_WIDTH , texture->width, EGL_WIDTH , texture->width,
@ -390,7 +380,7 @@ bool egl_texture_update_from_dma(EGL_Texture * texture, const FrameBuffer * fram
} }
/* bind the texture and initiate the transfer */ /* bind the texture and initiate the transfer */
glBindTexture(GL_TEXTURE_2D, texture->tex[t].t); glBindTexture(GL_TEXTURE_2D, texture->tex);
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image); glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
/* wait for completion */ /* wait for completion */
@ -418,20 +408,20 @@ enum EGL_TexStatus egl_texture_process(EGL_Texture * texture)
nextu == atomic_load_explicit(&texture->state.d, memory_order_acquire)) nextu == atomic_load_explicit(&texture->state.d, memory_order_acquire))
return texture->ready ? EGL_TEX_STATUS_OK : EGL_TEX_STATUS_NOTREADY; return texture->ready ? EGL_TEX_STATUS_OK : EGL_TEX_STATUS_NOTREADY;
const uint8_t t = su % TEXTURE_COUNT; const uint8_t b = su % BUFFER_COUNT;
/* update the texture */ /* update the texture */
if (!texture->dma) if (!texture->dma)
{ {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->tex[t].pbo); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->buf[b].pbo);
glBindTexture(GL_TEXTURE_2D, texture->tex[t].t); glBindTexture(GL_TEXTURE_2D, texture->tex);
glPixelStorei(GL_UNPACK_ROW_LENGTH, texture->pitch); glPixelStorei(GL_UNPACK_ROW_LENGTH, texture->pitch);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texture->width, texture->height, glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texture->width, texture->height,
texture->format, texture->dataType, (const void *)0); texture->format, texture->dataType, (const void *)0);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
/* create a fence to prevent usage before the update is complete */ /* create a fence to prevent usage before the update is complete */
texture->tex[t].sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); texture->buf[b].sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
/* we must flush to ensure the sync is in the command buffer */ /* we must flush to ensure the sync is in the command buffer */
glFlush(); glFlush();
@ -453,20 +443,20 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
if (!texture->ready) if (!texture->ready)
return EGL_TEX_STATUS_NOTREADY; return EGL_TEX_STATUS_NOTREADY;
const uint8_t t = ss % TEXTURE_COUNT; const uint8_t b = ss % BUFFER_COUNT;
if (texture->dma) if (texture->dma)
{ {
ss = atomic_fetch_add_explicit(&texture->state.s, 1, ss = atomic_fetch_add_explicit(&texture->state.s, 1,
memory_order_release) + 1; memory_order_release) + 1;
} }
else if (texture->tex[t].sync != 0) else if (texture->buf[b].sync != 0)
{ {
switch(glClientWaitSync(texture->tex[t].sync, 0, 20000000)) // 20ms switch(glClientWaitSync(texture->buf[b].sync, 0, 20000000)) // 20ms
{ {
case GL_ALREADY_SIGNALED: case GL_ALREADY_SIGNALED:
case GL_CONDITION_SATISFIED: case GL_CONDITION_SATISFIED:
glDeleteSync(texture->tex[t].sync); glDeleteSync(texture->buf[b].sync);
texture->tex[t].sync = 0; texture->buf[b].sync = 0;
ss = atomic_fetch_add_explicit(&texture->state.s, 1, ss = atomic_fetch_add_explicit(&texture->state.s, 1,
memory_order_release) + 1; memory_order_release) + 1;
@ -477,8 +467,8 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
case GL_WAIT_FAILED: case GL_WAIT_FAILED:
case GL_INVALID_VALUE: case GL_INVALID_VALUE:
glDeleteSync(texture->tex[t].sync); glDeleteSync(texture->buf[b].sync);
texture->tex[t].sync = 0; texture->buf[b].sync = 0;
EGL_ERROR("glClientWaitSync failed"); EGL_ERROR("glClientWaitSync failed");
return EGL_TEX_STATUS_ERROR; return EGL_TEX_STATUS_ERROR;
} }
@ -489,9 +479,8 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
memory_order_release) + 1; memory_order_release) + 1;
} }
const uint8_t t = sd % TEXTURE_COUNT;
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, texture->tex[t].t); glBindTexture(GL_TEXTURE_2D, texture->tex);
glBindSampler(0, texture->sampler); glBindSampler(0, texture->sampler);
return EGL_TEX_STATUS_OK; return EGL_TEX_STATUS_OK;