Module: wine Branch: master Commit: a01f00bed7a1f63a02e2548c37c1391b7869bf0c URL: https://gitlab.winehq.org/wine/wine/-/commit/a01f00bed7a1f63a02e2548c37c1391...
Author: Eric Pouech eric.pouech@gmail.com Date: Thu Dec 8 10:42:27 2022 +0100
wined3d: Reduce usage of long integral types in utils.c.
Signed-off-by: Eric Pouech eric.pouech@gmail.com
---
dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 21 +++++++++++---------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 57f452111a2..ad9f29b72f9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1642,7 +1642,7 @@ HRESULT CDECL wined3d_stateblock_get_light(const struct wined3d_stateblock *stat return WINED3D_OK; }
-static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) +static void init_default_render_states(unsigned int rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 16f660a9d71..b93722296f2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2599,7 +2599,8 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for && format->format != GL_LUMINANCE && format->format != GL_LUMINANCE_ALPHA && (format->f.red_size || format->f.alpha_size)) { - DWORD readback[16 * 16 * 16], color = 0, r_range, a_range; + uint32_t readback[16 * 16 * 16], color = 0; + unsigned int r_range, a_range; BYTE r, a; BOOL match = TRUE; GLuint rb; @@ -3309,7 +3310,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) { static const DWORD data[] = {0x00000000, 0xffffffff}; GLuint tex, fbo, buffer; - DWORD readback[16 * 1]; + uint32_t readback[16 * 1]; BOOL ret = FALSE;
/* Render a filtered texture and see what happens. This is intended to detect the lack of @@ -3887,7 +3888,7 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx const struct wined3d_gl_info *gl_info = ctx->gl_info; static const float offset = -63.0f / 128.0f; GLuint texture, fbo; - DWORD readback[4]; + uint32_t readback[4]; unsigned int i;
gl_info->gl_ops.gl.p_glGenTextures(1, &texture); @@ -3934,7 +3935,7 @@ bool wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx const struct wined3d_gl_info *gl_info = ctx->gl_info; unsigned int x, y, clear = 0, draw = 0; GLuint texture, fbo; - DWORD readback[8][8]; + uint32_t readback[8][8];
/* This is a very simple test to find out how GL handles polygon edges: * Draw a 1x1 quad exactly through 4 adjacent pixel centers in an 8x8 @@ -4028,7 +4029,7 @@ static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *c static const struct wined3d_color blue = {0.0f, 0.0f, 1.0f, 1.0f}; GLuint fbo, color, depth; unsigned int low = 0, high = 32, cur; - DWORD readback[256]; + uint32_t readback[256]; static const struct wined3d_vec3 geometry[] = { {-1.0f, -1.0f, -1.0f}, @@ -4864,7 +4865,7 @@ static void debug_append(struct debug_buffer *buffer, const char *str, const cha buffer->size -= size; }
-const char *wined3d_debug_resource_access(DWORD access) +const char *wined3d_debug_resource_access(uint32_t access) { struct debug_buffer buffer;
@@ -4881,7 +4882,7 @@ const char *wined3d_debug_resource_access(DWORD access) return wine_dbg_sprintf("%s", buffer.str); }
-const char *wined3d_debug_bind_flags(DWORD bind_flags) +const char *wined3d_debug_bind_flags(uint32_t bind_flags) { struct debug_buffer buffer;
@@ -5365,14 +5366,14 @@ const char *debug_shader_type(enum wined3d_shader_type type) } }
-const char *debug_d3dstate(DWORD state) +const char *debug_d3dstate(uint32_t state) { if (STATE_IS_RENDER(state)) return wine_dbg_sprintf("STATE_RENDER(%s)", debug_d3drenderstate(state - STATE_RENDER(0))); if (STATE_IS_TEXTURESTAGE(state)) { - DWORD texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - DWORD texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); + unsigned int texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + uint32_t texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); return wine_dbg_sprintf("STATE_TEXTURESTAGE(%#x, %s)", texture_stage, debug_d3dtexturestate(texture_state)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f291201fa31..f456d56db31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3910,7 +3910,7 @@ struct wined3d_state
struct wined3d_light_state light_state;
- DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; struct wined3d_color blend_factor; unsigned int sample_mask; @@ -4342,8 +4342,8 @@ static inline float wined3d_alpha_ref(const struct wined3d_state *state) return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; }
-const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; -const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; +const char *wined3d_debug_resource_access(uint32_t access) DECLSPEC_HIDDEN; +const char *wined3d_debug_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; @@ -5770,7 +5770,7 @@ const char *debug_d3dinput_classification(enum wined3d_input_classification clas const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(enum wined3d_sampler_state state) DECLSPEC_HIDDEN; -const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3dstate(uint32_t state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN;