Merge pull request #120 from fedan/feature/dx11

Fix R3/R4 compile shader name calculation.
OpenXRay · Jan 29, 2016 · a543940 · a543940
2 parents f4df0c9 + 289238c
commit a543940
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -1189,7 +1189,7 @@ HRESULT	CRender::shader_compile			(
 		defines[def_it].Definition	=	"1";
 		def_it++;
 	}
-	sh_name[len]='0'+0*char(o.dx10_sm4_1); ++len;
+	sh_name[len]='0'+char(o.dx10_sm4_1); ++len;
 
 	if (o.dx10_minmax_sm)
 	{

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -1318,7 +1318,7 @@ HRESULT	CRender::shader_compile			(
 	   defines[def_it].Definition	=	"1";
 	   def_it++;
    }
-   sh_name[len]='0'+0*char(o.dx10_sm4_1); ++len;
+   sh_name[len]='0'+char(o.dx10_sm4_1); ++len;
 
    R_ASSERT						( HW.FeatureLevel>=D3D_FEATURE_LEVEL_11_0 );
    if( HW.FeatureLevel>=D3D_FEATURE_LEVEL_11_0 )