Merge pull request #399 from fughilli/master

Backport GLSL shaders to version 1.2 to support older hardware.

Author: fughilli

msvc/projectMSDL.vcxproj

@@ -53,7 +53,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>

src/EyeTune/EyeTune.Shared/EyeTune.Shared.vcxitems

@@ -66,6 +66,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libprojectM\Renderer\RenderItemMatcher.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libprojectM\Renderer\Shader.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libprojectM\Renderer\ShaderEngine.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libprojectM\Renderer\StaticGlShaders.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libprojectM\Renderer\SOIL2\etc1_utils.c">
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>

src/libprojectM/Renderer/Makefile.am

@@ -11,6 +11,7 @@ libRenderer_la_SOURCES = \
   Pipeline.cpp \
   Renderer.cpp \
   ShaderEngine.cpp \
+  StaticGlShaders.cpp \
   Texture.cpp \
   Waveform.cpp \
   Filters.cpp \
@@ -39,6 +40,7 @@ libRenderer_la_SOURCES = \
 	SOIL2/pvr_helper.h      SOIL2/stbi_pkm_c.h\
 	SOIL2/stb_image.h       SOIL2/stbi_pvr.h\
 	SOIL2/stb_image_write.h SOIL2/stbi_pvr_c.h\
+	StaticGlShaders.h\
 	hlslparser/src/CodeWriter.cpp hlslparser/src/Engine.h \
 	hlslparser/src/HLSLParser.h hlslparser/src/HLSLTree.cpp \
 	hlslparser/src/CodeWriter.h hlslparser/src/GLSLGenerator.cpp \