summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-04-22 16:36:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-23 12:45:16 +0200
commit43e1c61a191d22cf106789fb68a7bfb9e0f58a26 (patch)
tree09938c5e24668fbe8cf6882ee3844dea8b12d445
parent2fbfad8b0d106bb4f9babaf27c12e8665059f451 (diff)
Add missing intrin.h include for __cpuid
This is already fixed upstream in https://codereview.appspot.com/8615046/patch/1/2 Change-Id: I4b9e865f6b5622c484418a8381334381bc256887 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/3rdparty/angle/src/libGLESv2/mathutil.h2
-rw-r--r--src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch30
2 files changed, 32 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/mathutil.h b/src/3rdparty/angle/src/libGLESv2/mathutil.h
index 672c443c11..bb48b94eaf 100644
--- a/src/3rdparty/angle/src/libGLESv2/mathutil.h
+++ b/src/3rdparty/angle/src/libGLESv2/mathutil.h
@@ -9,6 +9,8 @@
#ifndef LIBGLESV2_MATHUTIL_H_
#define LIBGLESV2_MATHUTIL_H_
+#include <intrin.h>
+
#include "common/system.h"
#include "common/debug.h"
diff --git a/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch b/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch
new file mode 100644
index 0000000000..ebe3de4dc9
--- /dev/null
+++ b/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch
@@ -0,0 +1,30 @@
+From 142312b5cbea10257b6d3693b48817ae657018eb Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@digia.com>
+Date: Mon, 22 Apr 2013 16:36:17 +0200
+Subject: [PATCH] Add missing intrin.h include for __cpuid
+
+This is already fixed upstream in
+
+https://codereview.appspot.com/8615046/patch/1/2
+
+Change-Id: I4b9e865f6b5622c484418a8381334381bc256887
+---
+ src/3rdparty/angle/src/libGLESv2/mathutil.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/angle/src/libGLESv2/mathutil.h b/src/3rdparty/angle/src/libGLESv2/mathutil.h
+index 672c443..bb48b94 100644
+--- a/src/3rdparty/angle/src/libGLESv2/mathutil.h
++++ b/src/3rdparty/angle/src/libGLESv2/mathutil.h
+@@ -9,6 +9,8 @@
+ #ifndef LIBGLESV2_MATHUTIL_H_
+ #define LIBGLESV2_MATHUTIL_H_
+
++#include <intrin.h>
++
+ #include "common/system.h"
+ #include "common/debug.h"
+
+--
+1.8.1.msysgit.1
+