Track created textures

Author: NotAPenguin0

CMakeLists.txt

@@ -8,6 +8,7 @@ option(GL_VALIDATION_LAYER_BUILD_TESTS "Build tests for the OpenGL Validation La
 add_library(gl_validation_layer
         src/context.cpp
         src/shader.cpp
+        src/texture.cpp
         include/gl_layer/context.h
         include/gl_layer/private/context.h
         include/gl_layer/private/types.h

include/gl_layer/private/context.h

@@ -24,6 +24,10 @@ class Context {
     void glUseProgram(GLuint program);
     void glDeleteProgram(GLuint program);
 
+    void glGenTextures(GLsizei count, GLuint* handles);
+    void glCreateTextures(GLenum target, GLsizei count, GLuint* handles);
+    void glDeleteTextures(GLsizei count, GLuint* handles);
+
     void validate_program_bound(std::string_view func_name);
     bool validate_program_status(GLuint program);
 
@@ -37,6 +41,7 @@ class Context {
 
     std::unordered_map<GLuint, Shader> shaders{};
     std::unordered_map<GLuint, Program> programs{};
+    std::unordered_map<GLuint, Texture> textures{};
 
     template<typename... Args>
     void output_fmt(const char* fmt, Args&& ... args) {

include/gl_layer/private/types.h

@@ -89,9 +89,10 @@ struct Program {
 
 // Represents a texture created by glGenTextures()
 struct Texture {
+    unsigned int handle {};
     // Texture target, either as specified by first glBindTexture() call, or by
     // glCreateTextures().
-    GLTextureTarget target = GLTextureTarget::NO_TEXTURE_TARGET;
+    GLTextureTarget target {};
 };
 
 }

src/context.cpp

@@ -99,6 +99,19 @@ void gl_layer_callback(const char* name_c, void* func_ptr, int num_args, ...) {
     } else if (is_func(name, "glLinkProgram")) {
         auto program = va_arg(args, GLuint);
         gl_layer::g_context->glLinkProgram(program);
+    } else if (is_func(name, "glGenTextures")) {
+        auto count = va_arg(args, GLsizei);
+        auto textures = va_arg(args, GLuint*);
+        gl_layer::g_context->glGenTextures(count, textures);
+    } else if (is_func(name, "glCreateTextures")) {
+        auto target = va_arg(args, GLenum);
+        auto count = va_arg(args, GLsizei);
+        auto textures = va_arg(args, GLuint*);
+        gl_layer::g_context->glCreateTextures(target, count, textures);
+    } else if (is_func(name, "glDeleteTextures")) {
+        auto count = va_arg(args, GLsizei);
+        auto textures = va_arg(args, GLuint*);
+        gl_layer::g_context->glDeleteTextures(count, textures);
     }
 
     va_end(args);

src/texture.cpp

@@ -0,0 +1,29 @@
+#include <gl_layer/private/context.h>
+
+namespace gl_layer {
+
+void Context::glGenTextures(GLsizei count, GLuint* handles) {
+    for (GLsizei i = 0; i < count; ++i) {
+        textures.emplace(handles[i], Texture {
+            handles[i],
+            NO_TEXTURE_TARGET
+        });
+    }
+}
+
+void Context::glCreateTextures(GLenum target, GLsizei count, GLuint* handles) {
+    for (GLsizei i = 0; i < count; ++i) {
+        textures.emplace(handles[i], Texture {
+           handles[i],
+           static_cast<GLTextureTarget>(target)
+        });
+    }
+}
+
+void Context::glDeleteTextures(GLsizei count, GLuint* handles) {
+    for (GLsizei i = 0; i < count; ++i) {
+        textures.erase(handles[i]);
+    }
+}
+
+}

tests/main.cpp

@@ -157,18 +157,22 @@ void main() {
     o_color = vec4(u_color, u_alpha);
 }
 )";
+    GLuint tex[2];
+    glGenTextures(2, tex);
+    glBindTexture(GL_TEXTURE_2D, tex[0]);
+    glDeleteTextures(2, tex);
 
-    unsigned int program = create_shader_from_files("shaders/vert.glsl", "shaders/frag.glsl");
-    unsigned int program2 = create_shader(vtx_source2, frag_source2);
+//    unsigned int program = create_shader_from_files("shaders/vert.glsl", "shaders/frag.glsl");
+//    unsigned int program2 = create_shader(vtx_source2, frag_source2);
 
     // Main application loop
     while(!glfwWindowShouldClose(window)) {
         glfwPollEvents();
         glClearColor(0, 0, 0, 1);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        glUseProgram(program);
-        glUseProgram(program2);
+//        glUseProgram(program);
+//        glUseProgram(program2);
 
         glfwSwapBuffers(window);
     }