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

wined3d: Change wined3d_resource.usage field to uint32_t.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-12-01 00:18:51 +01:00 committed by Alexandre Julliard
parent dec7da2860
commit 40179643c1
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/wined3d/directx.c
View file

@ -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",

6
dlls/wined3d/resource.c
View file

@ -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)

2
dlls/wined3d/utils.c
View file

@ -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;

4
dlls/wined3d/wined3d_private.h
View file

@ -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;

2
include/wine/wined3d.h
View file

@ -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,