Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
718118f3
Commit
718118f3
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 (internal definitions).
(no longer using long types) Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
parent
a71526bb
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
56 additions
and
56 deletions
+56
-56
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
context_gl.c
dlls/wined3d/context_gl.c
+1
-1
cs.c
dlls/wined3d/cs.c
+7
-7
device.c
dlls/wined3d/device.c
+1
-1
directx.c
dlls/wined3d/directx.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-2
palette.c
dlls/wined3d/palette.c
+1
-1
query.c
dlls/wined3d/query.c
+13
-13
shader.c
dlls/wined3d/shader.c
+1
-1
stateblock.c
dlls/wined3d/stateblock.c
+1
-1
surface.c
dlls/wined3d/surface.c
+4
-4
swapchain.c
dlls/wined3d/swapchain.c
+2
-2
texture.c
dlls/wined3d/texture.c
+5
-5
wined3d_private.h
dlls/wined3d/wined3d_private.h
+16
-16
No files found.
dlls/wined3d/arb_program_shader.c
View file @
718118f3
...
...
@@ -7939,7 +7939,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
static
void
arbfp_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_blitter
*
next
;
...
...
dlls/wined3d/context_gl.c
View file @
718118f3
...
...
@@ -152,7 +152,7 @@ static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl
}
static
void
context_attach_depth_stencil_rb
(
const
struct
wined3d_gl_info
*
gl_info
,
GLenum
fbo_target
,
DWORD
flags
,
GLuint
rb
)
GLenum
fbo_target
,
uint32_t
flags
,
GLuint
rb
)
{
if
(
flags
&
WINED3D_FBO_ENTRY_FLAG_DEPTH
)
{
...
...
dlls/wined3d/cs.c
View file @
718118f3
...
...
@@ -157,13 +157,13 @@ struct wined3d_cs_present
RECT
src_rect
;
RECT
dst_rect
;
unsigned
int
swap_interval
;
DWORD
flags
;
uint32_t
flags
;
};
struct
wined3d_cs_clear
{
enum
wined3d_cs_op
opcode
;
DWORD
flags
;
uint32_t
flags
;
unsigned
int
rt_count
;
struct
wined3d_fb_state
fb
;
RECT
draw_rect
;
...
...
@@ -428,7 +428,7 @@ struct wined3d_cs_query_issue
{
enum
wined3d_cs_op
opcode
;
struct
wined3d_query
*
query
;
DWORD
flags
;
uint32_t
flags
;
};
struct
wined3d_cs_preload_resource
...
...
@@ -450,7 +450,7 @@ struct wined3d_cs_map
unsigned
int
sub_resource_idx
;
void
**
map_ptr
;
const
struct
wined3d_box
*
box
;
DWORD
flags
;
uint32_t
flags
;
HRESULT
*
hr
;
};
...
...
@@ -479,7 +479,7 @@ struct wined3d_cs_blt_sub_resource
struct
wined3d_resource
*
src_resource
;
unsigned
int
src_sub_resource_idx
;
struct
wined3d_box
src_box
;
DWORD
flags
;
uint32_t
flags
;
struct
wined3d_blt_fx
fx
;
enum
wined3d_texture_filter_type
filter
;
};
...
...
@@ -719,7 +719,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)
void
wined3d_cs_emit_present
(
struct
wined3d_cs
*
cs
,
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
)
{
struct
wined3d_cs_present
*
op
;
unsigned
int
i
;
...
...
@@ -763,7 +763,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data)
}
void
wined3d_cs_emit_clear
(
struct
wined3d_cs
*
cs
,
DWORD
rect_count
,
const
RECT
*
rects
,
DWORD
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
uint32_t
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
{
const
struct
wined3d_state
*
state
=
cs
->
c
.
state
;
const
struct
wined3d_viewport
*
vp
=
&
state
->
viewports
[
0
];
...
...
dlls/wined3d/device.c
View file @
718118f3
...
...
@@ -3427,7 +3427,7 @@ static void update_fog_factor(float *fog_factor, struct lights_settings *ls)
/* Context activation is done by the caller. */
#define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size)
static
HRESULT
process_vertices_strided
(
const
struct
wined3d_device
*
device
,
DWORD
dwDestIndex
,
DWORD
dwCount
,
const
struct
wined3d_stream_info
*
stream_info
,
struct
wined3d_buffer
*
dest
,
DWORD
flags
,
DWORD
dst_fvf
)
const
struct
wined3d_stream_info
*
stream_info
,
struct
wined3d_buffer
*
dest
,
uint32_t
flags
,
DWORD
dst_fvf
)
{
enum
wined3d_material_color_source
diffuse_source
,
specular_source
,
ambient_source
,
emissive_source
;
const
struct
wined3d_color
*
material_specular_state_colour
;
...
...
dlls/wined3d/directx.c
View file @
718118f3
...
...
@@ -3523,7 +3523,7 @@ const struct wined3d_parent_ops wined3d_null_parent_ops =
wined3d_null_wined3d_object_destroyed
,
};
HRESULT
wined3d_init
(
struct
wined3d
*
wined3d
,
DWORD
flags
)
HRESULT
wined3d_init
(
struct
wined3d
*
wined3d
,
uint32_t
flags
)
{
wined3d
->
ref
=
1
;
wined3d
->
flags
=
flags
;
...
...
dlls/wined3d/glsl_shader.c
View file @
718118f3
...
...
@@ -3401,7 +3401,7 @@ static void shader_glsl_get_coord_size(enum wined3d_shader_resource_type resourc
}
static
void
shader_glsl_get_sample_function
(
const
struct
wined3d_shader_context
*
ctx
,
DWORD
resource_idx
,
DWORD
sampler_idx
,
DWORD
flags
,
struct
glsl_sample_function
*
sample_function
)
DWORD
resource_idx
,
DWORD
sampler_idx
,
uint32_t
flags
,
struct
glsl_sample_function
*
sample_function
)
{
enum
wined3d_shader_resource_type
resource_type
;
struct
shader_glsl_ctx_priv
*
priv
=
ctx
->
backend_data
;
...
...
@@ -13271,7 +13271,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
static
void
glsl_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_blitter
*
next
;
...
...
dlls/wined3d/palette.c
View file @
718118f3
...
...
@@ -140,7 +140,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette,
}
static
HRESULT
wined3d_palette_init
(
struct
wined3d_palette
*
palette
,
struct
wined3d_device
*
device
,
DWORD
flags
,
unsigned
int
entry_count
,
const
PALETTEENTRY
*
entries
)
uint32_t
flags
,
unsigned
int
entry_count
,
const
PALETTEENTRY
*
entries
)
{
HRESULT
hr
;
...
...
dlls/wined3d/query.c
View file @
718118f3
...
...
@@ -174,7 +174,7 @@ static struct wined3d_pipeline_statistics_query *wined3d_pipeline_statistics_que
}
enum
wined3d_fence_result
wined3d_fence_test
(
const
struct
wined3d_fence
*
fence
,
struct
wined3d_device
*
device
,
DWORD
flags
)
struct
wined3d_device
*
device
,
uint32_t
flags
)
{
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context_gl
*
context_gl
;
...
...
@@ -502,7 +502,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, uint32_t flags)
return
WINED3D_OK
;
}
static
BOOL
wined3d_occlusion_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_occlusion_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_occlusion_query
*
oq
=
wined3d_occlusion_query_from_query
(
query
);
const
struct
wined3d_gl_info
*
gl_info
;
...
...
@@ -534,7 +534,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD
return
available
;
}
static
BOOL
wined3d_event_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_event_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_event_query
*
event_query
=
wined3d_event_query_from_query
(
query
);
enum
wined3d_fence_result
ret
;
...
...
@@ -579,7 +579,7 @@ enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query
return
query
->
type
;
}
static
BOOL
wined3d_event_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_event_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
TRACE
(
"query %p, flags %#x.
\n
"
,
query
,
flags
);
...
...
@@ -599,7 +599,7 @@ static BOOL wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD fla
return
FALSE
;
}
static
BOOL
wined3d_occlusion_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_occlusion_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_occlusion_query
*
oq
=
wined3d_occlusion_query_from_query
(
query
);
struct
wined3d_device
*
device
=
query
->
device
;
...
...
@@ -672,7 +672,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD
return
poll
;
}
static
BOOL
wined3d_timestamp_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_timestamp_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_timestamp_query
*
tq
=
wined3d_timestamp_query_from_query
(
query
);
const
struct
wined3d_gl_info
*
gl_info
;
...
...
@@ -707,7 +707,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD
return
available
;
}
static
BOOL
wined3d_timestamp_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_timestamp_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_timestamp_query
*
tq
=
wined3d_timestamp_query_from_query
(
query
);
const
struct
wined3d_gl_info
*
gl_info
;
...
...
@@ -736,21 +736,21 @@ static BOOL wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD
return
FALSE
;
}
static
BOOL
wined3d_timestamp_disjoint_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_timestamp_disjoint_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
TRACE
(
"query %p, flags %#x.
\n
"
,
query
,
flags
);
return
TRUE
;
}
static
BOOL
wined3d_timestamp_disjoint_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_timestamp_disjoint_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
TRACE
(
"query %p, flags %#x.
\n
"
,
query
,
flags
);
return
FALSE
;
}
static
BOOL
wined3d_so_statistics_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_so_statistics_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_so_statistics_query
*
pq
=
wined3d_so_statistics_query_from_query
(
query
);
GLuint
written_available
,
generated_available
;
...
...
@@ -806,7 +806,7 @@ static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *
checkGLcall
(
"end query"
);
}
static
BOOL
wined3d_so_statistics_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_so_statistics_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_so_statistics_query
*
pq
=
wined3d_so_statistics_query_from_query
(
query
);
struct
wined3d_device
*
device
=
query
->
device
;
...
...
@@ -882,7 +882,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D
return
poll
;
}
static
BOOL
wined3d_pipeline_query_ops_poll
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_pipeline_query_ops_poll
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_pipeline_statistics_query
*
pq
=
wined3d_pipeline_statistics_query_from_query
(
query
);
const
struct
wined3d_gl_info
*
gl_info
;
...
...
@@ -946,7 +946,7 @@ static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statis
checkGLcall
(
"end query"
);
}
static
BOOL
wined3d_pipeline_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
static
BOOL
wined3d_pipeline_query_ops_issue
(
struct
wined3d_query
*
query
,
uint32_t
flags
)
{
struct
wined3d_pipeline_statistics_query
*
pq
=
wined3d_pipeline_statistics_query_from_query
(
query
);
struct
wined3d_device
*
device
=
query
->
device
;
...
...
dlls/wined3d/shader.c
View file @
718118f3
...
...
@@ -1933,7 +1933,7 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s
shader_addline
(
buffer
,
"_unknown_flags(%#x)"
,
sync_flags
);
}
static
void
shader_dump_precise_flags
(
struct
wined3d_string_buffer
*
buffer
,
DWORD
flags
)
static
void
shader_dump_precise_flags
(
struct
wined3d_string_buffer
*
buffer
,
uint32_t
flags
)
{
if
(
!
(
flags
&
WINED3DSI_PRECISE_XYZW
))
return
;
...
...
dlls/wined3d/stateblock.c
View file @
718118f3
...
...
@@ -1979,7 +1979,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state
}
void
wined3d_stateblock_state_init
(
struct
wined3d_stateblock_state
*
state
,
const
struct
wined3d_device
*
device
,
DWORD
flags
)
const
struct
wined3d_device
*
device
,
uint32_t
flags
)
{
unsigned
int
i
;
...
...
dlls/wined3d/surface.c
View file @
718118f3
...
...
@@ -541,7 +541,7 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_
static
HRESULT
surface_cpu_blt_compressed
(
const
BYTE
*
src_data
,
BYTE
*
dst_data
,
UINT
src_pitch
,
UINT
dst_pitch
,
UINT
update_w
,
UINT
update_h
,
const
struct
wined3d_format
*
format
,
DWORD
flags
,
const
struct
wined3d_blt_fx
*
fx
)
const
struct
wined3d_format
*
format
,
uint32_t
flags
,
const
struct
wined3d_blt_fx
*
fx
)
{
UINT
row_block_count
;
const
BYTE
*
src_row
;
...
...
@@ -644,7 +644,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,
static
HRESULT
surface_cpu_blt
(
struct
wined3d_texture
*
dst_texture
,
unsigned
int
dst_sub_resource_idx
,
const
struct
wined3d_box
*
dst_box
,
struct
wined3d_texture
*
src_texture
,
unsigned
int
src_sub_resource_idx
,
const
struct
wined3d_box
*
src_box
,
DWORD
flags
,
const
struct
wined3d_blt_fx
*
fx
,
const
struct
wined3d_box
*
src_box
,
uint32_t
flags
,
const
struct
wined3d_blt_fx
*
fx
,
enum
wined3d_texture_filter_type
filter
)
{
unsigned
int
bpp
,
src_height
,
src_width
,
dst_height
,
dst_width
,
row_byte_count
;
...
...
@@ -1241,7 +1241,7 @@ static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_
static
void
cpu_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_color
c
=
{
depth
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
};
struct
wined3d_box
box
,
box_clip
,
box_view
;
...
...
@@ -1385,7 +1385,7 @@ static bool sub_resource_is_on_cpu(const struct wined3d_texture *texture, unsign
HRESULT
texture2d_blt
(
struct
wined3d_texture
*
dst_texture
,
unsigned
int
dst_sub_resource_idx
,
const
struct
wined3d_box
*
dst_box
,
struct
wined3d_texture
*
src_texture
,
unsigned
int
src_sub_resource_idx
,
const
struct
wined3d_box
*
src_box
,
DWORD
flags
,
const
struct
wined3d_blt_fx
*
fx
,
const
struct
wined3d_box
*
src_box
,
uint32_t
flags
,
const
struct
wined3d_blt_fx
*
fx
,
enum
wined3d_texture_filter_type
filter
)
{
struct
wined3d_texture_sub_resource
*
src_sub_resource
,
*
dst_sub_resource
;
...
...
dlls/wined3d/swapchain.c
View file @
718118f3
...
...
@@ -589,7 +589,7 @@ static bool swapchain_present_is_partial_copy(struct wined3d_swapchain *swapchai
}
static
void
swapchain_gl_present
(
struct
wined3d_swapchain
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
DWORD
flags
)
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
uint32_t
flags
)
{
struct
wined3d_swapchain_gl
*
swapchain_gl
=
wined3d_swapchain_gl
(
swapchain
);
struct
wined3d_texture
*
back_buffer
=
swapchain
->
back_buffers
[
0
];
...
...
@@ -1316,7 +1316,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai
}
static
void
swapchain_gdi_present
(
struct
wined3d_swapchain
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
DWORD
flags
)
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
uint32_t
flags
)
{
struct
wined3d_dc_info
*
front
,
*
back
;
HBITMAP
bitmap
;
...
...
dlls/wined3d/texture.c
View file @
718118f3
...
...
@@ -3834,7 +3834,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
};
static
HRESULT
wined3d_texture_init
(
struct
wined3d_texture
*
texture
,
const
struct
wined3d_resource_desc
*
desc
,
unsigned
int
layer_count
,
unsigned
int
level_count
,
DWORD
flags
,
struct
wined3d_device
*
device
,
unsigned
int
layer_count
,
unsigned
int
level_count
,
uint32_t
flags
,
struct
wined3d_device
*
device
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
void
*
sub_resources
,
const
struct
wined3d_texture_ops
*
texture_ops
)
{
...
...
@@ -6068,7 +6068,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view)
static
void
ffp_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_rendertarget_view
*
view
,
*
previous
=
NULL
;
bool
have_identical_size
=
TRUE
;
...
...
@@ -6345,7 +6345,7 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_
static
void
fbo_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_blitter
*
next
;
...
...
@@ -6458,7 +6458,7 @@ static void raw_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_
static
void
raw_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_blitter
*
next
;
...
...
@@ -6826,7 +6826,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk
static
void
vk_blitter_clear
(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
)
{
struct
wined3d_device_vk
*
device_vk
=
wined3d_device_vk
(
device
);
struct
wined3d_rendertarget_view
*
view
,
*
previous
=
NULL
;
...
...
dlls/wined3d/wined3d_private.h
View file @
718118f3
...
...
@@ -1378,7 +1378,7 @@ struct wined3d_shader_instruction
{
const
struct
wined3d_shader_context
*
ctx
;
enum
WINED3D_SHADER_INSTRUCTION_HANDLER
handler_idx
;
DWORD
flags
;
uint32_t
flags
;
unsigned
int
dst_count
;
unsigned
int
src_count
;
const
struct
wined3d_shader_dst_param
*
dst
;
...
...
@@ -2020,7 +2020,7 @@ void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *dev
enum
wined3d_fence_result
wined3d_fence_wait
(
const
struct
wined3d_fence
*
fence
,
struct
wined3d_device
*
device
)
DECLSPEC_HIDDEN
;
enum
wined3d_fence_result
wined3d_fence_test
(
const
struct
wined3d_fence
*
fence
,
struct
wined3d_device
*
device
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
struct
wined3d_device
*
device
,
uint32_t
flags
)
DECLSPEC_HIDDEN
;
/* Direct3D terminology with little modifications. We do not have an issued
* state because only the driver knows about it, but we have a created state
...
...
@@ -2034,8 +2034,8 @@ enum wined3d_query_state
struct
wined3d_query_ops
{
BOOL
(
*
query_poll
)(
struct
wined3d_query
*
query
,
DWORD
flags
);
BOOL
(
*
query_issue
)(
struct
wined3d_query
*
query
,
DWORD
flags
);
BOOL
(
*
query_poll
)(
struct
wined3d_query
*
query
,
uint32_t
flags
);
BOOL
(
*
query_issue
)(
struct
wined3d_query
*
query
,
uint32_t
flags
);
void
(
*
query_destroy
)(
struct
wined3d_query
*
query
);
};
...
...
@@ -2909,7 +2909,7 @@ struct wined3d_blitter_ops
void
(
*
blitter_destroy
)(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_context
*
context
);
void
(
*
blitter_clear
)(
struct
wined3d_blitter
*
blitter
,
struct
wined3d_device
*
device
,
unsigned
int
rt_count
,
const
struct
wined3d_fb_state
*
fb
,
unsigned
int
rect_count
,
const
RECT
*
clear_rects
,
const
RECT
*
draw_rect
,
DWORD
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
);
const
RECT
*
draw_rect
,
uint32_t
flags
,
const
struct
wined3d_color
*
colour
,
float
depth
,
DWORD
stencil
);
DWORD
(
*
blitter_blit
)(
struct
wined3d_blitter
*
blitter
,
enum
wined3d_blit_op
op
,
struct
wined3d_context
*
context
,
struct
wined3d_texture
*
src_texture
,
unsigned
int
src_sub_resource_idx
,
DWORD
src_location
,
const
RECT
*
src_rect
,
struct
wined3d_texture
*
dst_texture
,
unsigned
int
dst_sub_resource_idx
,
...
...
@@ -3796,7 +3796,7 @@ struct wined3d
};
BOOL
wined3d_filter_messages
(
HWND
window
,
BOOL
filter
)
DECLSPEC_HIDDEN
;
HRESULT
wined3d_init
(
struct
wined3d
*
wined3d
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
HRESULT
wined3d_init
(
struct
wined3d
*
wined3d
,
uint32_t
flags
)
DECLSPEC_HIDDEN
;
void
wined3d_unregister_window
(
HWND
window
)
DECLSPEC_HIDDEN
;
BOOL
wined3d_get_app_name
(
char
*
app_name
,
unsigned
int
app_name_size
)
DECLSPEC_HIDDEN
;
...
...
@@ -4559,7 +4559,7 @@ struct wined3d_texture
float
pow2_matrix
[
16
];
UINT
lod
;
DWORD
sampler
;
DWORD
flags
;
uint32_t
flags
;
DWORD
update_map_binding
;
unsigned
int
row_pitch
;
...
...
@@ -4568,7 +4568,7 @@ struct wined3d_texture
/* May only be accessed from the command stream worker thread. */
struct
wined3d_texture_async
{
DWORD
flags
;
uint32_t
flags
;
/* Color keys for DDraw */
struct
wined3d_color_key
dst_blt_color_key
;
...
...
@@ -4698,7 +4698,7 @@ static inline bool wined3d_texture_is_full_rect(const struct wined3d_texture *te
HRESULT
texture2d_blt
(
struct
wined3d_texture
*
dst_texture
,
unsigned
int
dst_sub_resource_idx
,
const
struct
wined3d_box
*
dst_box
,
struct
wined3d_texture
*
src_texture
,
unsigned
int
src_sub_resource_idx
,
const
struct
wined3d_box
*
src_box
,
DWORD
flags
,
unsigned
int
src_sub_resource_idx
,
const
struct
wined3d_box
*
src_box
,
uint32_t
flags
,
const
struct
wined3d_blt_fx
*
blt_fx
,
enum
wined3d_texture_filter_type
filter
)
DECLSPEC_HIDDEN
;
void
texture2d_get_blt_info
(
const
struct
wined3d_texture_gl
*
texture_gl
,
unsigned
int
sub_resource_idx
,
const
RECT
*
rect
,
struct
wined3d_blt_info
*
info
)
DECLSPEC_HIDDEN
;
...
...
@@ -4870,7 +4870,7 @@ struct wined3d_fbo_resource
struct
fbo_entry
{
struct
list
entry
;
DWORD
flags
;
uint32_t
flags
;
DWORD
rt_mask
;
GLuint
id
;
struct
wined3d_fbo_entry_key
...
...
@@ -5010,7 +5010,7 @@ struct wined3d_stateblock
};
void
wined3d_stateblock_state_init
(
struct
wined3d_stateblock_state
*
state
,
const
struct
wined3d_device
*
device
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
const
struct
wined3d_device
*
device
,
uint32_t
flags
)
DECLSPEC_HIDDEN
;
void
wined3d_stateblock_state_cleanup
(
struct
wined3d_stateblock_state
*
state
)
DECLSPEC_HIDDEN
;
void
wined3d_light_state_enable_light
(
struct
wined3d_light_state
*
state
,
const
struct
wined3d_d3d_info
*
d3d_info
,
...
...
@@ -5116,12 +5116,12 @@ void wined3d_cs_destroy_object(struct wined3d_cs *cs,
void
wined3d_cs_emit_add_dirty_texture_region
(
struct
wined3d_cs
*
cs
,
struct
wined3d_texture
*
texture
,
unsigned
int
layer
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_clear
(
struct
wined3d_cs
*
cs
,
DWORD
rect_count
,
const
RECT
*
rects
,
DWORD
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
DECLSPEC_HIDDEN
;
uint32_t
flags
,
const
struct
wined3d_color
*
color
,
float
depth
,
DWORD
stencil
)
DECLSPEC_HIDDEN
;
void
wined3d_device_context_emit_clear_uav
(
struct
wined3d_device_context
*
context
,
struct
wined3d_unordered_access_view
*
view
,
const
struct
wined3d_uvec4
*
clear_value
,
bool
fp
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_preload_resource
(
struct
wined3d_cs
*
cs
,
struct
wined3d_resource
*
resource
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_present
(
struct
wined3d_cs
*
cs
,
struct
wined3d_swapchain
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
HWND
dst_window_override
,
unsigned
int
swap_interval
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
const
RECT
*
dst_rect
,
HWND
dst_window_override
,
unsigned
int
swap_interval
,
uint32_t
flags
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_color_key
(
struct
wined3d_cs
*
cs
,
struct
wined3d_texture
*
texture
,
WORD
flags
,
const
struct
wined3d_color_key
*
color_key
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_render_state
(
struct
wined3d_cs
*
cs
,
...
...
@@ -5302,7 +5302,7 @@ struct wined3d_buffer
const
struct
wined3d_buffer_ops
*
buffer_ops
;
unsigned
int
structure_byte_stride
;
DWORD
flags
;
uint32_t
flags
;
DWORD
locations
;
void
*
map_ptr
;
struct
wined3d_bo
*
buffer_object
;
...
...
@@ -5661,7 +5661,7 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state
struct
wined3d_swapchain_ops
{
void
(
*
swapchain_present
)(
struct
wined3d_swapchain
*
swapchain
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
DWORD
flags
);
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
,
unsigned
int
swap_interval
,
uint32_t
flags
);
void
(
*
swapchain_frontbuffer_updated
)(
struct
wined3d_swapchain
*
swapchain
);
};
...
...
@@ -6162,7 +6162,7 @@ struct wined3d_palette
unsigned
int
size
;
RGBQUAD
colors
[
256
];
DWORD
flags
;
uint32_t
flags
;
};
/* DirectDraw utility functions */
...
...
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