summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2022-10-30 18:00:27 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2022-10-30 18:00:27 +0000
commit22e3e10ca41e179aeef06f22aca46905e31148f2 (patch)
tree7a3e8bc5f03871355cee541e44fa260c63e0ac65
parentAdd frame and render buffers to glArrays (diff)
downloadilt-22e3e10ca41e179aeef06f22aca46905e31148f2.tar.bz2
ilt-22e3e10ca41e179aeef06f22aca46905e31148f2.tar.xz
ilt-22e3e10ca41e179aeef06f22aca46905e31148f2.zip
Setting texture unit when binding UI components
-rw-r--r--ui/icon.cpp1
-rw-r--r--ui/text.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/ui/icon.cpp b/ui/icon.cpp
index 657e953..1caba68 100644
--- a/ui/icon.cpp
+++ b/ui/icon.cpp
@@ -25,5 +25,6 @@ Icon::Icon(const Image & tex) : size {tex.width, tex.height}
void
Icon::Bind() const
{
+ glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, m_texture);
}
diff --git a/ui/text.cpp b/ui/text.cpp
index 0c372a1..872e3f3 100644
--- a/ui/text.cpp
+++ b/ui/text.cpp
@@ -44,6 +44,7 @@ void
Text::render(const UIShader & shader, const Position &) const
{
shader.useText(colour);
+ glActiveTexture(GL_TEXTURE0);
for (const auto & m : models) {
glBindTexture(GL_TEXTURE_2D, m.texture);
glBindVertexArray(m.vao);