test shader files and keywords update

test shader files and keywords update

Author: wudixiaop

Src/Shaderlab.lex

@@ -25,7 +25,7 @@ float1				("+"|"-")?{digit}*"."{digit}+{floatsuffix}?
 float2				("+"|"-")?{digit}+"."{digit}+{floatsuffix}?
 numbers				(("+"|"-")?{digit}+|{float1}|{float2})
 
-symbol			("+"|"-"|"*"|"/"|"%"|"||"|"<"|">"|"="|"!"|";"|","|"="|"."|"&"|";"|"{"|"}"|","|"("|")"|"["|"]")
+symbol			("+"|"-"|"*"|"/"|"%"|"||"|"<"|">"|"="|"!"|";"|","|"="|"&"|";"|"{"|"}"|","|"("|")"|"["|"]")
 
 
 CmntStart			\/\*
@@ -40,7 +40,7 @@ keywordsSpeical     ALPHATOCOVERAGEENABLE|BLENDENABLE|SRCBLEND|DESTBLEND|BLENDOP
 datatype			AppendStructuredBuffer|bool|bool2|bool3|bool4|Buffer|ByteAddressBuffer|ConsumeStructuredBuffer|double|double2|double3|double4|fixed|fixed2|fixed3|fixed4|float|float1x1|float1x2|float1x3|float1x4|float2|float2x1|float2x2|float2x3|float2x4|float3|float3x1|float3x2|float3x3|float3x4|float4|float4x1|float4x2|float4x3|float4x4|half|half2|half3|half4|InputPatch|int|int2|int3|int4|line|lineadj|LineStream|matrix|OutputPatch|point|PointStream|RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D|string|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|triangle|triangleadj|TriangleStream|uint|uint2|uint3|uint4|vector|sampler|sampler2D|sampler3D|samplerCUBE
 function		    abs|acos|all|AllMemoryBarrier|AllMemoryBarrierWithGroupSync|any|asdouble|asfloat|asin|asint|asuint|atan|atan2|ceil|clamp|clip|cos|cosh|countbits|cross|D3DCOLORtoUBYTE4|ddx|ddx_coarse|ddx_fine|ddy|ddy_coarse|ddy_fine|degrees|determinant|DeviceMemoryBarrier|DeviceMemoryBarrierWithGroupSync|distance|dot|dst|EvaluateAttributeAtCentroid|EvaluateAttributeAtSample|EvaluateAttributeSnapped|exp|exp2|f16tof32|f32tof16|faceforward|firstbithigh|firstbitlow|floor|fmod|frac|frexp|fwidth|GetRenderTargetSampleCount|GetRenderTargetSamplePosition|GroupMemoryBarrier|GroupMemoryBarrierWithGroupSync|InterlockedAdd|InterlockedAnd|InterlockedCompareExchange|InterlockedCompareStore|InterlockedExchange|InterlockedMax|InterlockedMin|InterlockedOr|InterlockedXor|isfinite|isinf|isnan|ldexp|length|lerp|lit|log|log10|log2|mad|max|min|modf|mul|noise|normalize|pow|Process2DQuadTessFactorsAvg|Process2DQuadTessFactorsMax|Process2DQuadTessFactorsMin|ProcessIsolineTessFactors|ProcessQuadTessFactorsAvg|ProcessQuadTessFactorsMax|ProcessQuadTessFactorsMin|ProcessTriTessFactorsAvg|ProcessTriTessFactorsMax|ProcessTriTessFactorsMin|radians|rcp|reflect|refract|reversebits|round|rsqrt|saturate|sign|sin|sincos|sinh|smoothstep|sqrt|step|tan|tanh|tex1D|tex1Dbias|tex1Dgrad|tex1Dlod|tex1Dproj|tex2D|tex2Dbias|tex2Dgrad|tex2Dlod|tex2Dproj|tex3D|tex3Dbias|tex3Dgrad|tex3Dlod|tex3Dproj|texCUBE|texCUBEbias|texCUBEgrad|texCUBElod|texCUBEproj|transpose|trunc
 
-unityDataType				Color|2D|Rect|Cube|Float|[Rr]ange{blank}*\({blank}*{numbers}{blank}*,{blank}*{numbers}{blank}*\)|Vector|appdata_base|appdata_tan|appdata_full|appdata_img
+unityDataType				Color|2D|Rect|Cube|Float|[Rr]ange{blank}*\({blank}*{numbers}{blank}*,{blank}*{numbers}{blank}*\)|Vector|appdata_base|appdata_tan|appdata_full|appdata_img|SurfaceOutput
 unityBuiltinVars			UNITY_MATRIX_MVP|UNITY_MATRIX_MV|UNITY_MATRIX_V|UNITY_MATRIX_P|UNITY_MATRIX_VP|UNITY_MATRIX_T_MV|UNITY_MATRIX_IT_MV|UNITY_MATRIX_TEXTURE0|UNITY_MATRIX_TEXTURE1|UNITY_MATRIX_TEXTURE2|UNITY_MATRIX_TEXTURE3|UNITY_LIGHTMODEL_AMBIENT
 unityKeywordsWithPara		#pragma|#include
 unityBlockKeywords			CGPROGRAM|ENDCG|Shader|SubShader|FallBack|Properties|Pass|UsePass|Tags|BindChannels|Stencil|Material|GrabPass

Src/ShaderlabVS.csproj

@@ -76,17 +76,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="TestFiles\TestShader.shader" />
     <None Include="Shaderlab.lex" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
+    <None Include="TestFiles\101.shader" />
+    <None Include="TestFiles\102.shader" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="gplex.exe" />
-    <Content Include="TestFiles\DefaultShaderLibrary.hlsl" />
-    <Content Include="TestFiles\Tutorial04.fx" />
-    <Content Include="TestFiles\Tutorial07.fx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

Src/TestFiles/101.shader

@@ -0,0 +1,26 @@
+Shader "Custom/NewShader" {
+    Properties {
+        _MainTex ("Base (RGB)", 2D) = "white" {}
+    }
+    SubShader {
+        Tags { "RenderType" = "Opaque" }
+        LOD 200
+
+        CGPROGRAM
+        #pragma surface surf Lambert
+
+        sampler2D _MainTex;
+
+        struct Input {
+            float2 uv_MainTex;
+        };
+
+        void surf (Input IN, inout SurfaceOutput o) {
+            half4 c = tex2D (_MainTex, IN.uv_MainTex);
+            o.Albedo = c.rgb;
+            o.Alpha = c.a;
+        }
+        ENDCG
+    }
+    FallBack "Diffuse"
+}