Matteo Bruni : d3dcompiler: "void" is not a plain scalar data type.

Alexandre Julliard julliard at winehq.org
Fri Jul 20 15:29:59 CDT 2012


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Fri Jul 20 16:37:39 2012 +0200

d3dcompiler: "void" is not a plain scalar data type.

It can't be used in expressions and the like. This change indirectly
takes care of most of the checks.

---

 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 6cc2150..177330f 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -568,7 +568,7 @@ type:                     base_type
 
 base_type:                KW_VOID
                             {
-                                $$ = new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1);
+                                $$ = new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1);
                             }
                         | KW_SAMPLER
                             {




More information about the wine-cvs mailing list