Skip to content

feat: implements support for specifying depth order of drawing commands #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: implements support for specifying depth order of drawing commands #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f897a71
Implements support for specifying depth order of drawing commands
simsaens Aug 7, 2024
c67e349
Fixed spacing
simsaens Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/vg/vg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ void transformTranslate(Context* ctx, float x, float y);
void transformRotate(Context* ctx, float ang_rad);
void transformMult(Context* ctx, const float* mtx, TransformOrder::Enum order);
void setViewBox(Context* ctx, float x, float y, float w, float h);
void depthOrder(Context* ctx, uint32_t order);

void getTransform(Context* ctx, float* mtx);
void getScissor(Context* ctx, float* rect);
Expand Down
48 changes: 44 additions & 4 deletions src/vg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ struct State
float m_GlobalAlpha;
float m_FontScale;
float m_AvgScale;
uint32_t m_DepthOrder;
};

struct ClipState
Expand Down Expand Up @@ -128,6 +129,7 @@ struct DrawCommand
uint32_t m_NumVertices;
uint32_t m_NumIndices;
uint16_t m_ScissorRect[4];
uint32_t m_DepthOrder;
uint16_t m_HandleID; // Type::Textured => ImageHandle, Type::ColorGradient => GradientHandle, Type::ImagePattern => ImagePatternHandle
};

Expand Down Expand Up @@ -229,6 +231,7 @@ struct CommandType
TransformRotate,
TransformMult,
SetViewBox,
DepthOrder,
SetGlobalAlpha,

// Text
Expand Down Expand Up @@ -329,6 +332,7 @@ struct ContextVTable
void(*transformRotate)(Context* ctx, float ang_rad);
void(*transformMult)(Context* ctx, const float* mtx, TransformOrder::Enum order);
void(*setViewBox)(Context* ctx, float x, float y, float w, float h);
void(*depthOrder)(Context* ctx, uint32_t order);
void(*setGlobalAlpha)(Context* ctx, float alpha);
void(*text)(Context* ctx, const TextConfig& cfg, float x, float y, const char* str, const char* end);
void(*textBox)(Context* ctx, const TextConfig& cfg, float x, float y, float breakWidth, const char* text, const char* end, uint32_t textboxFlags);
Expand Down Expand Up @@ -544,6 +548,7 @@ static void ctxTransformTranslate(Context* ctx, float x, float y);
static void ctxTransformRotate(Context* ctx, float ang_rad);
static void ctxTransformMult(Context* ctx, const float* mtx, TransformOrder::Enum order);
static void ctxSetViewBox(Context* ctx, float x, float y, float w, float h);
static void ctxDepthOrder(Context* ctx, uint32_t order);
static void ctxSetGlobalAlpha(Context* ctx, float alpha);
static void ctxIndexedTriList(Context* ctx, const float* pos, const uv_t* uv, uint32_t numVertices, const Color* colors, uint32_t numColors, const uint16_t* indices, uint32_t numIndices, ImageHandle img);
static void ctxText(Context* ctx, const TextConfig& cfg, float x, float y, const char* str, const char* end);
Expand Down Expand Up @@ -590,6 +595,7 @@ static void aclTransformTranslate(Context* ctx, float x, float y);
static void aclTransformRotate(Context* ctx, float ang_rad);
static void aclTransformMult(Context* ctx, const float* mtx, TransformOrder::Enum order);
static void aclSetViewBox(Context* ctx, float x, float y, float w, float h);
static void aclDepthOrder(Context* ctx, uint32_t order);
static void aclSetGlobalAlpha(Context* ctx, float alpha);
static void aclIndexedTriList(Context* ctx, const float* pos, const uv_t* uv, uint32_t numVertices, const Color* colors, uint32_t numColors, const uint16_t* indices, uint32_t numIndices, ImageHandle img);
static void aclText(Context* ctx, const TextConfig& cfg, float x, float y, const char* str, const char* end);
Expand Down Expand Up @@ -635,6 +641,7 @@ const ContextVTable g_CtxVTable = {
ctxTransformRotate,
ctxTransformMult,
ctxSetViewBox,
ctxDepthOrder,
ctxSetGlobalAlpha,
ctxText,
ctxTextBox,
Expand Down Expand Up @@ -681,6 +688,7 @@ const ContextVTable g_ActiveCmdListVTable = {
aclTransformRotate,
aclTransformMult,
aclSetViewBox,
aclDepthOrder,
aclSetGlobalAlpha,
aclText,
aclTextBox,
Expand Down Expand Up @@ -1198,7 +1206,7 @@ void end(Context* ctx)

// TODO: Check if it's better to use Type_TexturedVertexColor program here to avoid too many
// state switches.
bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::Clip]);
bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::Clip], cmd->m_DepthOrder);
}

stencilState = 0
Expand Down Expand Up @@ -1244,7 +1252,7 @@ void end(Context* ctx)
| BGFX_STATE_BLEND_FUNC_SEPARATE(BGFX_STATE_BLEND_SRC_ALPHA, BGFX_STATE_BLEND_INV_SRC_ALPHA, BGFX_STATE_BLEND_ONE, BGFX_STATE_BLEND_INV_SRC_ALPHA));
bgfx::setStencil(stencilState);

bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::Textured]);
bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::Textured], cmd->m_DepthOrder);
} else if (cmd->m_Type == DrawCommand::Type::ColorGradient) {
VG_CHECK(cmd->m_HandleID != UINT16_MAX, "Invalid gradient handle");
Gradient* grad = &ctx->m_Gradients[cmd->m_HandleID];
Expand All @@ -1260,7 +1268,7 @@ void end(Context* ctx)
| BGFX_STATE_BLEND_FUNC_SEPARATE(BGFX_STATE_BLEND_SRC_ALPHA, BGFX_STATE_BLEND_INV_SRC_ALPHA, BGFX_STATE_BLEND_ONE, BGFX_STATE_BLEND_INV_SRC_ALPHA));
bgfx::setStencil(stencilState);

bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::ColorGradient]);
bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::ColorGradient], cmd->m_DepthOrder);
} else if(cmd->m_Type == DrawCommand::Type::ImagePattern) {
VG_CHECK(cmd->m_HandleID != UINT16_MAX, "Invalid image pattern handle");
ImagePattern* imgPattern = &ctx->m_ImagePatterns[cmd->m_HandleID];
Expand All @@ -1277,7 +1285,7 @@ void end(Context* ctx)
| BGFX_STATE_BLEND_FUNC_SEPARATE(BGFX_STATE_BLEND_SRC_ALPHA, BGFX_STATE_BLEND_INV_SRC_ALPHA, BGFX_STATE_BLEND_ONE, BGFX_STATE_BLEND_INV_SRC_ALPHA));
bgfx::setStencil(stencilState);

bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::ImagePattern]);
bgfx::submit(viewID, ctx->m_ProgramHandle[DrawCommand::Type::ImagePattern], cmd->m_DepthOrder);
} else {
VG_CHECK(false, "Unknown draw command type");
}
Expand Down Expand Up @@ -1670,6 +1678,15 @@ void setViewBox(Context* ctx, float x, float y, float w, float h)
ctxSetViewBox(ctx, x, y, w, h);
#endif
}

void depthOrder(Context* ctx, uint32_t order)
{
#if VG_CONFIG_COMMAND_LIST_BEGIN_END_API
ctx->m_VTable->depthOrder(ctx, order);
#else
ctxDepthOrder(ctx, order);
#endif
}

void indexedTriList(Context* ctx, const float* pos, const uv_t* uv, uint32_t numVertices, const Color* colors, uint32_t numColors, const uint16_t* indices, uint32_t numIndices, ImageHandle img)
{
Expand Down Expand Up @@ -2887,6 +2904,15 @@ void clTransformMult(Context* ctx, CommandListHandle handle, const float* mtx, T
CMD_WRITE(ptr, TransformOrder::Enum, order);
}

void clDepthOrder(Context* ctx, CommandListHandle handle, uint32_t order)
{
VG_CHECK(isValid(handle), "Invalid command list handle");
CommandList* cl = &ctx->m_CmdLists[handle.idx];

uint8_t* ptr = clAllocCommand(ctx, cl, CommandType::DepthOrder, sizeof(uint32_t));
CMD_WRITE(ptr, uint32_t, order);
}

void clSetViewBox(Context* ctx, CommandListHandle handle, float x, float y, float w, float h)
{
VG_CHECK(isValid(handle), "Invalid command list handle");
Expand Down Expand Up @@ -4117,6 +4143,12 @@ static void ctxSetViewBox(Context* ctx, float x, float y, float w, float h)
updateState(state);
}

static void ctxDepthOrder(Context* ctx, uint32_t order)
{
State* state = getState(ctx);
state->m_DepthOrder = order;
}

static void ctxSetGlobalAlpha(Context* ctx, float alpha)
{
State* state = getState(ctx);
Expand Down Expand Up @@ -4858,6 +4890,12 @@ static void aclTransformMult(Context* ctx, const float* mtx, TransformOrder::Enu
clTransformMult(ctx, ctx->m_ActiveCommandList, mtx, order);
}

static void aclDepthOrder(Context* ctx, uint32_t order)
{
VG_CHECK(isValid(ctx->m_ActiveCommandList), "Invalid Context state");
clDepthOrder(ctx, ctx->m_ActiveCommandList, order);
}

static void aclSetViewBox(Context* ctx, float x, float y, float w, float h)
{
VG_CHECK(isValid(ctx->m_ActiveCommandList), "Invalid Context state");
Expand Down Expand Up @@ -5396,6 +5434,7 @@ static DrawCommand* allocDrawCommand(Context* ctx, uint32_t numVertices, uint32_
cmd->m_ScissorRect[1] = (uint16_t)scissor[1];
cmd->m_ScissorRect[2] = (uint16_t)scissor[2];
cmd->m_ScissorRect[3] = (uint16_t)scissor[3];
cmd->m_DepthOrder = state->m_DepthOrder;
bx::memCopy(&cmd->m_ClipState, &ctx->m_ClipState, sizeof(ClipState));

ctx->m_ForceNewDrawCommand = false;
Expand Down Expand Up @@ -5445,6 +5484,7 @@ static DrawCommand* allocClipCommand(Context* ctx, uint32_t numVertices, uint32_
cmd->m_ScissorRect[1] = (uint16_t)scissor[1];
cmd->m_ScissorRect[2] = (uint16_t)scissor[2];
cmd->m_ScissorRect[3] = (uint16_t)scissor[3];
cmd->m_DepthOrder = state->m_DepthOrder;
cmd->m_ClipState.m_FirstCmdID = ~0u;
cmd->m_ClipState.m_NumCmds = 0;

Expand Down