mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
d33d9d4b45
This is syncing us with the ANGLE project at http://code.google.com/p/angleproject/ Also, with this new ANGLE revision, two WebGL conformance tests are now passing on windows so this patch removes them from failing_tests_windows.txt. --HG-- rename : gfx/angle/angle-instrinsic-msvc2005.patch => gfx/angle/angle-intrinsic-msvc2005.patch
89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
# HG changeset patch
|
|
# Parent cf38970fcf3b4bee12f09b3747b7b7711bc77ad8
|
|
diff --git a/gfx/angle/angle-renaming-debug.patch b/gfx/angle/angle-renaming-debug.patch
|
|
--- a/gfx/angle/angle-renaming-debug.patch
|
|
+++ b/gfx/angle/angle-renaming-debug.patch
|
|
@@ -1,11 +1,10 @@
|
|
# HG changeset patch
|
|
-# Parent 96359f46b01fdb37e791f564495e8b2755a05233
|
|
-
|
|
+# Parent 70640278da97b0ca49e21c4bb52766b8af7db4db
|
|
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
|
|
--- a/gfx/angle/Makefile.in
|
|
+++ b/gfx/angle/Makefile.in
|
|
@@ -73,17 +73,17 @@ CPPSRCS = \
|
|
parseConst.cpp \
|
|
ParseHelper.cpp \
|
|
PoolAlloc.cpp \
|
|
QualifierAlive.cpp \
|
|
@@ -129,17 +128,17 @@ diff --git a/gfx/angle/src/compiler/comp
|
|
|
|
#include <assert.h>
|
|
|
|
#ifdef _DEBUG
|
|
#define TRACE_ENABLED // define to enable debug message tracing
|
|
diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
|
|
--- a/gfx/angle/src/compiler/osinclude.h
|
|
+++ b/gfx/angle/src/compiler/osinclude.h
|
|
-@@ -32,17 +32,17 @@
|
|
+@@ -30,17 +30,17 @@
|
|
#include <windows.h>
|
|
#elif defined(ANGLE_OS_POSIX)
|
|
#include <pthread.h>
|
|
#include <semaphore.h>
|
|
#include <errno.h>
|
|
#endif // ANGLE_USE_NSPR
|
|
|
|
|
|
diff --git a/gfx/angle/src/libGLESv2/Texture.cpp b/gfx/angle/src/libGLESv2/Texture.cpp
|
|
--- a/gfx/angle/src/libGLESv2/Texture.cpp
|
|
+++ b/gfx/angle/src/libGLESv2/Texture.cpp
|
|
@@ -8,16 +8,22 @@
|
|
// Texture2D and TextureCubeMap. Implements GL texture objects and related
|
|
// functionality. [OpenGL ES 2.0.24] section 3.7 page 63.
|
|
|
|
#include "libGLESv2/Texture.h"
|
|
|
|
#include <d3dx9tex.h>
|
|
|
|
#include <algorithm>
|
|
+
|
|
+#if _MSC_VER <= 1400
|
|
+#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
|
+#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
|
+#endif
|
|
+
|
|
#include <intrin.h>
|
|
|
|
#include "common/debug.h"
|
|
|
|
#include "libEGL/Display.h"
|
|
|
|
#include "libGLESv2/main.h"
|
|
#include "libGLESv2/mathutil.h"
|
|
diff --git a/gfx/angle/src/libGLESv2/mathutil.h b/gfx/angle/src/libGLESv2/mathutil.h
|
|
--- a/gfx/angle/src/libGLESv2/mathutil.h
|
|
+++ b/gfx/angle/src/libGLESv2/mathutil.h
|
|
@@ -3,16 +3,21 @@
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
// mathutil.h: Math and bit manipulation functions.
|
|
|
|
#ifndef LIBGLESV2_MATHUTIL_H_
|
|
#define LIBGLESV2_MATHUTIL_H_
|
|
+
|
|
+#if _MSC_VER <= 1400
|
|
+#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
|
+#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
|
|
+#endif
|
|
|
|
#include <intrin.h>
|
|
#include <math.h>
|
|
#include <windows.h>
|
|
|
|
namespace gl
|
|
{
|
|
inline bool isPow2(int x)
|