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

[nostalgia/core/gl] Cleanup VBO, EBO, and VAO initialization

Browse Source
This commit is contained in:
Gary Talent 2021-03-23 00:02:17 -05:00
parent b278b3881e
commit aea43306a4
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/nostalgia/core/userland/gfx_opengl.cpp
View File

@ -30,11 +30,15 @@ constexpr auto BgVertexVboRowLength = 4;
constexpr auto BgVertexVboLength = BgVertexVboRows * BgVertexVboRowLength; constexpr auto BgVertexVboLength = BgVertexVboRows * BgVertexVboRowLength;
constexpr auto BgVertexEboLength = 6; constexpr auto BgVertexEboLength = 6;
struct Background: public Bufferset { struct Background {
VertexArray vao;
Buffer vbo;
Buffer ebo;
Texture tex;
bool enabled = false; bool enabled = false;
bool updated = false; bool updated = false;
std::array<float, TileCount * BgVertexVboLength> bgVertices; std::array<float, TileCount * BgVertexVboLength> bgVertices;
std::array<GLuint, TileCount * BgVertexEboLength> bgEbos; std::array<GLuint, TileCount * BgVertexEboLength> bgElements;
}; };
struct GlImplData { struct GlImplData {
@ -102,7 +106,7 @@ static void sendVbo(const Background &bg) noexcept {
static void sendEbo(const Background &bg) noexcept { static void sendEbo(const Background &bg) noexcept {
// ebo // ebo
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bg.ebo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bg.ebo);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(bg.bgEbos), &bg.bgEbos, GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(bg.bgElements), &bg.bgElements, GL_STATIC_DRAW);
} }
static void initBackgroundBufferObjects(Context *ctx, Background *bg) noexcept { static void initBackgroundBufferObjects(Context *ctx, Background *bg) noexcept {
@ -110,19 +114,31 @@ static void initBackgroundBufferObjects(Context *ctx, Background *bg) noexcept {
for (auto y = 0u; y < TileRows; ++y) { for (auto y = 0u; y < TileRows; ++y) {
const auto i = bgVertexRow(x, y); const auto i = bgVertexRow(x, y);
auto vbo = &bg->bgVertices[i * BgVertexVboLength]; auto vbo = &bg->bgVertices[i * BgVertexVboLength];
auto ebo = &bg->bgEbos[i * BgVertexEboLength]; auto ebo = &bg->bgElements[i * BgVertexEboLength];
setTileBufferObject(ctx, i * BgVertexVboRows, x, y, 0, vbo, ebo); setTileBufferObject(ctx, i * BgVertexVboRows, x, y, 0, vbo, ebo);
} }
} }
} }
static VertexArray genVertexArrayObject() noexcept {
GLuint vao = 0;
glGenVertexArrays(1, &vao);
return VertexArray(vao);
}
static Buffer genBuffer() noexcept {
GLuint buff = 0;
glGenBuffers(1, &buff);
return Buffer(buff);
}
static void initBackgroundBufferset(Context *ctx, GLuint shader, Background *bg) { static void initBackgroundBufferset(Context *ctx, GLuint shader, Background *bg) {
// vao // vao
glGenVertexArrays(1, &bg->vao.id); bg->vao = genVertexArrayObject();
glBindVertexArray(bg->vao); glBindVertexArray(bg->vao);
// vbo & ebo // vbo & ebo
glGenBuffers(1, &bg->vbo.id); bg->vbo = genBuffer();
glGenBuffers(1, &bg->ebo.id); bg->ebo = genBuffer();
initBackgroundBufferObjects(ctx, bg); initBackgroundBufferObjects(ctx, bg);
sendVbo(*bg); sendVbo(*bg);
sendEbo(*bg); sendEbo(*bg);
@ -136,18 +152,20 @@ static void initBackgroundBufferset(Context *ctx, GLuint shader, Background *bg)
ox::bit_cast<void*>(2 * sizeof(float))); ox::bit_cast<void*>(2 * sizeof(float)));
} }
static ox::Error loadTexture(Texture *tex, void *pixels) { static Texture loadTexture(GLsizei w, GLsizei h, void *pixels) {
if (tex->id == 0) { GLuint texId = 0;
glGenTextures(1, &tex->id); glGenTextures(1, &texId);
} Texture tex(texId);
tex.width = w;
tex.height = h;
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, tex->id); glBindTexture(GL_TEXTURE_2D, tex.id);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex->width, tex->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
return OxError(0); return ox::move(tex);
} }
static void tickFps(GlImplData *id) { static void tickFps(GlImplData *id) {
@ -174,7 +192,7 @@ static void drawBackground(Background *bg) {
renderer::sendVbo(*bg); renderer::sendVbo(*bg);
} }
glBindTexture(GL_TEXTURE_2D, bg->tex); glBindTexture(GL_TEXTURE_2D, bg->tex);
glDrawElements(GL_TRIANGLES, bg->bgEbos.size(), GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, bg->bgElements.size(), GL_UNSIGNED_INT, 0);
} }
} }
@ -209,9 +227,8 @@ ox::Error loadBgTexture(Context *ctx, int section, void *pixels, int w, int h) {
oxTracef("nostalgia::core::gfx::gl", "loadBgTexture: { section: {}, w: {}, h: {} }", section, w, h); oxTracef("nostalgia::core::gfx::gl", "loadBgTexture: { section: {}, w: {}, h: {} }", section, w, h);
const auto &id = ctx->rendererData<GlImplData>(); const auto &id = ctx->rendererData<GlImplData>();
auto &tex = id->backgrounds[static_cast<std::size_t>(section)].tex; auto &tex = id->backgrounds[static_cast<std::size_t>(section)].tex;
tex.width = w; tex = loadTexture(w, h, pixels);
tex.height = h; return OxError(0);
return loadTexture(&tex, pixels);
} }
} }
@ -281,7 +298,7 @@ void setTile(Context *ctx, int layer, int column, int row, uint8_t tile) {
const auto i = renderer::bgVertexRow(x, y); const auto i = renderer::bgVertexRow(x, y);
auto &bg = id->backgrounds[z]; auto &bg = id->backgrounds[z];
auto vbo = &bg.bgVertices[i * renderer::BgVertexVboLength]; auto vbo = &bg.bgVertices[i * renderer::BgVertexVboLength];
auto ebo = &bg.bgEbos[i * renderer::BgVertexEboLength]; auto ebo = &bg.bgElements[i * renderer::BgVertexEboLength];
renderer::setTileBufferObject(ctx, i * renderer::BgVertexVboRows, x, y, tile, vbo, ebo); renderer::setTileBufferObject(ctx, i * renderer::BgVertexVboRows, x, y, tile, vbo, ebo);
bg.updated = true; bg.updated = true;
} }

