mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Try to fix macro definition order problem with OpenGL code
This commit is contained in:
parent
13e271c6cb
commit
38cacfa577
@ -90,6 +90,9 @@ typedef char GLchar;
|
|||||||
// to check if this header is in the current compile unit (different GL implementation used different "GLCommon" headers in Irrlicht
|
// to check if this header is in the current compile unit (different GL implementation used different "GLCommon" headers in Irrlicht
|
||||||
#define IRR_COMPILE_GLES_COMMON
|
#define IRR_COMPILE_GLES_COMMON
|
||||||
|
|
||||||
|
// macro used with COGLES1Driver
|
||||||
|
#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
@ -19,6 +19,9 @@
|
|||||||
// To check if this header is in the current compile unit (different GL driver implementations use different "GLCommon" headers in Irrlicht)
|
// To check if this header is in the current compile unit (different GL driver implementations use different "GLCommon" headers in Irrlicht)
|
||||||
#define IRR_COMPILE_GL_COMMON
|
#define IRR_COMPILE_GL_COMMON
|
||||||
|
|
||||||
|
// macro used with COpenGLDriver
|
||||||
|
#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
@ -22,8 +22,6 @@ class CIrrDeviceMacOSX;
|
|||||||
#include "COpenGLExtensionHandler.h"
|
#include "COpenGLExtensionHandler.h"
|
||||||
#include "IContextManager.h"
|
#include "IContextManager.h"
|
||||||
|
|
||||||
#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
|
#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
|
||||||
|
|
||||||
#include "CIrrDeviceSDL.h"
|
#include "CIrrDeviceSDL.h"
|
||||||
#include "COpenGLCommon.h"
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
|
@ -14,6 +14,9 @@
|
|||||||
#include "vendor/gl.h"
|
#include "vendor/gl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// macro used with COpenGL3DriverBase
|
||||||
|
#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
#include "ExtensionHandler.h"
|
#include "ExtensionHandler.h"
|
||||||
#include "IContextManager.h"
|
#include "IContextManager.h"
|
||||||
|
|
||||||
#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
Loading…
Reference in New Issue
Block a user