Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 20:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[D3DX9_36/WINED3D]

Browse source 
Partly revert previous changes, bringing back copysignf. Add global defines copysignf=_copysignf, since we have that now.

svn path=/trunk/; revision=67723
This commit is contained in:
Timo Kreuzer 2015-05-14 20:45:56 +00:00
parent b2135ede32
commit 12ac6dabfb
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB)

2
reactos/dll/directx/wine/d3dx9_36/math.c
View file

@ -2118,7 +2118,7 @@ unsigned short float_32_to_16(const float in)
{ {
int exp = 0, origexp; int exp = 0, origexp;
float tmp = fabsf(in); float tmp = fabsf(in);
int sign = (in < 0); int sign = (copysignf(1, in) < 0);
unsigned int mantissa; unsigned int mantissa;
unsigned short ret; unsigned short ret;

3
reactos/dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -2,7 +2,8 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D_USE_MATH_DEFINES -D_USE_MATH_DEFINES
-DUSE_WIN32_OPENGL) -DUSE_WIN32_OPENGL
-Dcopysignf=_copysignf)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)

2
reactos/dll/directx/wine/wined3d/utils.c
View file

@ -3987,7 +3987,7 @@ void wined3d_ftoa(float value, char *s)
{ {
int idx = 1; int idx = 1;
if (value < 0.0f) if (copysignf(1.0f, value) < 0.0f)
++idx; ++idx;
/* Be sure to allocate a buffer of at least 17 characters for the result /* Be sure to allocate a buffer of at least 17 characters for the result