hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

temporarily reducing vertex buffer size to test perf impact

This commit is contained in:
martinfouilleul 2023-02-06 09:20:52 +01:00
parent fd836c00dd
commit 3dfaea1bba
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gles_canvas.c
View File

@ -83,11 +83,11 @@ enum {
}; };
enum { enum {
MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH = 1<<20, MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH = 8<<10,
MG_GLES_CANVAS_VERTEX_BUFFER_SIZE = MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH * LAYOUT_VERTEX_SIZE, MG_GLES_CANVAS_VERTEX_BUFFER_SIZE = MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH * LAYOUT_VERTEX_SIZE,
MG_GLES_CANVAS_INDEX_BUFFER_SIZE = MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH * LAYOUT_INT_SIZE, MG_GLES_CANVAS_INDEX_BUFFER_SIZE = MG_GLES_CANVAS_DEFAULT_BUFFER_LENGTH * LAYOUT_INT_SIZE,
MG_GLES_CANVAS_TILE_COUNTER_BUFFER_SIZE = 65536, MG_GLES_CANVAS_TILE_COUNTER_BUFFER_SIZE = 65536,
MG_GLES_CANVAS_TILE_ARRAY_SIZE = 4096, MG_GLES_CANVAS_TILE_ARRAY_SIZE = sizeof(int)*4096,
MG_GLES_CANVAS_TILE_ARRAY_BUFFER_SIZE = MG_GLES_CANVAS_TILE_COUNTER_BUFFER_SIZE * MG_GLES_CANVAS_TILE_ARRAY_SIZE, MG_GLES_CANVAS_TILE_ARRAY_BUFFER_SIZE = MG_GLES_CANVAS_TILE_COUNTER_BUFFER_SIZE * MG_GLES_CANVAS_TILE_ARRAY_SIZE,
}; };
@ -171,18 +171,17 @@ void mg_gles_canvas_draw_batch(mg_canvas_backend* interface, u32 vertexCount, u3
const int tileSize = 16; const int tileSize = 16;
const int tileCountX = (frame.w + tileSize - 1)/tileSize; const int tileCountX = (frame.w + tileSize - 1)/tileSize;
const int tileCountY = (frame.h + tileSize - 1)/tileSize; const int tileCountY = (frame.h + tileSize - 1)/tileSize;
const int tileArraySize = 4096; const int tileArraySize = MG_GLES_CANVAS_TILE_ARRAY_SIZE;
//TODO: ensure there's enough space in tile buffer //TODO: ensure there's enough space in tile buffer
//NOTE: first clear counters //NOTE: first clear counters
/*
glUseProgram(backend->clearCounterProgram); glUseProgram(backend->clearCounterProgram);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->tileCounterBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->tileCounterBuffer);
glDispatchCompute(tileCountX*tileCountY, 1, 1); glDispatchCompute(tileCountX*tileCountY, 1, 1);
*/
//NOTE: we first distribute triangles into tiles: //NOTE: we first distribute triangles into tiles:
/*
glUseProgram(backend->tileProgram); glUseProgram(backend->tileProgram);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer);
@ -196,9 +195,8 @@ void mg_gles_canvas_draw_batch(mg_canvas_backend* interface, u32 vertexCount, u3
glUniform1ui(3, tileArraySize); glUniform1ui(3, tileArraySize);
glDispatchCompute(indexCount/3, 1, 1); glDispatchCompute(indexCount/3, 1, 1);
*/
//NOTE: next we sort triangles in each tile //NOTE: next we sort triangles in each tile
/*
glUseProgram(backend->sortProgram); glUseProgram(backend->sortProgram);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer);
@ -212,7 +210,6 @@ void mg_gles_canvas_draw_batch(mg_canvas_backend* interface, u32 vertexCount, u3
glUniform1ui(3, tileArraySize); glUniform1ui(3, tileArraySize);
glDispatchCompute(tileCountX * tileCountY, 1, 1); glDispatchCompute(tileCountX * tileCountY, 1, 1);
*/
//TODO: then we fire the fragment shader that will select only triangles in its tile //TODO: then we fire the fragment shader that will select only triangles in its tile
// glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT); // glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
@ -220,22 +217,20 @@ void mg_gles_canvas_draw_batch(mg_canvas_backend* interface, u32 vertexCount, u3
glUseProgram(backend->drawProgram); glUseProgram(backend->drawProgram);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, backend->vertexBuffer);
/* glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, backend->indexBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, backend->indexBuffer);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, backend->tileCounterBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, backend->tileCounterBuffer);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, backend->tileArrayBuffer); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, backend->tileArrayBuffer);
*/
/*
glBindImageTexture(0, backend->outTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8); glBindImageTexture(0, backend->outTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8);
glUniform1ui(0, indexCount); glUniform1ui(0, indexCount);
glUniform2ui(1, tileCountX, tileCountY); glUniform2ui(1, tileCountX, tileCountY);
glUniform1ui(2, tileSize); glUniform1ui(2, tileSize);
glUniform1ui(3, tileArraySize); glUniform1ui(3, tileArraySize);
*/
glDispatchCompute(tileCountX, tileCountY, 1); glDispatchCompute(tileCountX, tileCountY, 1);
//NOTE: now blit out texture to surface //NOTE: now blit out texture to surface
/*
glUseProgram(backend->blitProgram); glUseProgram(backend->blitProgram);
glBindBuffer(GL_ARRAY_BUFFER, backend->dummyVertexBuffer); glBindBuffer(GL_ARRAY_BUFFER, backend->dummyVertexBuffer);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
@ -243,7 +238,7 @@ void mg_gles_canvas_draw_batch(mg_canvas_backend* interface, u32 vertexCount, u3
glUniform1i(0, 0); glUniform1i(0, 0);
glDrawArrays(GL_TRIANGLES, 0, 6); glDrawArrays(GL_TRIANGLES, 0, 6);
*/
mg_gles_canvas_update_vertex_layout(backend); mg_gles_canvas_update_vertex_layout(backend);
} }

