drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia/glutils] Upgrade non-Apple platforms to GLES 3.2

Browse Source
This commit is contained in:
Gary Talent
2021-12-11 18:47:10 -06:00
parent 5ed806f4c0
commit 20a8d34e11
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/glutils/glutils.hpp
+5 -5
View File
@@ -18,7 +18,7 @@
#endif
#include <OpenGL/gl3.h>
#else
#include <GLES3/gl3.h>
#include <GLES3/gl32.h>
#endif
#include <ox/std/error.hpp>
@@ -66,7 +66,7 @@ struct GLObject: public Base {
this->id = id;
}
constexpr GLObject(GLObject &&o) noexcept: Base(ox::move(o)) {
constexpr GLObject(GLObject &&o) noexcept: Base(std::move(o)) {
id = o.id;
o.id = 0;
}
@@ -78,7 +78,7 @@ struct GLObject: public Base {
GLObject &operator=(GLObject &&o) noexcept {
if (this != &o) {
del(id);
Base::operator=(ox::move(o));
Base::operator=(std::move(o));
id = o.id;
o.id = 0;
}
@@ -145,9 +145,9 @@ struct FrameBuffer {
};
ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag) noexcept;
ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag, const GLchar *geo = nullptr) noexcept;
ox::Result<GLProgram> buildShaderProgram(const ox::String &vert, const ox::String &frag) noexcept;
ox::Result<GLProgram> buildShaderProgram(const ox::String &vert, const ox::String &frag, const ox::String &geo = "") noexcept;
glutils::GLVertexArray generateVertexArrayObject() noexcept;