Upgrade to OpenGL 4.6 with ARB for bindless textures.

master
Zed A. Shaw 6 days ago
parent e2a72e3da1
commit 9c95e41981
  1. 2
      meson.build
  2. 7
      src/engine.cpp
  3. 2
      src/framebuffer.cpp
  4. 1657
      src/glad/gl.cpp
  5. 3688
      src/glad/gl.h
  6. 1140
      src/glad/glad.cpp
  7. 2129
      src/glad/glad.h
  8. 2
      src/screen.cpp
  9. 2
      src/shader.hpp
  10. 2
      src/text.cpp

@ -33,7 +33,7 @@ magic_enum = magic_enum_proj.get_variable('magic_enum_dep')
dependencies = [fmt, fuc2, sol2, glfw3, glm, freetype2, magic_enum] dependencies = [fmt, fuc2, sol2, glfw3, glm, freetype2, magic_enum]
sources = [ sources = [
'src/glad/glad.cpp', 'src/glad/gl.cpp',
'src/stb_image.cpp', 'src/stb_image.cpp',
'src/shader.cpp', 'src/shader.cpp',
'src/text.cpp', 'src/text.cpp',

@ -6,7 +6,7 @@
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include "image.hpp" #include "image.hpp"
#include <glad/glad.h> #include <glad/gl.h>
#include <magic_enum/magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
void framebuffer_size_callback(GLFWwindow *, int width, int height) { void framebuffer_size_callback(GLFWwindow *, int width, int height) {
@ -55,10 +55,11 @@ GLFWwindow* create_window() {
glfwSetFramebufferSizeCallback(window, framebuffer_size_callback); glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
auto good = gladLoadGLLoader((GLADloadproc)glfwGetProcAddress); auto good = gladLoadGL(glfwGetProcAddress);
dbc::check(good, "failed to load GLAD"); dbc::check(good, "failed to load GLAD");
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
glfwSetCursorPosCallback(window, mouse_callback); glfwSetCursorPosCallback(window, mouse_callback);
glfwSetKeyCallback(window, key_callback); glfwSetKeyCallback(window, key_callback);

@ -1,5 +1,5 @@
#include "framebuffer.hpp" #include "framebuffer.hpp"
#include <glad/glad.h> #include <glad/gl.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "config.hpp" #include "config.hpp"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,5 +1,5 @@
#include "screen.hpp" #include "screen.hpp"
#include <glad/glad.h> #include <glad/gl.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
void Screen::init() { void Screen::init() {

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <glad/glad.h> #include <glad/gl.h>
#include <string> #include <string>
#include <climits> #include <climits>
#include <glm/glm.hpp> #include <glm/glm.hpp>

@ -2,7 +2,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <glad/glad.h> #include <glad/gl.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <ft2build.h> #include <ft2build.h>
#include "config.hpp" #include "config.hpp"

Loading…
Cancel
Save