summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-08-21 23:20:42 +1000
committer Vas Crabb <vas@vastheman.com>2020-08-21 23:21:05 +1000
commitecab55f70064cea43093cf28f176b19324f4302f (patch)
treecefd6c9f1d098caaf1293f7aa65dd434b99a051f
parent3c5f9eb0ceb88a6da325caaf4a46ce5c8b085a5e (diff)
emu/video: check macros are defined before doing comparisons, also fix a typo in docs
-rw-r--r--docs/source/initialsetup/compilingmame.rst2
-rw-r--r--src/emu/video/rgbgen.cpp5
-rw-r--r--src/emu/video/rgbsse.cpp4
-rw-r--r--src/emu/video/rgbutil.h2
4 files changed, 6 insertions, 7 deletions
diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst
index 91a73f6b13e..09b45d2869a 100644
--- a/docs/source/initialsetup/compilingmame.rst
+++ b/docs/source/initialsetup/compilingmame.rst
@@ -502,7 +502,7 @@ Linking using the LLVM linker
The LLVM linker is generally faster than the GNU linker that GCC uses by
default. This is more pronounced on systems with a high overhead for file
-system operations (e.g. Microsoft Window, or when compiling on a disk mounted
+system operations (e.g. Microsoft Windows, or when compiling on a disk mounted
over a network). To use the LLVM linker with GCC, ensure the LLVM linker is
installed and add ``-fuse-ld=lld`` to the linker options (e.g. in the
**LDFLAGS** environment variable or in the **ARCHOPTS** setting).
diff --git a/src/emu/video/rgbgen.cpp b/src/emu/video/rgbgen.cpp
index 24af32fa244..5973b56d54b 100644
--- a/src/emu/video/rgbgen.cpp
+++ b/src/emu/video/rgbgen.cpp
@@ -10,8 +10,7 @@
#include "emu.h"
-
-#if ((defined(MAME_DEBUG) && !defined(__OPTIMIZE__)) || (!defined(__SSE2__) && (_M_IX86_FP < 2))) && !defined(__ALTIVEC__)
+#if ((defined(MAME_DEBUG) && !defined(__OPTIMIZE__)) || (!defined(__SSE2__) && (!defined(_M_IX86_FP) || (_M_IX86_FP < 2)))) && !defined(__ALTIVEC__)
#include "rgbgen.h"
@@ -115,4 +114,4 @@ void rgbaint_t::scale2_add_and_clamp(const rgbaint_t& scale, const rgbaint_t& ot
if (u32(m_b) > 255) { m_b = (m_b < 0) ? 0 : 255; }
}
-#endif // !defined(__ALTIVEC__)
+#endif // ((defined(MAME_DEBUG) && !defined(__OPTIMIZE__)) || (!defined(__SSE2__) && (!defined(_M_IX86_FP) || (_M_IX86_FP < 2)))) && !defined(__ALTIVEC__)
diff --git a/src/emu/video/rgbsse.cpp b/src/emu/video/rgbsse.cpp
index 214b8067317..3b9c80273af 100644
--- a/src/emu/video/rgbsse.cpp
+++ b/src/emu/video/rgbsse.cpp
@@ -12,7 +12,7 @@
#include "emu.h"
-#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (_M_IX86_FP >= 2))
+#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
#include "rgbsse.h"
@@ -185,4 +185,4 @@ void rgbaint_t::scale_and_clamp(const rgbaint_t& scale)
clamp_to_uint8();
}
-#endif // defined(__SSE2__) || defined(_MSC_VER)
+#endif // (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
diff --git a/src/emu/video/rgbutil.h b/src/emu/video/rgbutil.h
index e0b0915fb70..acf7abb8f82 100644
--- a/src/emu/video/rgbutil.h
+++ b/src/emu/video/rgbutil.h
@@ -13,7 +13,7 @@
#define MAME_EMU_VIDEO_RGBUTIL_H
// use SSE on 64-bit implementations, where it can be assumed
-#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (_M_IX86_FP >= 2))
+#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
#define MAME_RGB_HIGH_PRECISION
#include "rgbsse.h"