diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/3rdparty/angle/src/libGLESv2/Uniform.h | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/Uniform.h')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/Uniform.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/Uniform.h b/src/3rdparty/angle/src/libGLESv2/Uniform.h index 24f834f3c6..633d70bb19 100644 --- a/src/3rdparty/angle/src/libGLESv2/Uniform.h +++ b/src/3rdparty/angle/src/libGLESv2/Uniform.h @@ -7,15 +7,15 @@ #ifndef LIBGLESV2_UNIFORM_H_ #define LIBGLESV2_UNIFORM_H_ -#include <string> -#include <vector> +#include "common/debug.h" +#include "common/blocklayout.h" + +#include "libGLESv2/angletypes.h" #include "angle_gl.h" -#include "common/debug.h" -#include "angletypes.h" -#include "common/shadervars.h" -#include "common/blocklayout.h" +#include <string> +#include <vector> namespace gl { |