[PATCH v2 1/5] wined3d: Export wined3d_stateblock_init_contained_states().

Zebediah Figura z.figura12 at gmail.com
Tue Nov 26 09:57:35 CST 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/wined3d/device.c          | 2 +-
 dlls/wined3d/stateblock.c      | 4 ++--
 dlls/wined3d/wined3d.spec      | 1 +
 dlls/wined3d/wined3d_private.h | 2 --
 include/wine/wined3d.h         | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 87db701d157..5983281f932 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device)
         return WINED3DERR_INVALIDCALL;
     }
 
-    stateblock_init_contained_states(stateblock);
+    wined3d_stateblock_init_contained_states(stateblock);
 
     wined3d_stateblock_decref(device->recording);
     device->recording = NULL;
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 898a4bc93d4..dc714914ec3 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -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);
 }
 
-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;
     unsigned int i, j;
@@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,
             break;
     }
 
-    stateblock_init_contained_states(stateblock);
+    wined3d_stateblock_init_contained_states(stateblock);
     wined3d_stateblock_capture(stateblock);
 
     /* According to the tests, stream offset is not updated in the captured state if
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index ea04c85d385..29bcd759264 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -262,6 +262,7 @@
 @ cdecl wined3d_stateblock_create(ptr long ptr)
 @ cdecl wined3d_stateblock_decref(ptr)
 @ cdecl wined3d_stateblock_incref(ptr)
+@ cdecl wined3d_stateblock_init_contained_states(ptr)
 @ cdecl wined3d_stateblock_reset(ptr)
 @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long)
 @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f6d25aa6d88..8ebf377b114 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3974,8 +3974,6 @@ struct wined3d_stateblock
     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,
         const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN;
 void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index fac9eef5be2..37e012b979d 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device,
         enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock);
 ULONG __cdecl wined3d_stateblock_decref(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_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index);
 void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock,
-- 
2.23.0




More information about the wine-devel mailing list