2.0.0.2: Added OpenGL Extension Checks.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@478 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 00fb84602a3c2723715ecbd5e4bfd29023324675..ea3f66df9ce31136838e465322ec2004dfb7659d 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -99,6 +99,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <MinimalRebuild>false</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -110,7 +112,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>\r
@@ -126,6 +128,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -139,7 +142,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Amplify|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>\r
@@ -155,6 +158,7 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -168,7 +172,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>Disabled</Optimization>\r
       <FunctionLevelLinking>\r
@@ -185,6 +189,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r

diff --git a/core/consumer/ogl/ogl_consumer.cpp b/core/consumer/ogl/ogl_consumer.cpp
index b114db880b73a605edd2ce32fc8cb24c82bcfc94..223860dda796b899b1a19cec3af3473c4574a682 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.cpp
+++ b/core/consumer/ogl/ogl_consumer.cpp
@@ -132,6 +132,12 @@ public:
                        CASPAR_LOG(warning) << print() << " only supports screen_index=0 for non-Win32";\r
 #endif\r
 \r
+               if(!GLEE_ARB_pixel_buffer_object)\r
+                       BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: GLEE_ARB_pixel_buffer_object."));\r
+\r
+               if(!GLEE_ARB_texture_rectangle)\r
+                       BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: GLEE_ARB_texture_rectangle."));\r
+\r
                executor_.start();\r
                executor_.invoke([=]\r
                {\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 9013bb0f19896f19fd8cae692b3dcc72fed514f7..b671e24b58b86757c95b6c544d9380f4d33568cc 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -112,6 +112,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>BlueHancUtils_d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -151,7 +152,7 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -159,6 +160,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r
@@ -205,7 +207,7 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -213,6 +215,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r
@@ -259,7 +262,7 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
+      <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -267,6 +270,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r

diff --git a/mixer/image/image_mixer.cpp b/mixer/image/image_mixer.cpp
index eb69d61fd24a1d4a3912e99d014d5e60fbc7b101..eccebf3aebf73932c3267e1d475811beaac22a0f 100644 (file)
--- a/mixer/image/image_mixer.cpp
+++ b/mixer/image/image_mixer.cpp
@@ -38,6 +38,24 @@ public:
                : format_desc_(format_desc)\r
                , context_(ogl_device::create())\r
        {\r
+               context_->invoke([]\r
+               {\r
+                       if(!GLEE_ARB_pixel_buffer_object)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: ARB_pixel_buffer_object."));\r
+\r
+                       if(!GLEE_ARB_texture_rectangle)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: ARB_texture_rectangle."));\r
+\r
+                       if(!GLEE_ARB_fragment_shader)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: ARB_fragment_shader."));\r
+\r
+                       if(!GLEE_ARB_framebuffer_object)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: ARB_framebuffer_object."));\r
+\r
+                       if(!GLEE_ARB_multitexture)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL Extension Support: ARB_multitexture."));\r
+               });\r
+               \r
                context_->begin_invoke([=]\r
                {\r
                        transform_stack_.push(image_transform());\r

diff --git a/mixer/mixer.vcxproj b/mixer/mixer.vcxproj
index a0698d80d1868b3161ab7bb7556b62150f0b080e..1c46d371d9962ac072a81ed2c9ac940af9c0685a 100644 (file)
--- a/mixer/mixer.vcxproj
+++ b/mixer/mixer.vcxproj
@@ -192,6 +192,10 @@
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -210,6 +214,10 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -230,6 +238,10 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -252,6 +264,9 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r

diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj
index 11b27ced03bec1b502e36270bd2f0ba0f09c2b81..fcdec9d09325e8912b380222a8fd989477fa5f6f 100644 (file)
--- a/protocol/protocol.vcxproj
+++ b/protocol/protocol.vcxproj
@@ -179,11 +179,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level1</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -192,7 +196,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level1</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -202,6 +206,10 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -212,7 +220,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Amplify|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level1</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -222,6 +230,10 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -232,7 +244,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level1</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>Disabled</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -243,6 +255,9 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 2dd74a20538373e9024b7691785004df89476a47..64ab3e90dbb604bd2c2b1d108174f17e27d150ae 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -159,6 +159,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>sfml-system-d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -205,6 +206,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r
@@ -258,6 +260,7 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r
@@ -311,6 +314,7 @@
       <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
+      <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <PreLinkEvent>\r
       <Command>\r