=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Fix compilation on GCC with -O0.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Aug 31 06:41:59 CDT 2015


Module: wine
Branch: master
Commit: 59745133f36878a32cc7d2ceecc065c0e85ce423
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=59745133f36878a32cc7d2ceecc065c0e85ce423

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Sun Aug 30 22:44:40 2015 +0200

d3d11: Fix compilation on GCC with -O0.

---

 dlls/d3d11/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c
index 307ef23..7accfcd 100644
--- a/dlls/d3d11/utils.c
+++ b/dlls/d3d11/utils.c
@@ -468,7 +468,7 @@ UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc
     static const UINT bitwise_identical_flags = D3D10_RESOURCE_MISC_GENERATE_MIPS
             | D3D10_RESOURCE_MISC_SHARED
             | D3D10_RESOURCE_MISC_TEXTURECUBE;
-    static const UINT handled_flags = bitwise_identical_flags
+    const UINT handled_flags = bitwise_identical_flags
             | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX
             | D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
     UINT d3d11_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;
@@ -496,7 +496,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc
             | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE
             | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER
             | D3D11_RESOURCE_MISC_GUARDED;
-    static const UINT handled_flags = bitwise_identical_flags
+    const UINT handled_flags = bitwise_identical_flags
             | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX
             | D3D11_RESOURCE_MISC_GDI_COMPATIBLE;
     UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;




More information about the wine-cvs mailing list