Matteo Bruni : d3dcompiler: Don' t raise a warning for an uninitialized uniform.

Alexandre Julliard julliard at winehq.org
Wed Oct 10 15:07:53 CDT 2012


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Wed Oct 10 18:26:00 2012 +0200

d3dcompiler: Don't raise a warning for an uninitialized uniform.

---

 dlls/d3dcompiler_43/hlsl.y |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y
index afb12ec..a7d4c68 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -605,7 +605,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers,
             local = FALSE;
         }
 
-        if (var->modifiers & HLSL_MODIFIER_CONST && !v->initializer)
+        if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer)
         {
             hlsl_report_message(v->loc.file, v->loc.line, v->loc.col,
                     HLSL_LEVEL_ERROR, "const variable without initializer");




More information about the wine-cvs mailing list