4
src/nostalgia/core/userland/glutils.cpp
View File

@ -34,7 +34,7 @@ template struct GLobject<glDeleteProgram>;
template struct GLobject<glDeleteShader>; template struct GLobject<glDeleteShader>;
[[nodiscard]] [[nodiscard]]
static ox::Result<Shader> buildShader(GLuint shaderType, const GLchar *src, const char *shaderName) { static ox::Result<Shader> buildShader(GLuint shaderType, const GLchar *src, const char *shaderName) noexcept {
Shader shader(glCreateShader(shaderType)); Shader shader(glCreateShader(shaderType));
glShaderSource(shader, 1, &src, nullptr); glShaderSource(shader, 1, &src, nullptr);
glCompileShader(shader); glCompileShader(shader);
@ -50,7 +50,7 @@ static ox::Result<Shader> buildShader(GLuint shaderType, const GLchar *src, cons
} }
[[nodiscard]] [[nodiscard]]
ox::Result<Program> buildShaderProgram(const GLchar *vert, const GLchar *frag) { ox::Result<Program> buildShaderProgram(const GLchar *vert, const GLchar *frag) noexcept {
oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert, "vshad")); oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert, "vshad"));
oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad")); oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag, "fshad"));
Program prgm(glCreateProgram()); Program prgm(glCreateProgram());

11
src/nostalgia/core/userland/glutils.hpp
View File

@ -57,7 +57,7 @@ struct GLobject: public Base {
this->id = id; this->id = id;
} }
constexpr GLobject(GLobject &&o) { constexpr GLobject(GLobject &&o): Base(ox::move(o)) {
id = o.id; id = o.id;
o.id = 0; o.id = 0;
} }
@ -106,14 +106,7 @@ using Program = GLobject<glDeleteProgram>;
using Texture = GLobject<deleteTexture, TextureBase>; using Texture = GLobject<deleteTexture, TextureBase>;
using VertexArray = GLobject<deleteVertexArray>; using VertexArray = GLobject<deleteVertexArray>;
struct Bufferset {
VertexArray vao;
Buffer vbo;
Buffer ebo;
Texture tex;
};
[[nodiscard]] [[nodiscard]]
ox::Result<Program> buildShaderProgram(const GLchar *vert, const GLchar *frag); ox::Result<Program> buildShaderProgram(const GLchar *vert, const GLchar *frag) noexcept;
} }