From 1a334f8135d4be7b73b39ac736af0e722c864e83 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 18 Sep 2013 11:51:20 +0300 Subject: ANGLE: Update to version 2446 Update ANGLE and reapply patches. Patch changes: "Dynamically resolve functions of dwmapi.dll" Removed; ANGLE no longer uses DWM API "Make it possible to link ANGLE statically for single-thread use" Avoid name collision by using ANGLE-style getCurrent() "Fix build when SSE2 is not available." Added guard for __cpuid(), which is not available on ARM "Make DX9/DX11 mutually exclusive" Adjustments due to underlying code changes "ANGLE: Avoid memory copies on buffers when data is null" Removed; fixed upstream "Add missing intrin.h include for __cpuid" Removed; fixed upstream Change-Id: I4f3d850fc555d3194ddc05e0b51c4966d33f7eaf Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann Reviewed-by: Kai Koehne --- src/3rdparty/angle/.gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/angle/.gitignore') diff --git a/src/3rdparty/angle/.gitignore b/src/3rdparty/angle/.gitignore index c53d356b04..b108d54d93 100644 --- a/src/3rdparty/angle/.gitignore +++ b/src/3rdparty/angle/.gitignore @@ -36,7 +36,8 @@ src/libGLESv2/renderer/shaders/compiled/PassthroughRGB11ps.h src/libGLESv2/renderer/shaders/compiled/PassthroughLumAlpha11ps.h src/libGLESv2/renderer/shaders/compiled/PassthroughLum11ps.h src/libGLESv2/renderer/shaders/compiled/Passthrough11vs.h -src/libGLESv2/renderer/shaders/compiled/Clear11ps.h -src/libGLESv2/renderer/shaders/compiled/Clear11vs.h +src/libGLESv2/renderer/shaders/compiled/clear11vs.h +src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h +src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h -- cgit v1.2.3