20
src/gles_canvas_shaders/gles_canvas_draw.glsl
View File

@ -38,12 +38,6 @@ layout(location = 3) uniform uint tileArraySize;
layout(rgba8, binding = 0) uniform restrict writeonly image2D outTexture; layout(rgba8, binding = 0) uniform restrict writeonly image2D outTexture;
void main()
{}
#if 0
bool is_top_left(ivec2 a, ivec2 b) bool is_top_left(ivec2 a, ivec2 b)
{ {
return( (a.y == b.y && b.x < a.x) return( (a.y == b.y && b.x < a.x)
@ -58,12 +52,7 @@ int orient2d(ivec2 a, ivec2 b, ivec2 p)
void main() void main()
{ {
ivec2 pixelCoord = ivec2(gl_WorkGroupID.xy*uvec2(16, 16) + gl_LocalInvocationID.xy); ivec2 pixelCoord = ivec2(gl_WorkGroupID.xy*uvec2(16, 16) + gl_LocalInvocationID.xy);
imageStore(outTexture, pixelCoord, vec4(1, 0, 1, 1));
return;
uvec2 tileCoord = uvec2(pixelCoord) / tileSize; uvec2 tileCoord = uvec2(pixelCoord) / tileSize;
uint tileIndex = tileCoord.y * tileCount.x + tileCoord.x; uint tileIndex = tileCoord.y * tileCount.x + tileCoord.x;
uint tileCounter = tileCounterBuffer.elements[tileIndex]; uint tileCounter = tileCounterBuffer.elements[tileIndex];
@ -87,12 +76,12 @@ void main()
centerPoint + ivec2(-6, -2), centerPoint + ivec2(-6, -2),
centerPoint + ivec2(2, -6)); centerPoint + ivec2(2, -6));
//DEBUG //DEBUG
//* /*
{ {
vec4 fragColor = vec4(0); vec4 fragColor = vec4(0);
/*
if( pixelCoord.x % 16 == 0 if( pixelCoord.x % 16 == 0
||pixelCoord.y % 16 == 0) ||pixelCoord.y % 16 == 0)
{ {
fragColor = vec4(0, 0, 0, 1); fragColor = vec4(0, 0, 0, 1);
} }
@ -108,7 +97,6 @@ void main()
{ {
fragColor = vec4(1, 0, 0, 1); fragColor = vec4(1, 0, 0, 1);
} }
*/
imageStore(outTexture, pixelCoord, fragColor); imageStore(outTexture, pixelCoord, fragColor);
return; return;
} }
@ -209,5 +197,3 @@ void main()
imageStore(outTexture, pixelCoord, pixelColor/float(sampleCount)); imageStore(outTexture, pixelCoord, pixelColor/float(sampleCount));
} }
#endif