From: Eric Pouech eric.pouech@gmail.com
This will simplify changes when using long types. (and returned values are defined as int:s anyway).
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dcdee479e17..fff6841f4c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5787,7 +5787,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); }
-static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 7df79dcda74..5aa6c0697e6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1315,7 +1315,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = 6; }
-static DWORD atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e9ada251749..994200b737c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11547,7 +11547,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, caps->raster_caps = WINED3DPRASTERCAPS_FOGRANGE; }
-static DWORD glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) { if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; @@ -12062,7 +12062,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); }
-static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) { if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 18728e5422e..a0fdaa6a9ca 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -750,7 +750,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; }
-static DWORD nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index fe1cc03e9f4..7a7cb44c15d 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1118,7 +1118,7 @@ static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapt caps->ffp_generic_attributes = TRUE; }
-static uint32_t spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } @@ -1194,7 +1194,7 @@ static void spirv_fragment_pipe_vk_fp_get_caps(const struct wined3d_adapter *ada memset(caps, 0, sizeof(*caps)); }
-static uint32_t spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee3e083e812..97e1e6b10ab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5405,7 +5405,7 @@ static void vp_ffp_get_caps(const struct wined3d_adapter *adapter, struct wined3 caps->raster_caps |= WINED3DPRASTERCAPS_FOGRANGE; }
-static DWORD vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5463,7 +5463,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; }
-static DWORD ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5510,7 +5510,7 @@ static void vp_none_get_caps(const struct wined3d_adapter *adapter, struct wined memset(caps, 0, sizeof(*caps)); }
-static DWORD vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } @@ -5530,7 +5530,7 @@ static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragm memset(caps, 0, sizeof(*caps)); }
-static DWORD fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf82bebb972..bdf5783b0e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2833,7 +2833,7 @@ struct wined3d_fragment_pipe_ops { void (*fp_enable)(const struct wined3d_context *context, BOOL enable); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); - DWORD (*get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device, struct wined3d_context *context); BOOL (*allocate_context_data)(struct wined3d_context *context); @@ -2860,7 +2860,7 @@ struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_context *context, BOOL enable); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); - DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device, struct wined3d_context *context); const struct wined3d_state_entry_template *vp_states;