提交 6ca3cd35 编写于 作者: J jp9000

win-capture: Fix VS2015 update 2 compiler error

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

Closes jp9000/obs-studio#544
上级 2a6d85b4
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册