diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 23:20:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-08 21:00:56 +0300 |
commit | 0dfc8d69392a57e0210644428571dd455cb61241 (patch) | |
tree | df3bdd30f3bbae7693a786b1aa6a8ab0b8921805 /source/blender/blenkernel/intern | |
parent | b25e4b310f87fc86942acd29fccf1474ea5120df (diff) |
OpenGL: split off framebuffer, shader and texture code into separate files.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/icons.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 07a1d3bea7f..e26e5148ff6 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -74,8 +74,8 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm); #include "BLI_sys_types.h" /* for intptr_t support */ #include "GPU_buffers.h" -#include "GPU_extensions.h" #include "GPU_glew.h" +#include "GPU_shader.h" #ifdef WITH_OPENSUBDIV # include "DNA_userdef_types.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 1acb9ad3d20..836072df67d 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -57,8 +57,8 @@ #include "GPU_buffers.h" #include "GPU_draw.h" -#include "GPU_extensions.h" #include "GPU_glew.h" +#include "GPU_shader.h" #include "WM_api.h" diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index b6d009deb2a..dc50e39a862 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -55,8 +55,8 @@ #include "MEM_guardedalloc.h" -#include "GPU_extensions.h" #include "GPU_glew.h" +#include "GPU_shader.h" extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 2171f193bac..45ebada4d81 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -55,7 +55,7 @@ #include "BLI_sys_types.h" // for intptr_t support -#include "GPU_extensions.h" +#include "GPU_texture.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 23bc2470945..53da38b2da8 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -74,9 +74,9 @@ #endif #include "GPU_draw.h" -#include "GPU_extensions.h" #include "GPU_glew.h" #include "GPU_buffers.h" +#include "GPU_shader.h" #include "CCGSubSurf.h" |