zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-04-10 06:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: address potential GPU resource leaks

Browse Source
This commit is contained in:
zhenyan121
2026-03-13 16:52:52 +08:00
parent 98967275ff
commit 77c7511455
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Cubed/gameplay/player.hpp
View File

@@ -36,7 +36,7 @@ private:
public: public:
Player(const World& world, const std::string& name); Player(const World& world, const std::string& name);
~Player();
const glm::vec3& get_front() const; const glm::vec3& get_front() const;
const glm::vec3& get_player_pos() const; const glm::vec3& get_player_pos() const;
const MoveState& get_move_state() const; const MoveState& get_move_state() const;

2
src/gameplay/chunk.cpp
View File

@@ -8,7 +8,7 @@ Chunk::Chunk(World& world, ChunkPos chunk_pos) :
} }
Chunk::~Chunk() { Chunk::~Chunk() {
glDeleteBuffers(1, &m_vbo);
} }
const std::vector<uint8_t>& Chunk::get_chunk_blocks() const{ const std::vector<uint8_t>& Chunk::get_chunk_blocks() const{

2
src/gameplay/player.cpp
View File

@@ -8,7 +8,9 @@ Player::Player(const World& world, const std::string& name) :
{ {
} }
Player::~Player() {
}
const glm::vec3& Player::get_front() const { const glm::vec3& Player::get_front() const {
return m_front; return m_front;
} }

23
src/main.cpp
View File

@@ -18,9 +18,6 @@
#include <Cubed/tools/shader_tools.hpp> #include <Cubed/tools/shader_tools.hpp>
constexpr int NUM_VAO = 1; constexpr int NUM_VAO = 1;
constexpr int NUM_VBO = 1;
GLuint rendering_program; GLuint rendering_program;
GLuint vao[NUM_VAO]; GLuint vao[NUM_VAO];
@@ -39,15 +36,9 @@ World world;
void setup_vertices(void) { void setup_vertices(void) {
// every block
glGenVertexArrays(NUM_VAO, vao); glGenVertexArrays(NUM_VAO, vao);
glBindVertexArray(vao[0]); glBindVertexArray(vao[0]);
glBindVertexArray(0); glBindVertexArray(0);
} }
@@ -93,7 +84,8 @@ GLuint create_shader_program() {
LOG::error("linking failed"); LOG::error("linking failed");
Shader::print_program_info(vf_program); Shader::print_program_info(vf_program);
} }
glDeleteShader(v_shader);
glDeleteShader(f_shader);
return vf_program; return vf_program;
} }
@@ -169,7 +161,7 @@ void display(GLFWwindow* window, double current_time) {
void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) { void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
switch(key) { switch(key) {
case GLFW_KEY_ESCAPE: case GLFW_KEY_Q:
if (action == GLFW_PRESS) { if (action == GLFW_PRESS) {
if (glfwGetInputMode(window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) { if (glfwGetInputMode(window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) {
@@ -179,6 +171,10 @@ void key_callback(GLFWwindow* window, int key, int scancode, int action, int mod
} }
} }
break; break;
case GLFW_KEY_ESCAPE:
if (action == GLFW_PRESS) {
glfwSetWindowShouldClose(window, GLFW_TRUE);
}
} }
@@ -221,7 +217,10 @@ int main() {
glfwSwapBuffers(window); glfwSwapBuffers(window);
glfwPollEvents(); glfwPollEvents();
} }
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
glDeleteVertexArrays(NUM_VAO, vao);
glDeleteProgram(rendering_program);
glfwDestroyWindow(window); glfwDestroyWindow(window);
glfwTerminate(); glfwTerminate();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);