system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Reduce usage of long integral types in vertexdeclaration.c.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-12-06 14:12:13 +01:00 committed by Alexandre Julliard
parent d920aa81ad
commit 286261f69e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/wined3d/vertexdeclaration.c
View file

@ -323,7 +323,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state,
} }
static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *adapter, static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *adapter,
DWORD fvf, struct wined3d_vertex_element **elements) uint32_t fvf, struct wined3d_vertex_element **elements)
{ {
BOOL has_pos = !!(fvf & WINED3DFVF_POSITION_MASK); BOOL has_pos = !!(fvf & WINED3DFVF_POSITION_MASK);
BOOL has_blend = (fvf & WINED3DFVF_XYZB5) > WINED3DFVF_XYZRHW; BOOL has_blend = (fvf & WINED3DFVF_XYZB5) > WINED3DFVF_XYZRHW;
@ -336,12 +336,12 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *ada
BOOL has_diffuse = !!(fvf & WINED3DFVF_DIFFUSE); BOOL has_diffuse = !!(fvf & WINED3DFVF_DIFFUSE);
BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR); BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR);
DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; unsigned int num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT;
DWORD texcoords = (fvf & 0xffff0000) >> 16; unsigned int texcoords = (fvf & 0xffff0000) >> 16;
struct wined3d_fvf_convert_state state; struct wined3d_fvf_convert_state state;
unsigned int size; unsigned int size;
unsigned int idx; unsigned int idx;
DWORD num_blends = 1 + (((fvf & WINED3DFVF_XYZB5) - WINED3DFVF_XYZB1) >> 1); unsigned int num_blends = 1 + (((fvf & WINED3DFVF_XYZB5) - WINED3DFVF_XYZB1) >> 1);
if (has_blend_idx) num_blends--; if (has_blend_idx) num_blends--;
/* Compute declaration size */ /* Compute declaration size */
@ -434,7 +434,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *ada
} }
HRESULT CDECL wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device, HRESULT CDECL wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device,
DWORD fvf, void *parent, const struct wined3d_parent_ops *parent_ops, uint32_t fvf, void *parent, const struct wined3d_parent_ops *parent_ops,
struct wined3d_vertex_declaration **declaration) struct wined3d_vertex_declaration **declaration)
{ {
struct wined3d_vertex_element *elements; struct wined3d_vertex_element *elements;

2
include/wine/wined3d.h
View file

@ -2885,7 +2885,7 @@ HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device,
const struct wined3d_vertex_element *elements, UINT element_count, void *parent, const struct wined3d_vertex_element *elements, UINT element_count, void *parent,
const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration); const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration);
HRESULT __cdecl wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device, HRESULT __cdecl wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device,
DWORD fvf, void *parent, const struct wined3d_parent_ops *parent_ops, uint32_t fvf, void *parent, const struct wined3d_parent_ops *parent_ops,
struct wined3d_vertex_declaration **declaration); struct wined3d_vertex_declaration **declaration);
ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration);
void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration);