From cb65b4e8ca4b86a645489d41e6aec319c6f331a8 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Sat, 29 Sep 2018 12:11:28 +0300 Subject: [PATCH] Enable xrRenderPC_GL cmake build. Add "typedef enum _D3DTEXTURETRANSFORMFLAGS" from wine. Small linux header fix --- src/Common/PlatformLinux.inl | 11 +++++++++++ src/Layers/CMakeLists.txt | 2 +- src/Layers/xrRender/Animation.cpp | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl index a0a30013cf9..a179d38d57f 100644 --- a/src/Common/PlatformLinux.inl +++ b/src/Common/PlatformLinux.inl @@ -908,5 +908,16 @@ typedef enum _D3DTRANSFORMSTATETYPE { #define D3DDECL_END() {0xFF,0,D3DDECLTYPE_UNUSED,0,0,0} +typedef enum _D3DTEXTURETRANSFORMFLAGS { + D3DTTFF_DISABLE = 0, + D3DTTFF_COUNT1 = 1, + D3DTTFF_COUNT2 = 2, + D3DTTFF_COUNT3 = 3, + D3DTTFF_COUNT4 = 4, + D3DTTFF_PROJECTED = 256, + + D3DTTFF_FORCE_DWORD = 0x7fffffff +} D3DTEXTURETRANSFORMFLAGS; + inline BOOL SwitchToThread() { return (0 == pthread_yield()); } diff --git a/src/Layers/CMakeLists.txt b/src/Layers/CMakeLists.txt index f0aa659b5a4..2ac726ff79a 100644 --- a/src/Layers/CMakeLists.txt +++ b/src/Layers/CMakeLists.txt @@ -3,4 +3,4 @@ add_subdirectory(xrAPI) #add_subdirectory(xrRenderPC_R2) #add_subdirectory(xrRenderPC_R3) #add_subdirectory(xrRenderPC_R4) -#add_subdirectory(xrRenderPC_GL) +add_subdirectory(xrRenderPC_GL) diff --git a/src/Layers/xrRender/Animation.cpp b/src/Layers/xrRender/Animation.cpp index 5a17c94801f..d915b3737c0 100644 --- a/src/Layers/xrRender/Animation.cpp +++ b/src/Layers/xrRender/Animation.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "animation.h" +#include "Animation.h" using namespace animation;