From 57164c18113bdc3773a5cfad043236f48fa95bc7 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 3 Feb 2022 00:27:23 -0600
Subject: [PATCH] [nostalgia/glutils] Add missing assert.hpp include

---
 src/nostalgia/glutils/glutils.cpp | 5 +++--
 src/nostalgia/glutils/glutils.hpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nostalgia/glutils/glutils.cpp b/src/nostalgia/glutils/glutils.cpp
index 77f73cec..294655f9 100644
--- a/src/nostalgia/glutils/glutils.cpp
+++ b/src/nostalgia/glutils/glutils.cpp
@@ -2,6 +2,7 @@
  * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include <ox/std/assert.hpp>
 #include <ox/std/bstring.hpp>
 #include <ox/std/trace.hpp>
 
@@ -57,12 +58,12 @@ ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag,
 	GLProgram prgm(glCreateProgram());
 	oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert, "vshad"));
 	glAttachShader(prgm, vs);
-	oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad"));
-	glAttachShader(prgm, fs);
 	if (geo && ox_strlen(geo) != 0) {
 		oxRequire(gs, buildShader(GL_GEOMETRY_SHADER, geo, "gshad"));
 		glAttachShader(prgm, gs);
 	}
+	oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad"));
+	glAttachShader(prgm, fs);
 	glLinkProgram(prgm);
 	return prgm;
 }
diff --git a/src/nostalgia/glutils/glutils.hpp b/src/nostalgia/glutils/glutils.hpp
index 5ac8453e..d39a827c 100644
--- a/src/nostalgia/glutils/glutils.hpp
+++ b/src/nostalgia/glutils/glutils.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ox/std/defines.hpp>
-#include <ox/std/string.hpp>
 
 #define GL_GLEXT_PROTOTYPES 1
 #ifdef OX_OS_Darwin
@@ -18,6 +17,7 @@
 #endif
 
 #include <ox/std/error.hpp>
+#include <ox/std/string.hpp>
 #include <ox/std/vector.hpp>
 
 namespace nostalgia::glutils {