TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use inline namespace dcx for common/arch/ogl

Browse source
This commit is contained in:
Kp 2015-12-05 22:57:24 +00:00
parent 43dd620557
commit de6c2b3982
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/arch/ogl/ogl_extensions.cpp
View file

@ -19,6 +19,8 @@
#include "dxxsconf.h"
#include "compiler-array.h"
inline namespace dcx {
/* GL_ARB_sync */
bool ogl_have_ARB_sync = false;
PFNGLFENCESYNCPROC glFenceSyncFunc = NULL;
@ -93,3 +95,5 @@ void ogl_extensions_init()
con_printf(CON_VERBOSE, "GL_ARB_sync not available");
}
}
}

4
common/arch/ogl/ogl_sync.cpp
View file

@ -20,6 +20,8 @@
#include "ogl_sync.h"
#include "timer.h"
inline namespace dcx {
ogl_sync::ogl_sync()
{
method=SYNC_GL_NONE;
@ -119,3 +121,5 @@ void ogl_sync::deinit()
{
fence.reset();
}
}

3
common/include/ogl_extensions.h
View file

@ -47,6 +47,8 @@ typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuin
#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
#define GL_TIMEOUT_EXPIRED 0x911B
inline namespace dcx {
extern bool ogl_have_ARB_sync;
extern PFNGLFENCESYNCPROC glFenceSyncFunc;
extern PFNGLDELETESYNCPROC glDeleteSyncFunc;
@ -57,3 +59,4 @@ extern PFNGLCLIENTWAITSYNCPROC glClientWaitSyncFunc;
*/
void ogl_extensions_init();
}

4
common/include/ogl_sync.h
View file

@ -17,6 +17,8 @@
#include "args.h"
#include "ogl_extensions.h"
inline namespace dcx {
class ogl_sync {
class sync_deleter
{
@ -37,3 +39,5 @@ class ogl_sync {
void init(SyncGLMethod sync_method, int wait);
void deinit();
};
}