From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 +----------------------- 2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 40abd36f3b7..cb9810a3f1c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1091,4 +1091,26 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, struct wined3d_context_gl *context_gl);
+struct wined3d_unordered_access_view_gl +{ + struct wined3d_unordered_access_view v; + struct wined3d_bo_user bo_user; + struct wined3d_gl_view gl_view; + struct wined3d_bo_gl counter_bo; +}; + +static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_view_gl( + struct wined3d_unordered_access_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); +} + +void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl, bool fp); +HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); +void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, + struct wined3d_context_gl *context_gl); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a4766b5736..f79cc01974d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4006,8 +4006,6 @@ struct wined3d_shader_resource_view
void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN;
-#include "wined3d_gl.h" - struct wined3d_unordered_access_view { LONG refcount; @@ -4030,27 +4028,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN;
-struct wined3d_unordered_access_view_gl -{ - struct wined3d_unordered_access_view v; - struct wined3d_bo_user bo_user; - struct wined3d_gl_view gl_view; - struct wined3d_bo_gl counter_bo; -}; - -static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_view_gl( - struct wined3d_unordered_access_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); -} - -void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view_gl *view_gl, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl, bool fp) DECLSPEC_HIDDEN; -HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +#include "wined3d_gl.h"
struct wined3d_swapchain_state {
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cb9810a3f1c..59512b7bcc6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -32,6 +32,7 @@ #include "wine/wgl.h" #include "wine/wgl_driver.h"
+struct wined3d_swapchain_gl; struct wined3d_texture_gl;
#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 /* not in the gl spec */ @@ -1113,4 +1114,20 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, struct wined3d_context_gl *context_gl);
+struct wined3d_swapchain_gl +{ + struct wined3d_swapchain s; +}; + +static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) +{ + return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); +} + +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl); +struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl); +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, + const struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f79cc01974d..c8132783223 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -97,7 +97,6 @@ struct wined3d_adapter; struct wined3d_context; struct wined3d_gl_info; struct wined3d_state; -struct wined3d_swapchain_gl; struct wined3d_vertex_pipe_ops;
enum wined3d_ffp_idx @@ -4028,8 +4027,6 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN;
-#include "wined3d_gl.h" - struct wined3d_swapchain_state { struct wined3d *wined3d; @@ -4095,22 +4092,7 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-struct wined3d_swapchain_gl -{ - struct wined3d_swapchain s; -}; - -static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) -{ - return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); -} - -void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, - struct wined3d_device *device, const struct wined3d_swapchain_desc *desc, - struct wined3d_swapchain_state_parent *state_parent, void *parent, - const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h"
/***************************************************************************** * Utility function prototypes
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 4 ++++ dlls/wined3d/wined3d_private.h | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 59512b7bcc6..9d1827cd608 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -364,7 +364,11 @@ struct wined3d_gl_info
void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext); void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program); +void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + BOOL is_alpha, int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, + int texture_idx, DWORD dst); void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); +void texture_activate_dimensions(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info); GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags); void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8132783223..3198c36c37d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -95,7 +95,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end) struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; -struct wined3d_gl_info; struct wined3d_state; struct wined3d_vertex_pipe_ops;
@@ -4092,8 +4091,6 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-#include "wined3d_gl.h" - /***************************************************************************** * Utility function prototypes */ @@ -4128,11 +4125,6 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN;
BOOL is_invalid_op(const struct wined3d_state *state, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; -void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - BOOL is_alpha, int stage, enum wined3d_texture_op op, uint32_t arg1, uint32_t arg2, uint32_t arg3, - INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; -void texture_activate_dimensions(struct wined3d_texture *texture, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void tex_alphaop(struct wined3d_context *context, @@ -4631,6 +4623,8 @@ uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct w BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) DECLSPEC_HIDDEN;
+#include "wined3d_gl.h" + struct wined3d_format_gl { struct wined3d_format f;
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9d1827cd608..0e744fe5023 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1134,4 +1134,36 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, str const struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops);
+struct wined3d_format_gl +{ + struct wined3d_format f; + + GLenum vtx_type; + GLint vtx_format; + + GLint internal; + GLint srgb_internal; + GLint rt_internal; + GLint format; + GLint type; + + GLenum view_class; +}; + +static inline const struct wined3d_format_gl *wined3d_format_gl(const struct wined3d_format *format) +{ + return CONTAINING_RECORD(format, struct wined3d_format_gl, f); +} + +static inline GLuint wined3d_gl_get_internal_format(struct wined3d_resource *resource, + const struct wined3d_format_gl *format_gl, bool srgb) +{ + if (srgb) + return format_gl->srgb_internal; + else if ((resource->bind_flags & WINED3D_BIND_RENDER_TARGET) && wined3d_resource_is_offscreen(resource)) + return format_gl->rt_internal; + else + return format_gl->internal; +} + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3198c36c37d..e353c7d18de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4625,27 +4625,6 @@ BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1,
#include "wined3d_gl.h"
-struct wined3d_format_gl -{ - struct wined3d_format f; - - GLenum vtx_type; - GLint vtx_format; - - GLint internal; - GLint srgb_internal; - GLint rt_internal; - GLint format; - GLint type; - - GLenum view_class; -}; - -static inline const struct wined3d_format_gl *wined3d_format_gl(const struct wined3d_format *format) -{ - return CONTAINING_RECORD(format, struct wined3d_format_gl, f); -} - BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;
static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) @@ -4729,17 +4708,6 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; }
-static inline GLuint wined3d_gl_get_internal_format(struct wined3d_resource *resource, - const struct wined3d_format_gl *format_gl, bool srgb) -{ - if (srgb) - return format_gl->srgb_internal; - else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) - return format_gl->rt_internal; - else - return format_gl->internal; -} - static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup);
From: Zebediah Figura zfigura@codeweavers.com
--- dlls/wined3d/wined3d_gl.h | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 25 ++----------------------- 2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0e744fe5023..98832d54ff5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -925,6 +925,20 @@ GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags); GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource);
+static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo_gl) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + + bo_gl->command_fence_id = device_gl->current_fence_id; +} + +static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl *context_gl, + struct wined3d_buffer *buffer) +{ + if (buffer->buffer_object) + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(buffer->buffer_object)); +} + struct gl_texture { struct wined3d_sampler_desc sampler_desc; @@ -982,6 +996,14 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win return texture_gl->target; }
+static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_texture_gl *texture_gl, + const struct wined3d_context *context, bool srgb) +{ + if (srgb && needs_separate_srgb_gl_texture(context, &texture_gl->t)) + return texture_gl->texture_srgb.name; + return texture_gl->texture_rgb.name; +} + static inline bool wined3d_texture_gl_is_multisample_location(const struct wined3d_texture_gl *texture_gl, uint32_t location) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e353c7d18de..9846a25392f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4623,8 +4623,6 @@ uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct w BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) DECLSPEC_HIDDEN;
-#include "wined3d_gl.h" - BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;
static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) @@ -4701,13 +4699,6 @@ static inline BOOL needs_srgb_write(const struct wined3d_d3d_info *d3d_info, && fb->render_targets[0] && fb->render_targets[0]->format_caps & WINED3D_FORMAT_CAP_SRGB_WRITE; }
-static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_texture_gl *texture_gl, - const struct wined3d_context *context, BOOL srgb) -{ - return srgb && needs_separate_srgb_gl_texture(context, &texture_gl->t) - ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; -} - static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); @@ -5080,20 +5071,6 @@ static inline bool wined3d_primitive_type_is_list(enum wined3d_primitive_type t) || t == WINED3D_PT_PATCH; }
-static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo_gl) -{ - struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); - - bo_gl->command_fence_id = device_gl->current_fence_id; -} - -static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl *context_gl, - struct wined3d_buffer *buffer) -{ - if (buffer->buffer_object) - wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(buffer->buffer_object)); -} - static inline bool wined3d_map_persistent(void) { return sizeof(void *) >= sizeof(uint64_t); @@ -5104,4 +5081,6 @@ static inline bool wined3d_map_persistent(void)
extern CRITICAL_SECTION wined3d_command_cs;
+#include "wined3d_gl.h" + #endif
From: Zebediah Figura zfigura@codeweavers.com
--- 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
This merge request was approved by Jan Sikorski.
-
Jan Sikorski (＠jsikorski) -
Zebediah Figura
-
Zebediah Figura (＠zfigura)