Revert "Disable RTTI in VS release builds"

Fails compile on the Windows Debug GPU bot: c:\b\build\slave\gpu_win_builder__dbg_\build\src\third_party\deqp\src\framework\opengl\simplereference\sglrreferencecontext.cpp(2342) : warning C4541: 'dynamic_cast' used on polymorphic type 'sglr::rc::Texture' with /GR-; unpredictable behavior may result c:\b\build\slave\gpu_win_builder__dbg_\build\src\third_party\deqp\src\framework\opengl\simplereference\sglrreferencecontext.cpp(2344) : warning C4541: 'dynamic_cast' used on polymorphic type 'sglr::rc::Texture' with /GR-; unpredictable behavior may result Many other similar errors. BUG=angleproject:1239 This reverts commit aca86045. Change-Id: I523e12b32665bcc74a6437582be82db8174e42ac Reviewed-on: https://chromium-review.googlesource.com/315170Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Revert "Disable RTTI in VS release builds"
5bbc9438 · Jamie Madill · 3d677ea6 · 5bbc9438 · 5bbc9438
Commit 5bbc9438 authored Dec 01, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 14 deletions

common.gypi build/common.gypi +1 -2

deqp.gypi src/tests/deqp.gypi +2 -12

No files found.
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -99,6 +99,7 @@
                        'ExceptionHandling': '0',
                        'EnableFunctionLevelLinking': 'true',
                        'MinimalRebuild': 'false',
+                        'RuntimeTypeInfo': 'true',
                        'WarningLevel': '4',
                    },
                    'VCLinkerTool':
@@ -141,7 +142,6 @@
                    {
                        'Optimization': '0',    # /Od
                        'BasicRuntimeChecks': '3',
-                        'RuntimeTypeInfo': 'true',
                        'conditions':
                        [
                            ['angle_build_winrt==1',
@@ -200,7 +200,6 @@
                    'VCCLCompilerTool':
                    {
                        'Optimization': '2',    # /Os
-                        'RuntimeTypeInfo': 'false',
                        'conditions':
                        [
                            ['angle_build_winrt==1',

--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -1184,8 +1184,9 @@
                                {
                                    'VCCLCompilerTool':
                                    {
-                                        # dEQP requires exceptions
+                                        # dEQP requires exceptions and RTTI
                                        'ExceptionHandling': 1,
+                                        'RuntimeTypeInfo': 'true',
                                    },
                                    'VCLinkerTool':
                                    {
@@ -1215,17 +1216,6 @@
                                    },
                                },
                            },
-                            'Release_Base':
-                            {
-                                'msvs_settings':
-                                {
-                                    'VCCLCompilerTool':
-                                    {
-                                        'RuntimeTypeInfo': 'true', # dEQP needs RTTI
-                                    },
-                                },
-                            },
                        },
                        # Re-enable RTTI and exceptions, dEQP needs them.
                        'cflags_cc!':