Merge pull request #6176 from aliaspider/master

(D3D11) build fix.
This commit is contained in:
Twinaphex 2018-01-25 10:49:12 +01:00 committed by GitHub
commit 1657b9b7c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2496,11 +2496,12 @@ typedef struct
#define ALIGN(x) __declspec(align(x))
#else
#define ALIGN(x) __attribute__((aligned(x)))
#define static_assert _Static_assert
#endif
#endif
ALIGN(16)
typedef struct
typedef struct ALIGN(16)
{
math_matrix_4x4 mvp;
struct
@ -2511,6 +2512,8 @@ typedef struct
float time;
} d3d11_uniform_t;
static_assert(!(sizeof(d3d11_uniform_t)&0xF), "sizeof(d3d11_uniform_t) must be a multiple of 16");
typedef struct
{
unsigned cur_mon_id;