diff options
author | chai <chaifix@163.com> | 2019-01-09 00:01:10 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2019-01-09 00:01:10 +0800 |
commit | c5dfd619814f1de3ec10a08c650e7214fad6a279 (patch) | |
tree | fef9be5edca05ce6a36e90a494353c526f8f0923 /src/libjin/graphics/fonts | |
parent | e7800a488a97f3172029aba82e6912ad50f7ae32 (diff) |
*opengl backend
Diffstat (limited to 'src/libjin/graphics/fonts')
-rw-r--r-- | src/libjin/graphics/fonts/je_texture_font.cpp | 1 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/je_ttf.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp index 52d9603..542fe7d 100644 --- a/src/libjin/graphics/fonts/je_texture_font.cpp +++ b/src/libjin/graphics/fonts/je_texture_font.cpp @@ -286,7 +286,6 @@ namespace JinEngine .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u); gl.bindTexture2D(info.texture); gl.drawArrays(GL_QUADS, 0, info.count); - gl.bindTexture2D(0); } shader->end(); } diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp index 7c40e7b..d145395 100644 --- a/src/libjin/graphics/fonts/je_ttf.cpp +++ b/src/libjin/graphics/fonts/je_ttf.cpp @@ -206,11 +206,11 @@ namespace JinEngine if (glGetError() != GL_NO_ERROR) { glDeleteTextures(1, &t); - gl.bindTexture2D(0); + return 0; } atlases.push_back(t); - gl.bindTexture2D(0); + return t; } @@ -305,7 +305,7 @@ namespace JinEngine .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u); gl.bindTexture2D(info.texture); gl.drawArrays(GL_QUADS, 0, info.count); - gl.bindTexture2D(0); + } shader->end(); } |