From bf46a3fd541d3c377d241d34cfcb7f5fbfea4e83 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 1 Nov 2014 16:53:51 +0000 Subject: [PATCH] linux compile fixes --- renderdoc/driver/gl/gl_resources.cpp | 4 ++++ renderdoc/hooks/gl_linux_hooks.cpp | 1 + renderdoc/os/linux/linux_process.cpp | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/gl/gl_resources.cpp b/renderdoc/driver/gl/gl_resources.cpp index eced5bceb..3315acf88 100644 --- a/renderdoc/driver/gl/gl_resources.cpp +++ b/renderdoc/driver/gl/gl_resources.cpp @@ -216,6 +216,8 @@ GLenum GetBaseFormat(GLenum internalFormat) case eGL_STENCIL_INDEX8: case eGL_STENCIL_INDEX16: return eGL_STENCIL; + default: + break; } RDCERR("Unhandled Base Format case!"); @@ -314,6 +316,8 @@ GLenum GetDataType(GLenum internalFormat) return eGL_FLOAT_32_UNSIGNED_INT_24_8_REV; case eGL_STENCIL_INDEX8: return eGL_UNSIGNED_BYTE; + default: + break; } RDCERR("Unhandled Data Type case!"); diff --git a/renderdoc/hooks/gl_linux_hooks.cpp b/renderdoc/hooks/gl_linux_hooks.cpp index 4fafd0a9d..5b83be1b8 100644 --- a/renderdoc/hooks/gl_linux_hooks.cpp +++ b/renderdoc/hooks/gl_linux_hooks.cpp @@ -38,6 +38,7 @@ namespace Keyboard { extern Display *CurrentXDisplay; } typedef GLXContext (*PFNGLXCREATECONTEXTPROC)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct); +typedef void (*PFNGLXDESTROYCONTEXTPROC)(Display *dpy, GLXContext ctx); typedef const char *(*PFNGLXQUERYEXTENSIONSSTRING)(Display *dpy, int screen); typedef Bool (*PFNGLXMAKECURRENTPROC)(Display *dpy, GLXDrawable drawable, GLXContext ctx); typedef void (*PFNGLXSWAPBUFFERSPROC)(Display *dpy, GLXDrawable drawable); diff --git a/renderdoc/os/linux/linux_process.cpp b/renderdoc/os/linux/linux_process.cpp index b1da16b92..c017b4ed4 100644 --- a/renderdoc/os/linux/linux_process.cpp +++ b/renderdoc/os/linux/linux_process.cpp @@ -43,7 +43,6 @@ uint32_t Process::CreateAndInjectIntoProcess(const wchar_t *app, const wchar_t * void Process::StartGlobalHook(const wchar_t *pathmatch, const wchar_t *logfile, const CaptureOptions *opts) { RDCUNIMPLEMENTED(); - return 0; } void *Process::GetFunctionAddress(const char *module, const char *function)