mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-08 12:37:37 +00:00
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
# HG changeset patch
|
|
# Parent 2cefa41bd95ba8875964dde3829559fd70b8101d
|
|
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)
|