lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move font out of Pipeline;

This commit is contained in:
bjorn 2018-12-24 18:58:21 -08:00 committed by Bjorn Swenson
parent 29748dc0db
commit 9f79dd95f4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/graphics.c
View File

@ -189,13 +189,11 @@ void lovrGraphicsPushPipeline() {
lovrAssert(++state.pipelineIndex < MAX_PIPELINES, "Unbalanced pipeline stack (more pushes than pops?)");
memcpy(&state.pipelines[state.pipelineIndex], &state.pipelines[state.pipelineIndex - 1], sizeof(Pipeline));
state.pipeline = &state.pipelines[state.pipelineIndex];
lovrRetain(state.pipeline->font);
lovrRetain(state.pipeline->shader);
state.pipeline->dirty = true;
}
void lovrGraphicsPopPipeline() {
lovrRelease(state.pipeline->font);
lovrRelease(state.pipeline->shader);
lovrAssert(--state.pipelineIndex >= 0, "Unbalanced pipeline stack (more pops than pushes?)");
state.pipeline = &state.pipelines[state.pipelineIndex];
@ -290,7 +288,7 @@ void lovrGraphicsSetDepthTest(CompareMode mode, bool write) {
}
Font* lovrGraphicsGetFont() {
if (!state.pipeline->font) {
if (!state.font) {
if (!state.defaultFont) {
Rasterizer* rasterizer = lovrRasterizerCreate(NULL, 32);
state.defaultFont = lovrFontCreate(rasterizer);
@ -300,14 +298,14 @@ Font* lovrGraphicsGetFont() {
lovrGraphicsSetFont(state.defaultFont);
}
return state.pipeline->font;
return state.font;
}
void lovrGraphicsSetFont(Font* font) {
if (state.pipeline->font != font) {
if (state.font != font) {
lovrRetain(font);
lovrRelease(state.pipeline->font);
state.pipeline->font = font;
lovrRelease(state.font);
state.font = font;
}
}

2
src/graphics/graphics.h
View File

@ -106,7 +106,6 @@ typedef struct {
bool culling;
CompareMode depthTest;
bool depthWrite;
Font* font;
float lineWidth;
float pointSize;
Shader* shader;
@ -151,6 +150,7 @@ typedef struct {
Color backgroundColor;
Canvas* canvas;
Color color;
Font* font;
DrawRequest batch;
int batchVertex;
int batchIndex;