Switch to GLAD from GLEW
This commit is contained in:
parent
aac84fabcf
commit
3f6af200e0
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -22,3 +22,6 @@
|
||||
[submodule "include/CLog"]
|
||||
path = include/CLog
|
||||
url = https://github.com/williamistGitHub/CLog.git
|
||||
[submodule "include/glad"]
|
||||
path = include/glad
|
||||
url = https://github.com/Dav1dde/glad.git
|
||||
|
||||
114
CMakeLists.txt
114
CMakeLists.txt
@ -1,19 +1,18 @@
|
||||
cmake_minimum_required(VERSION 3.11)
|
||||
project(fred)
|
||||
project(fred C CXX)
|
||||
|
||||
# if($<CONFIG:Debug>)
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # For my Clangd LSP
|
||||
# endif()
|
||||
|
||||
set(GLFW_BUILD_WAYLAND OFF) # This should be detected and not forced
|
||||
set(BUILD_SHARED_LIBS OFF) # Keep the project as one binary (glew, glm)
|
||||
set(GLM__BUILD_TESTS OFF) # Don't build GLM tests
|
||||
set(GLFW_BUILD_WAYLAND OFF) # This should be detected and not forced
|
||||
set(BUILD_SHARED_LIBS OFF) # Keep the project as one binary (glew, glm)
|
||||
set(GLM__BUILD_TESTS OFF) # Don't build GLM tests
|
||||
set(GLFW_BUILD_EXAMPLES OFF) # Don't build GLFW Examples
|
||||
set(GLFW_BUILD_TESTS OFF) # Don't build GLFW Tests
|
||||
set(GLFW_INSTALL OFF) # We're not building a standalone
|
||||
set(GLFW_BUILD_TESTS OFF) # Don't build GLFW Tests
|
||||
set(GLFW_INSTALL OFF) # We're not building a standalone
|
||||
# set(GLEW_BUILD_DOCS $<CONFIG:Debug>) # Build docs if debug
|
||||
set(SOIL2_BUILD_TESTS OFF) # Don't build SOIL2 Tests
|
||||
|
||||
set(SOIL2_BUILD_TESTS OFF) # Don't build SOIL2 Tests
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
|
||||
@ -21,48 +20,12 @@ if(CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
|
||||
message(FATAL_ERROR "You fucking smell fr\n")
|
||||
endif()
|
||||
if(CMAKE_SOURCE_DIR MATCHES " ")
|
||||
message(WARNING "Spaces in the source dir can cause errors, thou art been warned\n")
|
||||
message(
|
||||
WARNING "Spaces in the source dir can cause errors, thou art been warned\n")
|
||||
endif()
|
||||
if(CMAKE_BINARY_DIR MATCHES " ")
|
||||
message(WARNING "Spaces in the build dir can cause errors, thou art been warned\n")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
message(STATUS "Configuring GLEW for *nix (Non-cmake)\n")
|
||||
add_custom_command(
|
||||
OUTPUT ${PROJECT_SOURCE_DIR}/include/glew/src/glew.c
|
||||
${PROJECT_SOURCE_DIR}/include/glewinfo.c
|
||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/include/glew/auto
|
||||
COMMAND ${CMAKE_MAKE_PROGRAM})
|
||||
|
||||
add_subdirectory(include/glew/build/cmake)
|
||||
|
||||
if(NOT (EXISTS "${PROJECT_SOURCE_DIR}/include/glew/src/glew.c" AND EXISTS "${PROJECT_SOURCE_DIR}/include/glewinfo.c"))
|
||||
message(FATAL_ERROR "GLEW failed to configure!")
|
||||
endif()
|
||||
endif()
|
||||
if(WIN32)
|
||||
message(STATUS "Download GLEW for Windows (Non-cmake)\n") # I wanted to make this work from source, but the auto config is make only, and requiring and/or shipping msys2 would be unreasonable so this is the best compromise
|
||||
file(DOWNLOAD https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0-win32.zip ${CMAKE_BINARY_DIR}/glew-2.2.0.zip)
|
||||
execute_process(COMMAND tar -xf ${CMAKE_BINARY_DIR}/glew-2.2.0.zip # bdstar
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
|
||||
if(NOT EXISTS ${CMAKE_BINARY_DIR}/glew-2.2.0/include/GL/glew.h)
|
||||
message(FATAL_ERROR "GLEW Failed to download/decompress")
|
||||
endif()
|
||||
|
||||
include_directories(${CMAKE_BINARY_DIR}/glew-2.2.0/include)
|
||||
add_library(glew STATIC # There aren't actually any binaries in here, so no lib is to be built
|
||||
${CMAKE_BINARY_DIR}/glew-2.2.0/include/GL/eglew.h
|
||||
${CMAKE_BINARY_DIR}/glew-2.2.0/include/GL/glew.h
|
||||
${CMAKE_BINARY_DIR}/glew-2.2.0/include/GL/glxew.h
|
||||
${CMAKE_BINARY_DIR}/glew-2.2.0/include/GL/wglew.h)
|
||||
set_target_properties(glew PROPERTIES LINKER_LANGUAGE C)
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit
|
||||
target_link_libraries(glew ${CMAKE_BINARY_DIR}/glew-2.2.0/lib/Release/x64/glew32.lib ${CMAKE_BINARY_DIR}/glew-2.2.0/lib/Release/x64/glew32s.lib)
|
||||
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32-bit, if it's not either of these you're in trouble
|
||||
target_link_libraries(glew ${CMAKE_BINARY_DIR}/glew-2.2.0/lib/Release/Win32/glew32.lib ${CMAKE_BINARY_DIR}/glew-2.2.0/lib/Release/Win32/glew32s.lib)
|
||||
endif()
|
||||
message(
|
||||
WARNING "Spaces in the build dir can cause errors, thou art been warned\n")
|
||||
endif()
|
||||
|
||||
add_subdirectory(include/glm)
|
||||
@ -71,7 +34,14 @@ add_subdirectory(include/SOIL2)
|
||||
add_subdirectory(include/assimp)
|
||||
add_subdirectory(include/CLog)
|
||||
|
||||
include_directories(include/imgui)
|
||||
# Glad is configured using cmake (unlike glew)
|
||||
# https://github.com/Dav1dde/glad/wiki/C#cmake
|
||||
set(GLAD_SOURCES_DIR "${PROJECT_SOURCE_DIR}/include/glad")
|
||||
add_subdirectory("${GLAD_SOURCES_DIR}/cmake" glad_cmake)
|
||||
|
||||
glad_add_library(glad_gl_core_33 REPRODUCIBLE API gl:core=3.3)
|
||||
|
||||
include_directories(include/imgui) # ImGui doesn't have a CMakeLists of its own
|
||||
add_library(
|
||||
imgui STATIC
|
||||
include/imgui/imgui.cpp
|
||||
@ -84,26 +54,26 @@ add_library(
|
||||
target_link_libraries(imgui glfw)
|
||||
|
||||
add_executable(fred engine.cpp shader.c)
|
||||
if (UNIX)
|
||||
target_link_libraries(
|
||||
fred
|
||||
-lm
|
||||
glew
|
||||
glm
|
||||
glfw
|
||||
soil2
|
||||
assimp
|
||||
imgui
|
||||
clog)
|
||||
endif()
|
||||
if (WIN32)
|
||||
target_link_libraries(
|
||||
fred
|
||||
glew
|
||||
glm
|
||||
glfw
|
||||
soil2
|
||||
assimp
|
||||
imgui
|
||||
clog)
|
||||
endif()
|
||||
if(UNIX)
|
||||
target_link_libraries(
|
||||
fred
|
||||
-lm
|
||||
glad_gl_core_33
|
||||
glm
|
||||
glfw
|
||||
soil2
|
||||
assimp
|
||||
imgui
|
||||
clog)
|
||||
endif()
|
||||
if(WIN32)
|
||||
target_link_libraries(
|
||||
fred
|
||||
glad_gl_core_33
|
||||
glm
|
||||
glfw
|
||||
soil2
|
||||
assimp
|
||||
imgui
|
||||
clog)
|
||||
endif()
|
||||
|
||||
27
engine.cpp
27
engine.cpp
@ -3,15 +3,15 @@
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <glad/gl.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/trigonometric.hpp>
|
||||
|
||||
#include <clog/clog.h>
|
||||
#include <backends/imgui_impl_glfw.h>
|
||||
#include <backends/imgui_impl_opengl3.h>
|
||||
#include <clog/clog.h>
|
||||
#include <imgui.h>
|
||||
|
||||
#include <SOIL2.h>
|
||||
@ -31,8 +31,9 @@ static void glfwErrorCallback(int e, const char *description) {
|
||||
}
|
||||
|
||||
static bool loadModel(const char *path, std::vector<unsigned short> &indices,
|
||||
std::vector<glm::vec3> &vertices, std::vector<glm::vec2> &uvs,
|
||||
std::vector<glm::vec3> &normals) {
|
||||
std::vector<glm::vec3> &vertices,
|
||||
std::vector<glm::vec2> &uvs,
|
||||
std::vector<glm::vec3> &normals) {
|
||||
Assimp::Importer importer;
|
||||
|
||||
const aiScene *scene = importer.ReadFile(
|
||||
@ -69,7 +70,6 @@ static bool loadModel(const char *path, std::vector<unsigned short> &indices,
|
||||
static int initWindow() {
|
||||
glfwSetErrorCallback(glfwErrorCallback);
|
||||
|
||||
glewExperimental = true;
|
||||
if (!glfwInit()) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "GLFW went shitty time (failed to init)");
|
||||
return 1;
|
||||
@ -90,10 +90,14 @@ static int initWindow() {
|
||||
}
|
||||
|
||||
glfwMakeContextCurrent(window);
|
||||
glfwSwapInterval(1);
|
||||
int code;
|
||||
if ((code = glewInit()) != GLEW_OK) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to init GLEW: %s", glewGetErrorString(code));
|
||||
glfwSwapInterval(1); // V-Sync
|
||||
|
||||
int version;
|
||||
if ((version = gladLoadGL(glfwGetProcAddress))) {
|
||||
clog_log(CLOG_LEVEL_DEBUG, "GL version: %d.%d", GLAD_VERSION_MAJOR(version),
|
||||
GLAD_VERSION_MINOR(version));
|
||||
} else {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to init GL!");
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -291,7 +295,7 @@ static int initWindow() {
|
||||
// Disabled because unchanged
|
||||
// glm_perspective(glm_rad(FOV), 4.0f/ 3.0f, 0.1f, 100.0f, projection);
|
||||
glm::mat4 view = glm::lookAt(position, position + direction, up);
|
||||
mvp = projection * view * model;
|
||||
// mvp = projection * view * model;
|
||||
|
||||
// Send mega sigma MVP to the vertex shader (transformations for the win)
|
||||
glUniformMatrix4fv(matrixID, 1, GL_FALSE, &mvp[0][0]);
|
||||
@ -315,7 +319,8 @@ static int initWindow() {
|
||||
// Index buffer
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementBuffer);
|
||||
|
||||
glDrawElements(GL_TRIANGLES, (GLsizei)indices.size(), GL_UNSIGNED_SHORT, (void *)0);
|
||||
glDrawElements(GL_TRIANGLES, (GLsizei)indices.size(), GL_UNSIGNED_SHORT,
|
||||
(void *)0);
|
||||
|
||||
glDisableVertexAttribArray(0);
|
||||
glDisableVertexAttribArray(1);
|
||||
|
||||
1
include/glad
Submodule
1
include/glad
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 73db193f853e2ee079bf3ca8a64aa2eaf6459043
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit b323ebf9adeae6a3f26f91277d4f62df509037fc
|
||||
49
shader.c
49
shader.c
@ -1,18 +1,31 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <clog/clog.h>
|
||||
|
||||
#include <glad/gl.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#ifdef __linux__
|
||||
#include <unistd.h>
|
||||
typedef int errno_t;
|
||||
errno_t fopen_s(FILE **f, const char *name,
|
||||
const char *mode) {
|
||||
errno_t ret = 0;
|
||||
clog_assert(f);
|
||||
*f = fopen(name, mode);
|
||||
/* Can't be sure about 1-to-1 mapping of errno and MS' errno_t */
|
||||
if (!*f)
|
||||
ret = errno;
|
||||
return ret;
|
||||
} // God is here: https://stackoverflow.com/questions/1513209/is-there-a-way-to-use-fopen-s-with-gcc-or-at-least-create-a-define-about-it
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
#include <io.h>
|
||||
#define lseek _lseek
|
||||
#endif
|
||||
|
||||
#include <clog/clog.h>
|
||||
|
||||
GLuint loadShaders(const char *vertex_file_path,
|
||||
const char *fragment_file_path) {
|
||||
GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
|
||||
@ -21,28 +34,27 @@ GLuint loadShaders(const char *vertex_file_path,
|
||||
errno_t err;
|
||||
|
||||
FILE *vertexShaderFD;
|
||||
if (err = fopen_s(&vertexShaderFD, vertex_file_path, "rb")) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to open Vertex Shader \"%s\": %s", vertex_file_path, err);
|
||||
if ((err = fopen_s(&vertexShaderFD, vertex_file_path, "rb"))) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to open Vertex Shader \"%s\": %d",
|
||||
vertex_file_path, err);
|
||||
return 0;
|
||||
}
|
||||
int vertexShaderLength = lseek(fileno(vertexShaderFD), 0L, SEEK_END) + 1;
|
||||
fseek(vertexShaderFD, 0L, SEEK_SET);
|
||||
char *vertexShaderCode = (char *)calloc(vertexShaderLength, sizeof(char));
|
||||
clog_assert(vertexShaderCode != NULL);
|
||||
clog_assert(7 != 7);
|
||||
fread(vertexShaderCode, sizeof(*vertexShaderCode), vertexShaderLength,
|
||||
vertexShaderFD);
|
||||
fclose(vertexShaderFD);
|
||||
|
||||
FILE *fragmentShaderFD;
|
||||
if (fopen_s(&fragmentShaderFD, fragment_file_path, "rb")) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to open Vertex Shader \"%s\": %s", fragment_file_path, err);
|
||||
return 0;
|
||||
if ((err = fopen_s(&fragmentShaderFD, fragment_file_path, "rb"))) {
|
||||
clog_log(CLOG_LEVEL_ERROR, "Failed to open Vertex Shader \"%s\": %d",
|
||||
fragment_file_path, err);
|
||||
return 0;
|
||||
}
|
||||
int fragmentShaderLength = lseek(fileno(fragmentShaderFD), 0L, SEEK_END) + 1;
|
||||
fseek(fragmentShaderFD, 0L, SEEK_SET);
|
||||
char *fragmentShaderCode = (char *)calloc(fragmentShaderLength, sizeof(char));
|
||||
clog_assert(fragmentShaderCode != NULL);
|
||||
fread(fragmentShaderCode, sizeof(*fragmentShaderCode), fragmentShaderLength,
|
||||
fragmentShaderFD);
|
||||
fclose(fragmentShaderFD);
|
||||
@ -59,8 +71,10 @@ GLuint loadShaders(const char *vertex_file_path,
|
||||
glGetShaderiv(vertexShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
|
||||
if (infoLogLength > 0) {
|
||||
infoLogLength += 1; // Prevents a sub-expression overflow false positive
|
||||
char *vertexShaderErrorMessage = (char*)malloc(infoLogLength * sizeof(char)); // Not all compilers support VLAs, this will do
|
||||
glGetShaderInfoLog(vertexShaderID, infoLogLength-1, NULL,
|
||||
char *vertexShaderErrorMessage = (char *)malloc(
|
||||
infoLogLength *
|
||||
sizeof(char)); // Not all compilers support VLAs, this will do
|
||||
glGetShaderInfoLog(vertexShaderID, infoLogLength - 1, NULL,
|
||||
vertexShaderErrorMessage);
|
||||
clog_log(CLOG_LEVEL_ERROR, "%s", vertexShaderErrorMessage);
|
||||
free(vertexShaderErrorMessage);
|
||||
@ -75,7 +89,8 @@ GLuint loadShaders(const char *vertex_file_path,
|
||||
glGetShaderiv(fragmentShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
|
||||
if (infoLogLength > 0) {
|
||||
infoLogLength += 1; // Prevents a sub-expression overflow false positive
|
||||
char *fragmentShaderErrorMessage = (char*)malloc(infoLogLength * sizeof(char));
|
||||
char *fragmentShaderErrorMessage =
|
||||
(char *)malloc(infoLogLength * sizeof(char));
|
||||
glGetShaderInfoLog(fragmentShaderID, infoLogLength - 1, NULL,
|
||||
fragmentShaderErrorMessage);
|
||||
clog_log(CLOG_LEVEL_ERROR, "%s", fragmentShaderErrorMessage);
|
||||
@ -92,8 +107,10 @@ GLuint loadShaders(const char *vertex_file_path,
|
||||
glGetProgramiv(programID, GL_INFO_LOG_LENGTH, &infoLogLength);
|
||||
if (infoLogLength > 0) {
|
||||
infoLogLength += 1; // Prevents a sub-expression overflow false positive
|
||||
char *programErrorMessage = (char*)malloc(infoLogLength * sizeof(char));;
|
||||
glGetProgramInfoLog(programID, infoLogLength - 1, NULL, programErrorMessage);
|
||||
char *programErrorMessage = (char *)malloc(infoLogLength * sizeof(char));
|
||||
;
|
||||
glGetProgramInfoLog(programID, infoLogLength - 1, NULL,
|
||||
programErrorMessage);
|
||||
clog_log(CLOG_LEVEL_ERROR, "%s", programErrorMessage);
|
||||
free(programErrorMessage);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user