Browse Source

Reduced required OpenGL version to 3.0

naelstrof 7 years ago
parent
commit
b3e42e6ecd
8 changed files with 3266 additions and 1532 deletions
  1. 2
    2
      CMakeLists.txt
  2. 1
    1
      src/framebuffer.hpp
  3. 2131
    0
      src/gl_core_3_0.c
  4. 1129
    265
      src/gl_core_3_0.h
  5. 0
    1261
      src/gl_core_3_3.c
  6. 1
    1
      src/glrectangle.hpp
  7. 1
    1
      src/shader.hpp
  8. 1
    1
      src/window.hpp

+ 2
- 2
CMakeLists.txt View File

21
 
21
 
22
 include_directories("${PROJECT_BINARY_DIR}")
22
 include_directories("${PROJECT_BINARY_DIR}")
23
 
23
 
24
-add_definitions(-DSLOP_VERSION="v6.3.42")
24
+add_definitions(-DSLOP_VERSION="v6.3.43")
25
 
25
 
26
 # The names have to be unique unfortunately.
26
 # The names have to be unique unfortunately.
27
 set(EXECUTABLE_NAME "slop")
27
 set(EXECUTABLE_NAME "slop")
33
                                     src/slopstates.cpp
33
                                     src/slopstates.cpp
34
                                     src/framebuffer.cpp
34
                                     src/framebuffer.cpp
35
                                     src/resource.cpp
35
                                     src/resource.cpp
36
-                                    src/gl_core_3_3.c
36
+                                    src/gl_core_3_0.c
37
                                     src/shader.cpp
37
                                     src/shader.cpp
38
                                     src/window.cpp
38
                                     src/window.cpp
39
                                     src/slop.cpp
39
                                     src/slop.cpp

+ 1
- 1
src/framebuffer.hpp View File

21
 #ifndef N_FRAMEBUFFER_H_
21
 #ifndef N_FRAMEBUFFER_H_
22
 #define N_FRAMEBUFFER_H_
22
 #define N_FRAMEBUFFER_H_
23
 
23
 
24
-#include "gl_core_3_3.h"
24
+#include "gl_core_3_0.h"
25
 #include <glm/glm.hpp>
25
 #include <glm/glm.hpp>
26
 #include <GL/gl.h>
26
 #include <GL/gl.h>
27
 #include <vector>
27
 #include <vector>

+ 2131
- 0
src/gl_core_3_0.c
File diff suppressed because it is too large
View File


src/gl_core_3_0.h
File diff suppressed because it is too large
View File


+ 0
- 1261
src/gl_core_3_3.c
File diff suppressed because it is too large
View File


+ 1
- 1
src/glrectangle.hpp View File

21
 #ifndef N_GLRECTANGLE_H_
21
 #ifndef N_GLRECTANGLE_H_
22
 #define N_GLRECTANGLE_H_
22
 #define N_GLRECTANGLE_H_
23
 
23
 
24
-#include "gl_core_3_3.h"
24
+#include "gl_core_3_0.h"
25
 #include <iostream>
25
 #include <iostream>
26
 #include <glm/glm.hpp>
26
 #include <glm/glm.hpp>
27
 #include <GL/gl.h>
27
 #include <GL/gl.h>

+ 1
- 1
src/shader.hpp View File

26
 #include <string>
26
 #include <string>
27
 #include <exception>
27
 #include <exception>
28
 
28
 
29
-#include "gl_core_3_3.h"
29
+#include "gl_core_3_0.h"
30
 #include <glm/glm.hpp>
30
 #include <glm/glm.hpp>
31
 #include <glm/gtc/type_ptr.hpp>
31
 #include <glm/gtc/type_ptr.hpp>
32
 #include <EGL/egl.h>
32
 #include <EGL/egl.h>

+ 1
- 1
src/window.hpp View File

25
 #include <exception>
25
 #include <exception>
26
 
26
 
27
 #include <iostream>
27
 #include <iostream>
28
-#include "gl_core_3_3.h"
28
+#include "gl_core_3_0.h"
29
 #include <GL/gl.h>
29
 #include <GL/gl.h>
30
 #define GL_GLEXT_PROTOTYPES
30
 #define GL_GLEXT_PROTOTYPES
31
 #define GLX_GLXEXT_PROTOTYPES
31
 #define GLX_GLXEXT_PROTOTYPES