drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/glutils] Add missing assert.hpp include

Browse Source
This commit is contained in:
Gary Talent 2022-02-03 00:27:23 -06:00
parent d4e198ecc3
commit 57164c1811
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nostalgia/glutils/glutils.cpp
View File

@ -2,6 +2,7 @@
* Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include <ox/std/assert.hpp>
#include <ox/std/bstring.hpp> #include <ox/std/bstring.hpp>
#include <ox/std/trace.hpp> #include <ox/std/trace.hpp>
@ -57,12 +58,12 @@ ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag,
GLProgram prgm(glCreateProgram()); GLProgram prgm(glCreateProgram());
oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert, "vshad")); oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert, "vshad"));
glAttachShader(prgm, vs); glAttachShader(prgm, vs);
oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad"));
glAttachShader(prgm, fs);
if (geo && ox_strlen(geo) != 0) { if (geo && ox_strlen(geo) != 0) {
oxRequire(gs, buildShader(GL_GEOMETRY_SHADER, geo, "gshad")); oxRequire(gs, buildShader(GL_GEOMETRY_SHADER, geo, "gshad"));
glAttachShader(prgm, gs); glAttachShader(prgm, gs);
} }
oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad"));
glAttachShader(prgm, fs);
glLinkProgram(prgm); glLinkProgram(prgm);
return prgm; return prgm;
} }

2
src/nostalgia/glutils/glutils.hpp
View File

@ -5,7 +5,6 @@
#pragma once #pragma once
#include <ox/std/defines.hpp> #include <ox/std/defines.hpp>
#include <ox/std/string.hpp>
#define GL_GLEXT_PROTOTYPES 1 #define GL_GLEXT_PROTOTYPES 1
#ifdef OX_OS_Darwin #ifdef OX_OS_Darwin
@ -18,6 +17,7 @@
#endif #endif
#include <ox/std/error.hpp> #include <ox/std/error.hpp>
#include <ox/std/string.hpp>
#include <ox/std/vector.hpp> #include <ox/std/vector.hpp>
namespace nostalgia::glutils { namespace nostalgia::glutils {