diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/freestyle/SConscript | 3 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app_blender/AppCanvas.cpp | 1 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLUtils.cpp | 70 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLUtils.h | 29 |
4 files changed, 0 insertions, 103 deletions
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index e763560ad83..65287169cba 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -48,9 +48,6 @@ stroke_sources = env.Glob(prefix + '/*.cpp') prefix = 'intern/rendering' rendering_sources = env.Glob(prefix + '/GL*.cpp') -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): - rendering_sources = env.Glob(prefix + '/extgl.cpp') - # app / app_blender prefix = 'intern/app_blender' app_sources = env.Glob(prefix + '/*.cpp') diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp index ed79bc7dc82..615e7890fc5 100755 --- a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp +++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp @@ -38,7 +38,6 @@ #include "AppCanvas.h" #include "../rendering/GLRenderer.h" #include "../rendering/GLStrokeRenderer.h" -#include "../rendering/GLUtils.h" #include "AppConfig.h" #include "../system/StringUtils.h" diff --git a/source/blender/freestyle/intern/rendering/GLUtils.cpp b/source/blender/freestyle/intern/rendering/GLUtils.cpp deleted file mode 100755 index 87ebc90e768..00000000000 --- a/source/blender/freestyle/intern/rendering/GLUtils.cpp +++ /dev/null @@ -1,70 +0,0 @@ - -// -// Copyright (C) : Please refer to the COPYRIGHT file distributed -// with this source distribution. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -/////////////////////////////////////////////////////////////////////////////// -#include "GLUtils.h" - -# ifdef WIN32 -# include <windows.h> -# endif -# ifdef __MACH__ -# include <OpenGL/gl.h> -# else -# include <GL/gl.h> -# endif -#include <string.h> - -// int isExtensionSupported(const char *extension) -// { -// const GLubyte *extensions = NULL; -// const GLubyte *start; -// GLubyte *where, *terminator; -// -// /* Extension names should not have spaces. */ -// where = (GLubyte *) strchr(extension, ' '); -// if (where || *extension == '\0') -// return 0; -// extensions = glGetString(GL_EXTENSIONS); -// /* It takes a bit of care to be fool-proof about parsing the -// OpenGL extensions string. Don't be fooled by sub-strings, -// etc. */ -// start = extensions; -// for (;;) { -// where = (GLubyte *) strstr((const char *) start, extension); -// if (!where) -// break; -// terminator = where + strlen(extension); -// if (where == start || *(where - 1) == ' ') -// if (*terminator == ' ' || *terminator == '\0') -// return 1; -// start = terminator; -// } -// return 0; -// } -// -// void *glutils_extgl_GetProcAddress(const char *name) -// { -// #ifdef _WIN32 -// void *t = wglGetProcAddress(name); -// return t; -// #else -// return NULL; -// #endif -// } - diff --git a/source/blender/freestyle/intern/rendering/GLUtils.h b/source/blender/freestyle/intern/rendering/GLUtils.h deleted file mode 100755 index 2b358230e36..00000000000 --- a/source/blender/freestyle/intern/rendering/GLUtils.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright (C) : Please refer to the COPYRIGHT file distributed -// with this source distribution. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef GLUTILS_H -#define GLUTILS_H - -#include "../system/FreestyleConfig.h" - -// int LIB_RENDERING_EXPORT isExtensionSupported(const char *extension); -// void LIB_RENDERING_EXPORT *glutils_extgl_GetProcAddress(const char *name); - -#endif |