Henri Verbeet : vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob().

Alexandre Julliard julliard at winehq.org
Fri Feb 25 14:14:52 CST 2022


Module: vkd3d
Branch: master
Commit: c07e6536a9b360e6b05ec40902a31b8e52d73500
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=c07e6536a9b360e6b05ec40902a31b8e52d73500

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Feb 25 19:36:38 2022 +0100

vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob().

ID3DBlob is a typedef for ID3D10Blob, so this isn't all that consequential,
but we're using ID3DBlob for the other vkd3d-utils exports.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/vkd3d_d3dcompiler.h         | 2 +-
 include/vkd3d_utils.h               | 2 +-
 libs/vkd3d-utils/vkd3d_utils_main.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h
index c70a7d7..c934835 100644
--- a/include/vkd3d_d3dcompiler.h
+++ b/include/vkd3d_d3dcompiler.h
@@ -66,7 +66,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
         const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags,
         const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
         ID3DBlob **error_messages);
-HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob);
+HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob);
 HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros,
         ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages);
 
diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h
index a81f229..5652478 100644
--- a/include/vkd3d_utils.h
+++ b/include/vkd3d_utils.h
@@ -70,7 +70,7 @@ VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, c
         const char *target, UINT flags, UINT effect_flags, UINT secondary_flags,
         const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
         ID3DBlob **error_messages);
-VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob);
+VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);
 VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,
         const D3D_SHADER_MACRO *defines, ID3DInclude *include,
         ID3DBlob **shader, ID3DBlob **error_messages);
diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index 7fb042c..26df283 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -471,7 +471,7 @@ void vkd3d_destroy_event(HANDLE event)
 
 #endif  /* _WIN32 */
 
-HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob)
+HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob)
 {
     HRESULT hr;
     void *data;




More information about the wine-cvs mailing list