ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Export wined3d_stateblock_init_contained_states(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-11-26 09:57:35 -06:00 committed by Alexandre Julliard
parent 4901386892
commit d1e3e61279
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
stateblock_init_contained_states(stateblock); wined3d_stateblock_init_contained_states(stateblock);
wined3d_stateblock_decref(device->recording); wined3d_stateblock_decref(device->recording);
device->recording = NULL; device->recording = NULL;

4
dlls/wined3d/stateblock.c
View File

@ -283,7 +283,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state
memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants);
} }
void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock)
{ {
const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info;
unsigned int i, j; unsigned int i, j;
@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,
break; break;
} }
stateblock_init_contained_states(stateblock); wined3d_stateblock_init_contained_states(stateblock);
wined3d_stateblock_capture(stateblock); wined3d_stateblock_capture(stateblock);
/* According to the tests, stream offset is not updated in the captured state if /* According to the tests, stream offset is not updated in the captured state if

1
dlls/wined3d/wined3d.spec
View File

@ -262,6 +262,7 @@
@ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_create(ptr long ptr)
@ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_decref(ptr)
@ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_incref(ptr)
@ cdecl wined3d_stateblock_init_contained_states(ptr)
@ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_reset(ptr)
@ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long)
@ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr)

2
dlls/wined3d/wined3d_private.h
View File

@ -3974,8 +3974,6 @@ struct wined3d_stateblock
unsigned int num_contained_sampler_states; unsigned int num_contained_sampler_states;
}; };
void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state,
const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN;
void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN;

1
include/wine/wined3d.h
View File

@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device,
enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock);
ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock);
ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock);
void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock);
void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index);
void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock,