Zebediah Figura : wined3d: Move the wined3d_gl.h include to individual files.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5bc6ab56d0eefd388b3ae37c7941cd118bd672da
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5bc6ab56d0eefd388b3ae37c7941cd1...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Fri Jan  6 16:46:51 2023 -0600

wined3d: Move the wined3d_gl.h include to individual files.

---

 dlls/wined3d/adapter_gl.c            | 1 +
 dlls/wined3d/arb_program_shader.c    | 1 +
 dlls/wined3d/ati_fragment_shader.c   | 1 +
 dlls/wined3d/buffer.c                | 1 +
 dlls/wined3d/context_gl.c            | 1 +
 dlls/wined3d/cs.c                    | 3 ++-
 dlls/wined3d/device.c                | 1 +
 dlls/wined3d/directx.c               | 1 +
 dlls/wined3d/gl_compat.c             | 1 +
 dlls/wined3d/glsl_shader.c           | 1 +
 dlls/wined3d/nvidia_texture_shader.c | 1 +
 dlls/wined3d/query.c                 | 1 +
 dlls/wined3d/resource.c              | 1 +
 dlls/wined3d/sampler.c               | 1 +
 dlls/wined3d/shader.c                | 1 +
 dlls/wined3d/state.c                 | 1 +
 dlls/wined3d/surface.c               | 1 +
 dlls/wined3d/swapchain.c             | 1 +
 dlls/wined3d/texture.c               | 1 +
 dlls/wined3d/utils.c                 | 1 +
 dlls/wined3d/view.c                  | 1 +
 dlls/wined3d/wined3d_main.c          | 1 +
 dlls/wined3d/wined3d_private.h       | 2 --
 23 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 9af08f6061f..776dcfb406c 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 14703e9c66c..c535fe7d3ff 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_constants);
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index ec5c2ac6b6f..47426f0f49d 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 WINE_DECLARE_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index c71c1ac2a87..082d502ff98 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -23,6 +23,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index 36786cc5a29..5a45ae7dc72 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -25,6 +25,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 9a4f2cdfc94..3cfce72ae94 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -17,6 +17,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
@@ -186,7 +187,7 @@ struct wined3d_cs_draw
 {
     enum wined3d_cs_op opcode;
     enum wined3d_primitive_type primitive_type;
-    GLint patch_vertex_count;
+    unsigned int patch_vertex_count;
     struct wined3d_draw_parameters parameters;
 };
 
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 2b18e76de30..4b9ea98a04d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -25,6 +25,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ec975f5b9f3..78e743900ec 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -22,6 +22,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "winternl.h"
 #include "wine/list.h"
 
diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c
index 261b06fe778..451a5034a38 100644
--- a/dlls/wined3d/gl_compat.c
+++ b/dlls/wined3d/gl_compat.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gl_compat);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 6bbb432dc1d..552d1bd75bd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 WINE_DECLARE_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index 3d86e16c864..eb548f6e366 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 6894dc050a9..29384161b01 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -19,6 +19,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 03a755391ee..9d3fd0a426d 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -22,6 +22,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
index b4b169a59d4..e93ab18f436 100644
--- a/dlls/wined3d/sampler.c
+++ b/dlls/wined3d/sampler.c
@@ -18,6 +18,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 96b47db9ed6..b6bfcd1184f 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index eb631fa1cb8..07c11269496 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index fd8db9ce60d..11b1da829d7 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -27,6 +27,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 30930bc17b6..84dcdb5b110 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -21,6 +21,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 6b5d9eaf510..7ec5c4f4f3b 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -21,6 +21,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 2734a193e1f..e3c2a174cd2 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 675cc186b36..aa07625eb8a 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -19,6 +19,7 @@
 
 #include "wined3d_private.h"
 #include "wined3d_shaders.h"
+#include "wined3d_gl.h"
 #include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 0ff215f7312..11646d3705d 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -26,6 +26,7 @@
 #define VKD3D_NO_WIN32_TYPES
 #include "initguid.h"
 #include "wined3d_private.h"
+#include "wined3d_gl.h"
 #include "d3d12.h"
 #define VK_NO_PROTOTYPES
 #include "wine/vulkan.h"
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9846a25392f..1d9fc796343 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5081,6 +5081,4 @@ static inline bool wined3d_map_persistent(void)
 
 extern CRITICAL_SECTION wined3d_command_cs;
 
-#include "wined3d_gl.h"
-
 #endif