mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-06 01:50:38 +00:00
Compile error fixes
This commit is contained in:
@@ -813,7 +813,7 @@ void WrappedOpenGL::glDebugMessageControl(GLenum source, GLenum type, GLenum sev
|
||||
|
||||
bool WrappedOpenGL::Serialise_glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
|
||||
{
|
||||
wstring name = name_ ? widen(string(buf, buf+length)) : L"";
|
||||
wstring name = buf ? widen(string(buf, buf+length)) : L"";
|
||||
|
||||
m_pSerialiser->Serialise("Name", name);
|
||||
|
||||
|
||||
@@ -87,6 +87,15 @@ typedef void (*PFNGLXSWAPBUFFERSPROC)(Display *dpy, GLXDrawable drawable);
|
||||
|
||||
*/
|
||||
|
||||
// don't want these definitions, the only place we'll use these is as parameter/variable names
|
||||
#ifdef near
|
||||
#undef near
|
||||
#endif
|
||||
|
||||
#ifdef far
|
||||
#undef far
|
||||
#endif
|
||||
|
||||
#define HookWrapper0(ret, function) \
|
||||
typedef ret (*CONCAT(function, _hooktype)) (); \
|
||||
extern "C" __attribute__ ((visibility ("default"))) \
|
||||
|
||||
@@ -84,6 +84,15 @@
|
||||
|
||||
*/
|
||||
|
||||
// don't want these definitions, the only place we'll use these is as parameter/variable names
|
||||
#ifdef near
|
||||
#undef near
|
||||
#endif
|
||||
|
||||
#ifdef far
|
||||
#undef far
|
||||
#endif
|
||||
|
||||
#define HookWrapper0(ret, function) \
|
||||
Hook<ret (WINAPI *) ()> CONCAT(function, _hook); \
|
||||
typedef ret (WINAPI *CONCAT(function, _hooktype)) (); \
|
||||
|
||||
Reference in New Issue
Block a user