Clean up OpenGL includes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2332 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
e0a3e746b2
commit
c7d2c6fe68
|
@ -35,7 +35,7 @@ COpenGLDriver::COpenGLDriver(const irr::SIrrlichtCreationParameters& params,
|
||||||
io::IFileSystem* io)
|
io::IFileSystem* io)
|
||||||
: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
|
: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
|
||||||
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
|
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
|
||||||
AntiAlias(params.AntiAlias), RenderTargetTexture(0), LastSetLight(-1),
|
AntiAlias(params.AntiAlias), RenderTargetTexture(0),
|
||||||
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
|
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
|
||||||
CurrentTarget(ERT_FRAME_BUFFER),
|
CurrentTarget(ERT_FRAME_BUFFER),
|
||||||
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
|
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
|
||||||
|
|
|
@ -11,63 +11,11 @@
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
||||||
|
|
||||||
#if defined(_IRR_WINDOWS_API_)
|
|
||||||
// include windows headers for HWND
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#include <windows.h>
|
|
||||||
#elif defined(_IRR_USE_OSX_DEVICE_)
|
|
||||||
#include "CIrrDeviceMacOSX.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#include "CNullDriver.h"
|
#include "CNullDriver.h"
|
||||||
#include "IMaterialRendererServices.h"
|
#include "IMaterialRendererServices.h"
|
||||||
|
// also includes the OpenGL stuff
|
||||||
#include "COpenGLExtensionHandler.h"
|
#include "COpenGLExtensionHandler.h"
|
||||||
|
|
||||||
#if defined(_IRR_WINDOWS_API_)
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include "glext.h"
|
|
||||||
#include "wglext.h"
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma comment(lib, "OpenGL32.lib")
|
|
||||||
#pragma comment(lib, "GLu32.lib")
|
|
||||||
#endif
|
|
||||||
#elif defined(_IRR_USE_OSX_DEVICE_)
|
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#define GL_GLEXT_LEGACY 1
|
|
||||||
#endif
|
|
||||||
#include <OpenGL/gl.h>
|
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#include "glext.h"
|
|
||||||
#endif
|
|
||||||
#elif defined(_IRR_USE_SDL_DEVICE_)
|
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#define GL_GLEXT_LEGACY 1
|
|
||||||
#define GLX_GLXEXT_LEGACY 1
|
|
||||||
#else
|
|
||||||
#define GL_GLEXT_PROTOTYPES 1
|
|
||||||
#define GLX_GLXEXT_PROTOTYPES 1
|
|
||||||
#endif
|
|
||||||
#define NO_SDL_GLEXT
|
|
||||||
#include <SDL/SDL_opengl.h>
|
|
||||||
#include "glext.h"
|
|
||||||
#else
|
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#define GL_GLEXT_LEGACY 1
|
|
||||||
#define GLX_GLXEXT_LEGACY 1
|
|
||||||
#else
|
|
||||||
#define GL_GLEXT_PROTOTYPES 1
|
|
||||||
#define GLX_GLXEXT_PROTOTYPES 1
|
|
||||||
#endif
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <GL/glx.h>
|
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#include "glext.h"
|
|
||||||
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
|
|
||||||
#include "glxext.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
@ -410,7 +358,6 @@ namespace video
|
||||||
COpenGLTexture* RenderTargetTexture;
|
COpenGLTexture* RenderTargetTexture;
|
||||||
const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
|
const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
|
||||||
core::array<ITexture*> DepthTextures;
|
core::array<ITexture*> DepthTextures;
|
||||||
s32 LastSetLight;
|
|
||||||
core::array<core::plane3df> UserClipPlane;
|
core::array<core::plane3df> UserClipPlane;
|
||||||
core::array<bool> UserClipPlaneEnabled;
|
core::array<bool> UserClipPlaneEnabled;
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,14 @@
|
||||||
// include windows headers for HWND
|
// include windows headers for HWND
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
||||||
|
#define GL_GLEXT_LEGACY 1
|
||||||
|
#endif
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include "glext.h"
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
||||||
|
#include "glext.h"
|
||||||
|
#endif
|
||||||
|
#include "wglext.h"
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma comment(lib, "OpenGL32.lib")
|
#pragma comment(lib, "OpenGL32.lib")
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,23 +8,22 @@
|
||||||
#include "IrrCompileConfig.h"
|
#include "IrrCompileConfig.h"
|
||||||
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
||||||
|
|
||||||
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
||||||
|
#define GL_GLEXT_LEGACY 1
|
||||||
|
#endif
|
||||||
#ifdef _IRR_WINDOWS_API_
|
#ifdef _IRR_WINDOWS_API_
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#else
|
#elif defined(_IRR_OSX_PLATFORM_)
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#define GL_GLEXT_LEGACY 1
|
|
||||||
#endif
|
|
||||||
#if defined(_IRR_OSX_PLATFORM_)
|
|
||||||
#include <OpenGL/gl.h>
|
#include <OpenGL/gl.h>
|
||||||
|
#elif defined(_IRR_USE_SDL_DEVICE_)
|
||||||
|
#define NO_SDL_GLEXT
|
||||||
|
#include <SDL/SDL_video.h>
|
||||||
|
#include <SDL/SDL_opengl.h>
|
||||||
#else
|
#else
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#include "glext.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "IMaterialRenderer.h"
|
#include "IMaterialRenderer.h"
|
||||||
|
|
||||||
|
|
|
@ -11,28 +11,29 @@
|
||||||
#include "IrrCompileConfig.h"
|
#include "IrrCompileConfig.h"
|
||||||
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
||||||
|
|
||||||
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
||||||
|
#define GL_GLEXT_LEGACY 1
|
||||||
|
#endif
|
||||||
#ifdef _IRR_WINDOWS_API_
|
#ifdef _IRR_WINDOWS_API_
|
||||||
// include windows headers for HWND
|
// include windows headers for HWND
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include "glext.h"
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma comment(lib, "OpenGL32.lib")
|
#pragma comment(lib, "OpenGL32.lib")
|
||||||
#pragma comment(lib, "GLu32.lib")
|
|
||||||
#endif
|
#endif
|
||||||
|
#elif defined(_IRR_USE_OSX_DEVICE_)
|
||||||
|
#include <OpenGL/gl.h>
|
||||||
|
#elif defined(_IRR_USE_SDL_DEVICE_)
|
||||||
|
#define NO_SDL_GLEXT
|
||||||
|
#include <SDL/SDL_video.h>
|
||||||
|
#include <SDL/SDL_opengl.h>
|
||||||
#else
|
#else
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#define GL_GLEXT_LEGACY 1
|
|
||||||
#endif
|
|
||||||
#if defined(_IRR_OSX_PLATFORM_)
|
#if defined(_IRR_OSX_PLATFORM_)
|
||||||
#include <OpenGL/gl.h>
|
#include <OpenGL/gl.h>
|
||||||
#else
|
#else
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
||||||
#include "glext.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue