summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorTim Rowley <[email protected]>2017-03-29 14:25:12 -0500
committerTim Rowley <[email protected]>2017-04-05 18:19:16 -0500
commit3c52a7316a1b968a780f387b70a17183d5bc9054 (patch)
tree3e45112c13810e662dc90d122840cc21241d5d21 /src/gallium
parente5fdfcf83666bace5330907ac39ad88817d154cb (diff)
swr: [configure.ac/scons] require c++14
New C++ features used by upcoming swr changes. Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/swr/Makefile.am4
-rw-r--r--src/gallium/drivers/swr/SConscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 53093110805..c41662fbf2e 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -22,7 +22,7 @@
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
-AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS)
+AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX14_CXXFLAGS)
noinst_LTLIBRARIES = libmesaswr.la
@@ -32,7 +32,7 @@ COMMON_CXXFLAGS = \
-fno-strict-aliasing \
$(GALLIUM_DRIVER_CFLAGS) \
$(LLVM_CXXFLAGS) \
- $(SWR_CXX11_CXXFLAGS) \
+ $(SWR_CXX14_CXXFLAGS) \
-I$(builddir)/rasterizer/codegen \
-I$(builddir)/rasterizer/jitter \
-I$(builddir)/rasterizer/archrast \
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript
index 18d6c9b67dc..eca5dba8304 100644
--- a/src/gallium/drivers/swr/SConscript
+++ b/src/gallium/drivers/swr/SConscript
@@ -43,7 +43,7 @@ loadersource = env.ParseSourceList('Makefile.sources', [
if not env['msvc'] :
env.Append(CCFLAGS = [
- '-std=c++11',
+ '-std=c++14',
])
swrroot = '#src/gallium/drivers/swr/'