system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Redirect vkd3d log output to the Unix stderr.

Browse source
This commit is contained in:
Zebediah Figura 2022-05-27 12:13:47 -05:00 committed by Alexandre Julliard
parent b0a24c3cd7
commit c94be0460c
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure vendored
View file

@ -13004,8 +13004,8 @@ then :
fi
if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes"
then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d" >&5
printf %s "checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_set_log_callback in MinGW -lvkd3d" >&5
printf %s "checking for vkd3d_set_log_callback in MinGW -lvkd3d... " >&6; }
if test ${ac_cv_mingw_lib_vkd3d+y}
then :
printf %s "(cached) " >&6
@ -13022,11 +13022,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
char vkd3d_serialize_versioned_root_signature ();
char vkd3d_set_log_callback ();
int
main (void)
{
return vkd3d_serialize_versioned_root_signature ();
return vkd3d_set_log_callback ();
;
return 0;
}
@ -13111,7 +13111,7 @@ CPPFLAGS=$ac_save_CPPFLAGS
if test "x$VKD3D_PE_LIBS" = "x"
then
as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found; using bundled version."
as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version."
fi
if ${ZLIB_PE_CFLAGS:+false} :

4
configure.ac
View file

@ -1107,7 +1107,7 @@ then
WINE_CHECK_MINGW_HEADER(vkd3d_shader.h)
if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes"
then
WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_serialize_versioned_root_signature,[:],[:],[$VKD3D_PE_LIBS])
WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_set_log_callback,[:],[:],[$VKD3D_PE_LIBS])
WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_compile,[:],[:],[$VKD3D_PE_LIBS])
if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no"
then
@ -1120,7 +1120,7 @@ then
fi])
if test "x$VKD3D_PE_LIBS" = "x"
then
WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found; using bundled version.])
WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version.])
fi
WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz],

14
dlls/wined3d/wined3d_main.c
View file

@ -22,8 +22,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define VKD3D_NO_VULKAN_H
#define VKD3D_NO_WIN32_TYPES
#include "initguid.h"
#include "wined3d_private.h"
#include "d3d12.h"
#include <vkd3d.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
@ -247,6 +251,14 @@ BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size)
return TRUE;
}
static void vkd3d_log_callback(const char *fmt, va_list args)
{
char buffer[1024];
vsnprintf(buffer, sizeof(buffer), fmt, args);
__wine_dbg_output(buffer);
}
static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
{
DWORD wined3d_context_tls_idx;
@ -459,6 +471,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
if (appkey) RegCloseKey( appkey );
if (hkey) RegCloseKey( hkey );
vkd3d_set_log_callback(vkd3d_log_callback);
return TRUE;
}