jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-capture: Fix VS2015 update 2 compiler error

Browse Source 
Having volatile variables inside of a union causes a C1001 compiler
error in visual studio 2015 update 2.

Closes jp9000/obs-studio#544
This commit is contained in:
jp9000
2016-05-28 09:38:39 -07:00
parent 2a6d85b4c5
commit 6ca3cd3504
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/win-capture/graphics-hook/d3d9-capture.cpp
View File

@@ -36,6 +36,8 @@ struct d3d9_data {
bool using_shtex : 1;
bool using_scale : 1;
volatile bool issued_queries[NUM_BUFFERS];
union {
/* shared texture */
struct {
@@ -53,7 +55,6 @@ struct d3d9_data {
IDirect3DSurface9 *render_targets[NUM_BUFFERS];
IDirect3DQuery9 *queries[NUM_BUFFERS];
struct shmem_data *shmem_info;
volatile bool issued_queries[NUM_BUFFERS];
bool texture_mapped[NUM_BUFFERS];
uint32_t pitch;
int cur_tex;