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
a71526bb
Commit
a71526bb
authored
Nov 25, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Nov 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set flag types to uint32_t (external definitions).
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
parent
20d86f34
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
18 deletions
+18
-18
device.c
dlls/wined3d/device.c
+4
-4
directx.c
dlls/wined3d/directx.c
+2
-2
palette.c
dlls/wined3d/palette.c
+3
-3
query.c
dlls/wined3d/query.c
+2
-2
resource.c
dlls/wined3d/resource.c
+1
-1
swapchain.c
dlls/wined3d/swapchain.c
+2
-2
texture.c
dlls/wined3d/texture.c
+3
-3
wined3d_main.c
dlls/wined3d/wined3d_main.c
+1
-1
wined3d.h
include/wine/wined3d.h
+0
-0
No files found.
dlls/wined3d/device.c
View file @
a71526bb
...
...
@@ -3748,7 +3748,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
HRESULT
CDECL
wined3d_device_process_vertices
(
struct
wined3d_device
*
device
,
UINT
src_start_idx
,
UINT
dst_idx
,
UINT
vertex_count
,
struct
wined3d_buffer
*
dst_buffer
,
const
struct
wined3d_vertex_declaration
*
declaration
,
DWORD
flags
,
DWORD
dst_fvf
)
const
struct
wined3d_vertex_declaration
*
declaration
,
uint32_t
flags
,
DWORD
dst_fvf
)
{
struct
wined3d_state
*
state
=
device
->
cs
->
c
.
state
;
struct
wined3d_stream_info
stream_info
;
...
...
@@ -4337,7 +4337,7 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device)
}
HRESULT
CDECL
wined3d_device_clear
(
struct
wined3d_device
*
device
,
DWORD
rect_count
,
const
RECT
*
rects
,
DWORD
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
const
RECT
*
rects
,
uint32_t
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_fb_state
*
fb
=
&
device
->
cs
->
c
.
state
->
fb
;
...
...
@@ -5454,7 +5454,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
}
void
CDECL
wined3d_device_set_cursor_position
(
struct
wined3d_device
*
device
,
int
x_screen_space
,
int
y_screen_space
,
DWORD
flags
)
int
x_screen_space
,
int
y_screen_space
,
uint32_t
flags
)
{
TRACE
(
"device %p, x %d, y %d, flags %#x.
\n
"
,
device
,
x_screen_space
,
y_screen_space
,
flags
);
...
...
@@ -5892,7 +5892,7 @@ struct wined3d * CDECL wined3d_device_get_wined3d(const struct wined3d_device *d
}
void
CDECL
wined3d_device_set_gamma_ramp
(
const
struct
wined3d_device
*
device
,
UINT
swapchain_idx
,
DWORD
flags
,
const
struct
wined3d_gamma_ramp
*
ramp
)
UINT
swapchain_idx
,
uint32_t
flags
,
const
struct
wined3d_gamma_ramp
*
ramp
)
{
struct
wined3d_swapchain
*
swapchain
;
...
...
dlls/wined3d/directx.c
View file @
a71526bb
...
...
@@ -1745,7 +1745,7 @@ HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wine
}
HRESULT
CDECL
wined3d_adapter_get_identifier
(
const
struct
wined3d_adapter
*
adapter
,
DWORD
flags
,
struct
wined3d_adapter_identifier
*
identifier
)
uint32_t
flags
,
struct
wined3d_adapter_identifier
*
identifier
)
{
TRACE
(
"adapter %p, flags %#x, identifier %p.
\n
"
,
adapter
,
flags
,
identifier
);
...
...
@@ -2707,7 +2707,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter,
}
HRESULT
CDECL
wined3d_device_create
(
struct
wined3d
*
wined3d
,
struct
wined3d_adapter
*
adapter
,
enum
wined3d_device_type
device_type
,
HWND
focus_window
,
DWORD
flags
,
BYTE
surface_alignment
,
enum
wined3d_device_type
device_type
,
HWND
focus_window
,
uint32_t
flags
,
BYTE
surface_alignment
,
const
enum
wined3d_feature_level
*
feature_levels
,
unsigned
int
feature_level_count
,
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_device
**
device
)
{
...
...
dlls/wined3d/palette.c
View file @
a71526bb
...
...
@@ -56,7 +56,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette)
}
HRESULT
CDECL
wined3d_palette_get_entries
(
const
struct
wined3d_palette
*
palette
,
DWORD
flags
,
DWORD
start
,
DWORD
count
,
PALETTEENTRY
*
entries
)
uint32_t
flags
,
DWORD
start
,
DWORD
count
,
PALETTEENTRY
*
entries
)
{
unsigned
int
i
;
TRACE
(
"palette %p, flags %#x, start %u, count %u, entries %p.
\n
"
,
...
...
@@ -95,7 +95,7 @@ void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HD
}
HRESULT
CDECL
wined3d_palette_set_entries
(
struct
wined3d_palette
*
palette
,
DWORD
flags
,
DWORD
start
,
DWORD
count
,
const
PALETTEENTRY
*
entries
)
uint32_t
flags
,
DWORD
start
,
DWORD
count
,
const
PALETTEENTRY
*
entries
)
{
unsigned
int
i
;
...
...
@@ -158,7 +158,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine
return
WINED3D_OK
;
}
HRESULT
CDECL
wined3d_palette_create
(
struct
wined3d_device
*
device
,
DWORD
flags
,
HRESULT
CDECL
wined3d_palette_create
(
struct
wined3d_device
*
device
,
uint32_t
flags
,
unsigned
int
entry_count
,
const
PALETTEENTRY
*
entries
,
struct
wined3d_palette
**
palette
)
{
struct
wined3d_palette
*
object
;
...
...
dlls/wined3d/query.c
View file @
a71526bb
...
...
@@ -448,7 +448,7 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query)
}
HRESULT
CDECL
wined3d_query_get_data
(
struct
wined3d_query
*
query
,
void
*
data
,
UINT
data_size
,
DWORD
flags
)
void
*
data
,
UINT
data_size
,
uint32_t
flags
)
{
TRACE
(
"query %p, data %p, data_size %u, flags %#x.
\n
"
,
query
,
data
,
data_size
,
flags
);
...
...
@@ -493,7 +493,7 @@ UINT CDECL wined3d_query_get_data_size(const struct wined3d_query *query)
return
query
->
data_size
;
}
HRESULT
CDECL
wined3d_query_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
HRESULT
CDECL
wined3d_query_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
TRACE
(
"query %p, flags %#x.
\n
"
,
query
,
flags
);
...
...
dlls/wined3d/resource.c
View file @
a71526bb
...
...
@@ -313,7 +313,7 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st
}
HRESULT
CDECL
wined3d_resource_map
(
struct
wined3d_resource
*
resource
,
unsigned
int
sub_resource_idx
,
struct
wined3d_map_desc
*
map_desc
,
const
struct
wined3d_box
*
box
,
DWORD
flags
)
struct
wined3d_map_desc
*
map_desc
,
const
struct
wined3d_box
*
box
,
uint32_t
flags
)
{
TRACE
(
"resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.
\n
"
,
resource
,
sub_resource_idx
,
map_desc
,
debug_box
(
box
),
flags
);
...
...
dlls/wined3d/swapchain.c
View file @
a71526bb
...
...
@@ -206,7 +206,7 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN
HRESULT
CDECL
wined3d_swapchain_present
(
struct
wined3d_swapchain
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
HWND
dst_window_override
,
unsigned
int
swap_interval
,
DWORD
flags
)
unsigned
int
swap_interval
,
uint32_t
flags
)
{
RECT
s
,
d
;
...
...
@@ -359,7 +359,7 @@ void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain,
}
HRESULT
CDECL
wined3d_swapchain_set_gamma_ramp
(
const
struct
wined3d_swapchain
*
swapchain
,
DWORD
flags
,
const
struct
wined3d_gamma_ramp
*
ramp
)
uint32_t
flags
,
const
struct
wined3d_gamma_ramp
*
ramp
)
{
struct
wined3d_output
*
output
;
...
...
dlls/wined3d/texture.c
View file @
a71526bb
...
...
@@ -1786,7 +1786,7 @@ DWORD CDECL wined3d_texture_get_level_count(const struct wined3d_texture *textur
}
HRESULT
CDECL
wined3d_texture_set_color_key
(
struct
wined3d_texture
*
texture
,
DWORD
flags
,
const
struct
wined3d_color_key
*
color_key
)
uint32_t
flags
,
const
struct
wined3d_color_key
*
color_key
)
{
struct
wined3d_device
*
device
=
texture
->
resource
.
device
;
static
const
DWORD
all_flags
=
WINED3D_CKEY_DST_BLT
|
WINED3D_CKEY_DST_OVERLAY
...
...
@@ -4226,7 +4226,7 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu
HRESULT
CDECL
wined3d_texture_update_overlay
(
struct
wined3d_texture
*
texture
,
unsigned
int
sub_resource_idx
,
const
RECT
*
src_rect
,
struct
wined3d_texture
*
dst_texture
,
unsigned
int
dst_sub_resource_idx
,
const
RECT
*
dst_rect
,
DWORD
flags
)
const
RECT
*
dst_rect
,
uint32_t
flags
)
{
struct
wined3d_overlay_info
*
overlay
;
unsigned
int
level
,
dst_level
;
...
...
@@ -4417,7 +4417,7 @@ HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wi
}
HRESULT
CDECL
wined3d_texture_create
(
struct
wined3d_device
*
device
,
const
struct
wined3d_resource_desc
*
desc
,
UINT
layer_count
,
UINT
level_count
,
DWORD
flags
,
const
struct
wined3d_sub_resource_data
*
data
,
UINT
layer_count
,
UINT
level_count
,
uint32_t
flags
,
const
struct
wined3d_sub_resource_data
*
data
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
struct
wined3d_texture
**
texture
)
{
unsigned
int
sub_count
=
level_count
*
layer_count
;
...
...
dlls/wined3d/wined3d_main.c
View file @
a71526bb
...
...
@@ -129,7 +129,7 @@ struct wined3d_settings wined3d_settings =
.
shader_backend
=
WINED3D_SHADER_BACKEND_AUTO
,
};
struct
wined3d
*
CDECL
wined3d_create
(
DWORD
flags
)
struct
wined3d
*
CDECL
wined3d_create
(
uint32_t
flags
)
{
struct
wined3d
*
object
;
HRESULT
hr
;
...
...
include/wine/wined3d.h
View file @
a71526bb
This diff is collapsed.
Click to expand it.
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