Skip to content

A
angle
Commit 5e73312d by Geoff Lang Committed by Geoff Lang
Options

Update samples solution to use the new translator project and add missing files…

Update samples solution to use the new translator project and add missing files to the translator project. Review URL: https://codereview.appspot.com/14041043/
parent 49cbc576
Showing with 61 additions and 31 deletions
samples/samples.sln
......@@ -24,12 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL\lib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "..\src\compiler\translator_hlsl.vcxproj", "{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "essl_to_hlsl", "translator\essl_to_hlsl.vcxproj", "{E12EA115-EBC7-47C2-B651-30A0CE986025}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "..\src\compiler\translator_common.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostSubBuffer", "gles2_book\PostSubBuffer\PostSubBuffer.vcxproj", "{667CE95F-5DD8-4495-8C18-5CA8A175B12D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\src\compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
......@@ -38,6 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple_Instancing", "angle\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MultipleRenderTargets", "gles2_book\MultipleRenderTargets\MultipleRenderTargets.vcxproj", "{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "..\src\compiler\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -122,28 +120,12 @@ Global
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|x64
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.ActiveCfg = Debug|Win32
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.Build.0 = Debug|Win32
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.ActiveCfg = Debug|x64
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.Build.0 = Debug|x64
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.ActiveCfg = Release|Win32
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.Build.0 = Release|Win32
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.ActiveCfg = Release|x64
{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.Build.0 = Release|x64
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|Win32.ActiveCfg = Debug|Win32
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|Win32.Build.0 = Debug|Win32
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|x64.ActiveCfg = Debug|Win32
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|Win32.ActiveCfg = Release|Win32
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|Win32.Build.0 = Release|Win32
{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|x64.ActiveCfg = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64
{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|Win32.ActiveCfg = Debug|Win32
{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|Win32.Build.0 = Debug|Win32
{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|x64.ActiveCfg = Debug|Win32
......@@ -170,6 +152,14 @@ Global
{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|Win32.ActiveCfg = Release|Win32
{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|Win32.Build.0 = Release|Win32
{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|x64.ActiveCfg = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
samples/translator/essl_to_hlsl.vcxproj
......@@ -94,17 +94,9 @@
<ProjectReference Include="..\..\src\compiler\preprocessor\preprocessor.vcxproj">
<Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
</ProjectReference>
<ProjectReference Include="..\..\src\compiler\translator_common.vcxproj">
<ProjectReference Include="..\..\src\compiler\translator.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
</ProjectReference>
<ProjectReference Include="..\..\src\compiler\translator_hlsl.vcxproj">
<Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Private>true</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
src/ANGLE.sln
......@@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL\libEGL.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "compiler\translator_common.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "compiler\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
EndProject
......
src/compiler/translator_common.vcxproj → src/compiler/translator.vcxproj
......@@ -158,6 +158,9 @@
<ClCompile Include="IntermTraverse.cpp" />
<ClCompile Include="MapLongVariableNames.cpp" />
<ClCompile Include="ossource_win.cpp" />
<ClCompile Include="OutputESSL.cpp" />
<ClCompile Include="OutputGLSL.cpp" />
<ClCompile Include="OutputGLSLBase.cpp" />
<ClCompile Include="OutputHLSL.cpp" />
<ClCompile Include="parseConst.cpp" />
<ClCompile Include="ParseHelper.cpp" />
......@@ -167,6 +170,8 @@
<ClCompile Include="SearchSymbol.cpp" />
<ClCompile Include="ShaderLang.cpp" />
<ClCompile Include="SymbolTable.cpp" />
<ClCompile Include="TranslatorESSL.cpp" />
<ClCompile Include="TranslatorGLSL.cpp" />
<ClCompile Include="TranslatorHLSL.cpp" />
<ClCompile Include="UnfoldShortCircuit.cpp" />
<ClCompile Include="Uniform.cpp" />
......@@ -183,6 +188,7 @@
<ClCompile Include="timing\RestrictFragmentShaderTiming.cpp" />
<ClCompile Include="timing\RestrictVertexShaderTiming.cpp" />
<ClCompile Include="..\third_party\compiler\ArrayBoundsClamper.cpp" />
<ClCompile Include="VersionGLSL.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="glslang.l">
......@@ -257,6 +263,9 @@
<ClInclude Include="MapLongVariableNames.h" />
<ClInclude Include="MMap.h" />
<ClInclude Include="osinclude.h" />
<ClInclude Include="OutputESSL.h" />
<ClInclude Include="OutputGLSL.h" />
<ClInclude Include="OutputGLSLBase.h" />
<ClInclude Include="OutputHLSL.h" />
<ClInclude Include="ParseHelper.h" />
<ClInclude Include="PoolAlloc.h" />
......@@ -267,6 +276,8 @@
<ClInclude Include="SearchSymbol.h" />
<ClInclude Include="ShHandle.h" />
<ClInclude Include="SymbolTable.h" />
<ClInclude Include="TranslatorESSL.h" />
<ClInclude Include="TranslatorGLSL.h" />
<ClInclude Include="TranslatorHLSL.h" />
<ClInclude Include="Types.h" />
<ClInclude Include="UnfoldShortCircuit.h" />
......@@ -282,6 +293,7 @@
<ClInclude Include="depgraph\DependencyGraphBuilder.h" />
<ClInclude Include="depgraph\DependencyGraphOutput.h" />
<ClInclude Include="..\third_party\compiler\ArrayBoundsClamper.h" />
<ClInclude Include="VersionGLSL.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
src/compiler/translator_common.vcxproj.filters → src/compiler/translator.vcxproj.filters
......@@ -161,6 +161,24 @@
<ClCompile Include="CodeGen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TranslatorGLSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TranslatorESSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OutputESSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OutputGLSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OutputGLSLBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VersionGLSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BaseTypes.h">
......@@ -304,6 +322,24 @@
<ClInclude Include="Uniform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TranslatorGLSL.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TranslatorESSL.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OutputESSL.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OutputGLSL.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OutputGLSLBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VersionGLSL.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="glslang.l">
......
src/libGLESv2/libGLESv2.vcxproj
......@@ -415,7 +415,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">
<Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
</ProjectReference>
<ProjectReference Include="..\compiler\translator_common.vcxproj">
<ProjectReference Include="..\compiler\translator.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
</ProjectReference>
</ItemGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment