A couple of integral type modifications to ease up long type enabling.
From: Eric Pouech eric.pouech@gmail.com
Note: MAKEDWORD_VERSION is now a bit more awkward that it was (it actually generates an unsigned int in regular uses). (but I felt that changing its name to reflect no longer DWORD was pointless)
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/adapter_gl.c | 7 ++++--- dlls/wined3d/shader_sm1.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3131fdadeae..7ea14a4abd5 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1142,7 +1142,7 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_cap test_pbo_functionality(gl_info); }
-static DWORD wined3d_parse_gl_version(const char *gl_version) +static unsigned int wined3d_parse_gl_version(const char *gl_version) { const char *ptr = gl_version; int major, minor; @@ -3394,7 +3394,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, }; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; - DWORD gl_version, gl_ext_emul_mask; + unsigned int gl_version; + DWORD gl_ext_emul_mask; const char *WGL_Extensions = NULL; enum wined3d_gl_vendor gl_vendor; GLint context_profile = 0; @@ -5284,7 +5285,7 @@ end: static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { - static const DWORD supported_gl_versions[] = + static const unsigned int supported_gl_versions[] = { MAKEDWORD_VERSION(4, 4), MAKEDWORD_VERSION(3, 2), diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 50969c058f2..1a2f0fe17dc 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -428,7 +428,7 @@ static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const
static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token) { - DWORD shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); + unsigned int shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table; unsigned int i = 0;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7c9c75364c..2a6cbd29313 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -510,7 +510,7 @@ enum wined3d_shader_backend struct wined3d_settings { unsigned int cs_multithreaded; - DWORD max_gl_version; + unsigned int max_gl_version; int offscreen_rendering_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; @@ -3374,8 +3374,8 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g
struct wined3d_gl_info { - DWORD selected_gl_version; - DWORD glsl_version; + unsigned int selected_gl_version; + unsigned int glsl_version; struct wined3d_gl_limits limits; DWORD reserved_glsl_constants, reserved_arb_constants; DWORD quirks; @@ -3451,8 +3451,8 @@ struct wined3d_driver_info char description[WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH]; UINT64 vram_bytes; UINT64 sysmem_bytes; - DWORD version_high; - DWORD version_low; + unsigned int version_high; + unsigned int version_low; };
bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info,
From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/resource.c | 6 +++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a6e9e57269a..ed828615101 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1933,7 +1933,7 @@ static BOOL wined3d_check_surface_format(const struct wined3d_format *format) * restrict it to some should applications need that. */ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, - enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_format_id adapter_format_id, uint32_t usage, unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) { const struct wined3d_format *adapter_format, *format; @@ -1941,7 +1941,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, unsigned int format_caps = 0, format_attrs = 0; BOOL mipmap_gen_supported = TRUE; unsigned int allowed_bind_flags; - DWORD allowed_usage; + uint32_t allowed_usage;
TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, " "bind_flags %s, resource_type %s, check_format %s.\n", diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 39a74b71c3f..a00e235a29b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -26,9 +26,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
-static void resource_check_usage(DWORD usage, unsigned int access) +static void resource_check_usage(uint32_t usage, unsigned int access) { - static const DWORD handled = WINED3DUSAGE_DYNAMIC + static const uint32_t handled = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH @@ -51,7 +51,7 @@ static void resource_check_usage(DWORD usage, unsigned int access)
HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, uint32_t usage, unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 33646485f72..56f383dc763 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4929,7 +4929,7 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const str d->u.texture.layer_idx, d->u.texture.layer_count); }
-const char *debug_d3dusage(DWORD usage) +const char *debug_d3dusage(uint32_t usage) { struct debug_buffer buffer;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a6cbd29313..ff09a014dac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4415,7 +4415,7 @@ struct wined3d_resource unsigned int format_caps; enum wined3d_multisample_type multisample_type; UINT multisample_quality; - DWORD usage; + uint32_t usage; unsigned int bind_flags; unsigned int access; WORD draw_binding; @@ -5763,7 +5763,7 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; -const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; +const char *debug_d3dusage(uint32_t usage) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; const char *debug_d3dinput_classification(enum wined3d_input_classification classification) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d20157b1223..a8008fe87e2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2294,7 +2294,7 @@ HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter * enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, - enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_format_id adapter_format_id, uint32_t usage, unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id,
From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/resource.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a00e235a29b..e2100627198 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -265,9 +265,9 @@ void resource_unload(struct wined3d_resource *resource) ERR("Resource %p is being unloaded while mapped.\n", resource); }
-DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority) +unsigned int CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, unsigned int priority) { - DWORD prev; + unsigned int prev;
if (!(resource->usage & WINED3DUSAGE_MANAGED)) { @@ -281,7 +281,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO return prev; }
-DWORD CDECL wined3d_resource_get_priority(const struct wined3d_resource *resource) +unsigned int CDECL wined3d_resource_get_priority(const struct wined3d_resource *resource) { TRACE("resource %p, returning %u.\n", resource, resource->priority); return resource->priority; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff09a014dac..a8f9921736b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4424,7 +4424,7 @@ struct wined3d_resource UINT height; UINT depth; UINT size; - DWORD priority; + unsigned int priority; void *heap_memory;
uint32_t pin_sysmem : 1; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a8008fe87e2..ae0bc309b3f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2675,12 +2675,12 @@ ULONG __cdecl wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *s void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc); void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); -DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource); +unsigned int __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource); HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags); void __cdecl wined3d_resource_preload(struct wined3d_resource *resource); void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); -DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); +unsigned int __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, unsigned int priority); HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx);
HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_view_desc *desc,
From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2f6db56a961..8c285f3eba7 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3666,7 +3666,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); const struct wined3d_fb_state *fb = &state->fb; DWORD color_location = 0; - DWORD *cur_mask; + uint32_t *cur_mask;
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7fd94b133a..4435b9e5b34 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7590,7 +7590,7 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff } else { - DWORD mask = shader->reg_maps.rt_mask; + uint32_t mask = shader->reg_maps.rt_mask;
while (mask) { @@ -7841,7 +7841,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ } else { - DWORD mask = reg_maps->rt_mask; + uint32_t mask = reg_maps->rt_mask;
while (mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8f9921736b..ebbf0e8cba0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4875,7 +4875,7 @@ struct fbo_entry { struct list entry; uint32_t flags; - DWORD rt_mask; + uint32_t rt_mask; GLuint id; struct wined3d_fbo_entry_key {
From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db70a9853d4..4176eda91af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3397,7 +3397,7 @@ static void arbfp_add_sRGB_correction(struct wined3d_string_buffer *buffer, cons /* [0.0;1.0] clamping. Not needed, this is done implicitly */ }
-static const DWORD *find_loop_control_values(const struct wined3d_shader *shader, DWORD idx) +static const unsigned int *find_loop_control_values(const struct wined3d_shader *shader, DWORD idx) { const struct wined3d_shader_lconst *constant;
@@ -3719,7 +3719,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, compiled->int_consts[i] = WINED3D_CONST_NUM_UNUSED; if (reg_maps->integer_constants & (1u << i) && priv_ctx.target_version >= NV2) { - const DWORD *control_values = find_loop_control_values(shader, i); + const unsigned int *control_values = find_loop_control_values(shader, i);
if(control_values) { @@ -4167,7 +4167,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, compiled->int_consts[i] = WINED3D_CONST_NUM_UNUSED; if (reg_maps->integer_constants & (1u << i) && priv_ctx.target_version >= NV2) { - const DWORD *control_values = find_loop_control_values(shader, i); + const unsigned int *control_values = find_loop_control_values(shader, i);
if(control_values) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4435b9e5b34..1dbeb9351d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4847,7 +4847,7 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct wined3d_string_buffer *reg_name; - const DWORD *control_values = NULL; + const unsigned int *control_values = NULL;
if (ins->ctx->reg_maps->shader_version.major < 4) { @@ -4945,7 +4945,7 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct glsl_src_param src0_param; - const DWORD *control_values = NULL; + const unsigned int *control_values = NULL;
/* Try to hardcode local values to help the GLSL compiler to unroll and optimize the loop */ if (ins->src[0].reg.type == WINED3DSPR_CONSTINT) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebbf0e8cba0..a76dc7407cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5834,7 +5834,7 @@ struct wined3d_shader_lconst { struct list entry; unsigned int idx; - DWORD value[4]; + unsigned int value[4]; };
struct wined3d_shader_limits
This merge request was approved by Zebediah Figura.
-
Eric Pouech -
eric pouech (＠epo)
-
Zebediah Figura (＠zfigura)