Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
86781a6a
Commit
86781a6a
authored
Nov 12, 2011
by
Daniel Scharrer
Committed by
Alexandre Julliard
Nov 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Don't use min/max in d3dx9math.inl as they might not be defined at this point.
parent
076edfe9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
d3dx9math.inl
include/d3dx9math.inl
+18
-18
No files found.
include/d3dx9math.inl
View file @
86781a6a
...
...
@@ -991,16 +991,16 @@ static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv
static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
max(pv1->x , pv2->x)
;
pout->y =
max(pv1->y , pv2->y)
;
pout->x =
pv1->x > pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y > pv2->y ? pv1->y : pv2->y
;
return pout;
}
static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
min(pv1->x , pv2->x)
;
pout->y =
min(pv1->y , pv2->y)
;
pout->x =
pv1->x < pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y < pv2->y ? pv1->y : pv2->y
;
return pout;
}
...
...
@@ -1070,18 +1070,18 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv
static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
max(pv1->x , pv2->x)
;
pout->y =
max(pv1->y , pv2->y)
;
pout->z =
max(pv1->z , pv2->z)
;
pout->x =
pv1->x > pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y > pv2->y ? pv1->y : pv2->y
;
pout->z =
pv1->z > pv2->z ? pv1->z : pv2->z
;
return pout;
}
static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
min(pv1->x , pv2->x)
;
pout->y =
min(pv1->y , pv2->y)
;
pout->z =
min(pv1->z , pv2->z)
;
pout->x =
pv1->x < pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y < pv2->y ? pv1->y : pv2->y
;
pout->z =
pv1->z < pv2->z ? pv1->z : pv2->z
;
return pout;
}
...
...
@@ -1146,20 +1146,20 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv
static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
max(pv1->x , pv2->x)
;
pout->y =
max(pv1->y , pv2->y)
;
pout->z =
max(pv1->z , pv2->z)
;
pout->w =
max(pv1->w , pv2->w)
;
pout->x =
pv1->x > pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y > pv2->y ? pv1->y : pv2->y
;
pout->z =
pv1->z > pv2->z ? pv1->z : pv2->z
;
pout->w =
pv1->w > pv2->w ? pv1->w : pv2->w
;
return pout;
}
static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
{
if ( !pout || !pv1 || !pv2) return NULL;
pout->x =
min(pv1->x , pv2->x)
;
pout->y =
min(pv1->y , pv2->y)
;
pout->z =
min(pv1->z , pv2->z)
;
pout->w =
min(pv1->w , pv2->w)
;
pout->x =
pv1->x < pv2->x ? pv1->x : pv2->x
;
pout->y =
pv1->y < pv2->y ? pv1->y : pv2->y
;
pout->z =
pv1->z < pv2->z ? pv1->z : pv2->z
;
pout->w =
pv1->w < pv2->w ? pv1->w : pv2->w
;
return pout;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment