zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-03 04:10:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes build error with winlayer. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5939 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-11-18 05:29:51 +00:00
parent be6069fc6d
commit d7d28ca24e
1 changed files with 28 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
polymer/eduke32/build/src/winlayer.c
View file

@ -7,6 +7,25 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define CINTERFACE #define CINTERFACE
#include <windows.h>
#include <math.h>
#include <malloc.h>
#include "build.h"
#include "winlayer.h"
#include "rawinput.h"
#include "mutex.h"
#include "winbits.h"
#include "engine_priv.h"
#include "dx/ddraw.h"
#include "dx/dinput.h"
#ifdef _MSC_VER
#include <crtdbg.h>
#endif
// bug in the dx headers // bug in the dx headers
#if defined (_MSC_VER) || !defined(__cplusplus) #if defined (_MSC_VER) || !defined(__cplusplus)
#define bDIPROP_BUFFERSIZE MAKEDIPROP(1) #define bDIPROP_BUFFERSIZE MAKEDIPROP(1)
@ -28,54 +47,18 @@
# define bREFIID & # define bREFIID &
#endif #endif
#include <malloc.h>
#ifdef _MSC_VER
#include <InitGuid.h>
#endif
#include <windows.h>
#include "dx/ddraw.h"
#include "dx/dinput.h"
#ifndef DIK_PAUSE #ifndef DIK_PAUSE
# define DIK_PAUSE 0xC5 # define DIK_PAUSE 0xC5
#endif #endif
#include <math.h> // pow
#ifdef __cplusplus
#include <algorithm>
#endif
#ifdef _MSC_VER
#include <crtdbg.h>
#endif
#include "dxdidf.h" // comment this out if c_dfDI* is being reported as multiply defined #include "dxdidf.h" // comment this out if c_dfDI* is being reported as multiply defined
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#ifndef __STDC_LIMIT_MACROS #ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
#endif #endif
#include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h>
#ifdef USE_OPENGL
#include "glbuild.h"
#endif
#include "compat.h"
#include "winlayer.h"
#include "baselayer.h"
#include "pragmas.h"
#include "build.h"
#include "a.h"
#include "osd.h"
#include "rawinput.h"
#include "mutex.h"
#include "winbits.h"
#include "engine_priv.h"
// undefine to restrict windowed resolutions to conventional sizes // undefine to restrict windowed resolutions to conventional sizes
#define ANY_WINDOWED_SIZE #define ANY_WINDOWED_SIZE
@ -1748,12 +1731,14 @@ int setvsync(int newSync)
if (!glinfo.vsync) if (!glinfo.vsync)
{ {
vsync_render = 0; vsync_render = 0;
return; return 0;
} }
vsync_render = newSync; vsync_render = newSync;
# ifdef USE_GLEXT # ifdef USE_GLEXT
bwglSwapIntervalEXT(newSync); bwglSwapIntervalEXT(newSync);
# endif # endif
return newSync;
} }
static void cdsenummodes(void) static void cdsenummodes(void)
@ -2001,6 +1986,10 @@ void showframe(int32_t w)
BitBlt(hDC, 0, 0, xres, yres, hDCSection, 0, 0, SRCCOPY); BitBlt(hDC, 0, 0, xres, yres, hDCSection, 0, 0, SRCCOPY);
return; return;
} }
/*
else
IDirectDraw_WaitForVerticalBlank(lpDD, DDWAITVB_BLOCKBEGIN, NULL);
*/
if (!w && (IDirectDrawSurface_GetBltStatus(lpDDSBack, DDGBS_CANBLT) == DDERR_WASSTILLDRAWING || if (!w && (IDirectDrawSurface_GetBltStatus(lpDDSBack, DDGBS_CANBLT) == DDERR_WASSTILLDRAWING ||
IDirectDrawSurface_GetFlipStatus(lpDDSPrimary, DDGFS_CANFLIP) == DDERR_WASSTILLDRAWING)) IDirectDrawSurface_GetFlipStatus(lpDDSPrimary, DDGFS_CANFLIP) == DDERR_WASSTILLDRAWING))