From 37d2ad3bf16030b819cfbb27d9e3c9801c9a5f2f Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 25 Apr 2013 15:01:53 +1000 Subject: [PATCH] put some wgl parts under _WIN32 --- codemp/renderer/qgl.h | 3 ++- codemp/renderer/tr_init.cpp | 2 ++ codemp/renderer/tr_local.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/codemp/renderer/qgl.h b/codemp/renderer/qgl.h index 979c868..a4c8695 100644 --- a/codemp/renderer/qgl.h +++ b/codemp/renderer/qgl.h @@ -182,7 +182,7 @@ extern PFNGLGETCOMBINEROUTPUTPARAMETERIVNV qglGetCombinerOutputParameterivNV; extern PFNGLGETFINALCOMBINERINPUTPARAMETERFVNV qglGetFinalCombinerInputParameterfvNV; extern PFNGLGETFINALCOMBINERINPUTPARAMETERIVNV qglGetFinalCombinerInputParameterivNV; - +#ifdef _WIN32 ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Pixel Format extension definitions. - AReis /***********************************************************************************************************/ @@ -251,6 +251,7 @@ typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, con extern PFNWGLBINDTEXIMAGEARBPROC qwglBindTexImageARB; extern PFNWGLRELEASETEXIMAGEARBPROC qwglReleaseTexImageARB; extern PFNWGLSETPBUFFERATTRIBARBPROC qwglSetPbufferAttribARB; +#endif // _WIN32 ///////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/codemp/renderer/tr_init.cpp b/codemp/renderer/tr_init.cpp index 3e07a05..d53e8f0 100644 --- a/codemp/renderer/tr_init.cpp +++ b/codemp/renderer/tr_init.cpp @@ -251,6 +251,7 @@ PFNGLGETCOMBINEROUTPUTPARAMETERIVNV qglGetCombinerOutputParameterivNV = NULL; PFNGLGETFINALCOMBINERINPUTPARAMETERFVNV qglGetFinalCombinerInputParameterfvNV = NULL; PFNGLGETFINALCOMBINERINPUTPARAMETERIVNV qglGetFinalCombinerInputParameterivNV = NULL; +#ifdef _WIN32 // Declare Pixel Format function pointers. PFNWGLGETPIXELFORMATATTRIBIVARBPROC qwglGetPixelFormatAttribivARB = NULL; PFNWGLGETPIXELFORMATATTRIBFVARBPROC qwglGetPixelFormatAttribfvARB = NULL; @@ -267,6 +268,7 @@ PFNWGLQUERYPBUFFERARBPROC qwglQueryPbufferARB = NULL; PFNWGLBINDTEXIMAGEARBPROC qwglBindTexImageARB = NULL; PFNWGLRELEASETEXIMAGEARBPROC qwglReleaseTexImageARB = NULL; PFNWGLSETPBUFFERATTRIBARBPROC qwglSetPbufferAttribARB = NULL; +#endif // _WIN32 // Declare Vertex and Fragment Program function pointers. PFNGLPROGRAMSTRINGARBPROC qglProgramStringARB = NULL; diff --git a/codemp/renderer/tr_local.h b/codemp/renderer/tr_local.h index ae85e9e..19d6e7e 100644 --- a/codemp/renderer/tr_local.h +++ b/codemp/renderer/tr_local.h @@ -1156,6 +1156,7 @@ void R_Modellist_f (void); class CPBUFFER { private: +#ifdef _WIN32 // Pixel Buffer Rendering and Device Contexts. HGLRC m_hRC; HDC m_hDC; @@ -1166,6 +1167,7 @@ private: // Buffer handle. HPBUFFERARB m_hBuffer; +#endif // Buffer Dimensions. int m_iWidth, m_iHeight;