Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
6dfcb296
Commit
6dfcb296
authored
Mar 10, 2015
by
Matteo Bruni
Committed by
Alexandre Julliard
Mar 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Pack structures to 4-bytes alignment on x86 in D3D headers.
parent
144056bc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
1 deletion
+30
-1
d3d8caps.h
include/d3d8caps.h
+8
-0
d3d8types.h
include/d3d8types.h
+7
-0
d3dcaps.h
include/d3dcaps.h
+7
-1
d3dtypes.h
include/d3dtypes.h
+8
-0
No files found.
include/d3d8caps.h
View file @
6dfcb296
...
@@ -19,6 +19,10 @@
...
@@ -19,6 +19,10 @@
#ifndef __WINE_D3D8CAPS_H
#ifndef __WINE_D3D8CAPS_H
#define __WINE_D3D8CAPS_H
#define __WINE_D3D8CAPS_H
#ifdef __i386__
#include <pshpack4.h>
#endif
/*
/*
* Definitions
* Definitions
*/
*/
...
@@ -283,4 +287,8 @@ typedef struct _D3DCAPS8 {
...
@@ -283,4 +287,8 @@ typedef struct _D3DCAPS8 {
float
MaxPixelShaderValue
;
float
MaxPixelShaderValue
;
}
D3DCAPS8
;
}
D3DCAPS8
;
#ifdef __i386__
#include <poppack.h>
#endif
#endif
/* __WINE_D3D8CAPS_H */
#endif
/* __WINE_D3D8CAPS_H */
include/d3d8types.h
View file @
6dfcb296
...
@@ -19,6 +19,9 @@
...
@@ -19,6 +19,9 @@
#ifndef __WINE_D3D8TYPES_H
#ifndef __WINE_D3D8TYPES_H
#define __WINE_D3D8TYPES_H
#define __WINE_D3D8TYPES_H
#ifdef __i386__
#include <pshpack4.h>
#endif
/*****************************************************************************
/*****************************************************************************
* Direct 3D v8 #defines
* Direct 3D v8 #defines
...
@@ -1210,4 +1213,8 @@ typedef struct _D3DVOLUME_DESC {
...
@@ -1210,4 +1213,8 @@ typedef struct _D3DVOLUME_DESC {
UINT
Depth
;
UINT
Depth
;
}
D3DVOLUME_DESC
;
}
D3DVOLUME_DESC
;
#ifdef __i386__
#include <poppack.h>
#endif
#endif
/* __WINE_D3D8TYPES_H */
#endif
/* __WINE_D3D8TYPES_H */
include/d3dcaps.h
View file @
6dfcb296
...
@@ -21,6 +21,10 @@
...
@@ -21,6 +21,10 @@
#include <ddraw.h>
#include <ddraw.h>
#ifdef __i386__
#include <pshpack4.h>
#endif
typedef
struct
_D3DTRANSFORMCAPS
{
typedef
struct
_D3DTRANSFORMCAPS
{
DWORD
dwSize
;
DWORD
dwSize
;
DWORD
dwCaps
;
DWORD
dwCaps
;
...
@@ -428,6 +432,8 @@ typedef struct _D3DDEVINFO_TEXTURING {
...
@@ -428,6 +432,8 @@ typedef struct _D3DDEVINFO_TEXTURING {
DWORD
dwNumGetDCs
;
DWORD
dwNumGetDCs
;
}
D3DDEVINFO_TEXTURING
,
*
LPD3DDEVINFO_TEXTURING
;
}
D3DDEVINFO_TEXTURING
,
*
LPD3DDEVINFO_TEXTURING
;
#ifdef __i386__
#include <poppack.h>
#endif
#endif
#endif
include/d3dtypes.h
View file @
6dfcb296
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
#include <float.h>
#include <float.h>
#include <ddraw.h>
#include <ddraw.h>
#ifdef __i386__
#include <pshpack4.h>
#endif
#define D3DVALP(val, prec) ((float)(val))
#define D3DVALP(val, prec) ((float)(val))
#define D3DVAL(val) ((float)(val))
#define D3DVAL(val) ((float)(val))
#define D3DDivide(a, b) (float)((double) (a) / (double) (b))
#define D3DDivide(a, b) (float)((double) (a) / (double) (b))
...
@@ -1356,4 +1360,8 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {
...
@@ -1356,4 +1360,8 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {
#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16))
#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16))
#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))
#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))
#ifdef __i386__
#include <poppack.h>
#endif
#endif
#endif
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