Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
40179643
Commit
40179643
authored
Dec 01, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Dec 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Change wined3d_resource.usage field to uint32_t.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
parent
dec7da28
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
directx.c
dlls/wined3d/directx.c
+2
-2
resource.c
dlls/wined3d/resource.c
+3
-3
utils.c
dlls/wined3d/utils.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-2
wined3d.h
include/wine/wined3d.h
+1
-1
No files found.
dlls/wined3d/directx.c
View file @
40179643
...
...
@@ -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
"
,
...
...
dlls/wined3d/resource.c
View file @
40179643
...
...
@@ -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
,
u
nsigned
in
t
usage
,
enum
wined3d_multisample_type
multisample_type
,
unsigned
int
multisample_quality
,
u
int32_
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
)
...
...
dlls/wined3d/utils.c
View file @
40179643
...
...
@@ -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
;
...
...
dlls/wined3d/wined3d_private.h
View file @
40179643
...
...
@@ -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
;
...
...
include/wine/wined3d.h
View file @
40179643
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment