From 6ca3cd350422d20df6a5f7af22e8d18585af8d74 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 28 May 2016 09:38:39 -0700
Subject: [PATCH] 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
---
 plugins/win-capture/graphics-hook/d3d9-capture.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/win-capture/graphics-hook/d3d9-capture.cpp b/plugins/win-capture/graphics-hook/d3d9-capture.cpp
index 441602cca..8948c0bd0 100644
--- a/plugins/win-capture/graphics-hook/d3d9-capture.cpp
+++ b/plugins/win-capture/graphics-hook/d3d9-capture.cpp
@@ -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;