oculus2
changeset 18:64089dd45d50
updated for the Oculus SDK 0.4.4
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Sun, 11 Jan 2015 19:03:30 +0200 |
parents | 5558b43eb653 |
children | 1a832e88854a |
files | oculus2.sln oculus2.vcxproj src/main.c |
diffstat | 3 files changed, 77 insertions(+), 4 deletions(-) [+] |
line diff
1.1 --- a/oculus2.sln Wed Oct 29 01:56:42 2014 +0200 1.2 +++ b/oculus2.sln Sun Jan 11 19:03:30 2015 +0200 1.3 @@ -1,20 +1,26 @@ 1.4 1.5 Microsoft Visual Studio Solution File, Format Version 12.00 1.6 # Visual Studio 2013 1.7 -VisualStudioVersion = 12.0.30501.0 1.8 +VisualStudioVersion = 12.0.31101.0 1.9 MinimumVisualStudioVersion = 10.0.40219.1 1.10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oculus2", "oculus2.vcxproj", "{7A2D6788-B885-455C-8DE6-46D5C7313207}" 1.11 EndProject 1.12 Global 1.13 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1.14 Debug|Win32 = Debug|Win32 1.15 + Debug|x64 = Debug|x64 1.16 Release|Win32 = Release|Win32 1.17 + Release|x64 = Release|x64 1.18 EndGlobalSection 1.19 GlobalSection(ProjectConfigurationPlatforms) = postSolution 1.20 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|Win32.ActiveCfg = Debug|Win32 1.21 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|Win32.Build.0 = Debug|Win32 1.22 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|x64.ActiveCfg = Debug|x64 1.23 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|x64.Build.0 = Debug|x64 1.24 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|Win32.ActiveCfg = Release|Win32 1.25 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|Win32.Build.0 = Release|Win32 1.26 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|x64.ActiveCfg = Release|x64 1.27 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|x64.Build.0 = Release|x64 1.28 EndGlobalSection 1.29 GlobalSection(SolutionProperties) = preSolution 1.30 HideSolutionNode = FALSE
2.1 --- a/oculus2.vcxproj Wed Oct 29 01:56:42 2014 +0200 2.2 +++ b/oculus2.vcxproj Sun Jan 11 19:03:30 2015 +0200 2.3 @@ -5,10 +5,18 @@ 2.4 <Configuration>Debug</Configuration> 2.5 <Platform>Win32</Platform> 2.6 </ProjectConfiguration> 2.7 + <ProjectConfiguration Include="Debug|x64"> 2.8 + <Configuration>Debug</Configuration> 2.9 + <Platform>x64</Platform> 2.10 + </ProjectConfiguration> 2.11 <ProjectConfiguration Include="Release|Win32"> 2.12 <Configuration>Release</Configuration> 2.13 <Platform>Win32</Platform> 2.14 </ProjectConfiguration> 2.15 + <ProjectConfiguration Include="Release|x64"> 2.16 + <Configuration>Release</Configuration> 2.17 + <Platform>x64</Platform> 2.18 + </ProjectConfiguration> 2.19 </ItemGroup> 2.20 <PropertyGroup Label="Globals"> 2.21 <ProjectGuid>{7A2D6788-B885-455C-8DE6-46D5C7313207}</ProjectGuid> 2.22 @@ -20,14 +28,27 @@ 2.23 <ConfigurationType>Application</ConfigurationType> 2.24 <UseDebugLibraries>true</UseDebugLibraries> 2.25 <PlatformToolset>v120</PlatformToolset> 2.26 - <CharacterSet>Unicode</CharacterSet> 2.27 + <CharacterSet>MultiByte</CharacterSet> 2.28 + </PropertyGroup> 2.29 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 2.30 + <ConfigurationType>Application</ConfigurationType> 2.31 + <UseDebugLibraries>true</UseDebugLibraries> 2.32 + <PlatformToolset>v120</PlatformToolset> 2.33 + <CharacterSet>MultiByte</CharacterSet> 2.34 </PropertyGroup> 2.35 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 2.36 <ConfigurationType>Application</ConfigurationType> 2.37 <UseDebugLibraries>false</UseDebugLibraries> 2.38 <PlatformToolset>v120</PlatformToolset> 2.39 <WholeProgramOptimization>true</WholeProgramOptimization> 2.40 - <CharacterSet>Unicode</CharacterSet> 2.41 + <CharacterSet>MultiByte</CharacterSet> 2.42 + </PropertyGroup> 2.43 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 2.44 + <ConfigurationType>Application</ConfigurationType> 2.45 + <UseDebugLibraries>false</UseDebugLibraries> 2.46 + <PlatformToolset>v120</PlatformToolset> 2.47 + <WholeProgramOptimization>true</WholeProgramOptimization> 2.48 + <CharacterSet>MultiByte</CharacterSet> 2.49 </PropertyGroup> 2.50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 2.51 <ImportGroup Label="ExtensionSettings"> 2.52 @@ -35,16 +56,28 @@ 2.53 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 2.54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 2.55 </ImportGroup> 2.56 + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 2.57 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 2.58 + </ImportGroup> 2.59 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 2.60 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 2.61 </ImportGroup> 2.62 + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 2.63 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 2.64 + </ImportGroup> 2.65 <PropertyGroup Label="UserMacros" /> 2.66 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 2.67 <LinkIncremental>true</LinkIncremental> 2.68 </PropertyGroup> 2.69 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 2.70 + <LinkIncremental>true</LinkIncremental> 2.71 + </PropertyGroup> 2.72 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 2.73 <LinkIncremental>false</LinkIncremental> 2.74 </PropertyGroup> 2.75 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 2.76 + <LinkIncremental>false</LinkIncremental> 2.77 + </PropertyGroup> 2.78 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 2.79 <ClCompile> 2.80 <PrecompiledHeader> 2.81 @@ -60,6 +93,21 @@ 2.82 <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovrd.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 2.83 </Link> 2.84 </ItemDefinitionGroup> 2.85 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 2.86 + <ClCompile> 2.87 + <PrecompiledHeader> 2.88 + </PrecompiledHeader> 2.89 + <WarningLevel>Level3</WarningLevel> 2.90 + <Optimization>Disabled</Optimization> 2.91 + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.92 + <DisableSpecificWarnings>4305;4244</DisableSpecificWarnings> 2.93 + </ClCompile> 2.94 + <Link> 2.95 + <SubSystem>Console</SubSystem> 2.96 + <GenerateDebugInformation>true</GenerateDebugInformation> 2.97 + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovrd.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 2.98 + </Link> 2.99 + </ItemDefinitionGroup> 2.100 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 2.101 <ClCompile> 2.102 <WarningLevel>Level3</WarningLevel> 2.103 @@ -79,6 +127,25 @@ 2.104 <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovr.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 2.105 </Link> 2.106 </ItemDefinitionGroup> 2.107 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 2.108 + <ClCompile> 2.109 + <WarningLevel>Level3</WarningLevel> 2.110 + <PrecompiledHeader> 2.111 + </PrecompiledHeader> 2.112 + <Optimization>MaxSpeed</Optimization> 2.113 + <FunctionLevelLinking>true</FunctionLevelLinking> 2.114 + <IntrinsicFunctions>true</IntrinsicFunctions> 2.115 + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.116 + <DisableSpecificWarnings>4305;4244</DisableSpecificWarnings> 2.117 + </ClCompile> 2.118 + <Link> 2.119 + <SubSystem>Console</SubSystem> 2.120 + <GenerateDebugInformation>true</GenerateDebugInformation> 2.121 + <EnableCOMDATFolding>true</EnableCOMDATFolding> 2.122 + <OptimizeReferences>true</OptimizeReferences> 2.123 + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovr.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 2.124 + </Link> 2.125 + </ItemDefinitionGroup> 2.126 <ItemGroup> 2.127 <ClCompile Include="src\main.c" /> 2.128 </ItemGroup>
3.1 --- a/src/main.c Wed Oct 29 01:56:42 2014 +0200 3.2 +++ b/src/main.c Sun Jan 11 19:03:30 2015 +0200 3.3 @@ -150,7 +150,7 @@ 3.4 */ 3.5 memset(&glcfg, 0, sizeof glcfg); 3.6 glcfg.OGL.Header.API = ovrRenderAPI_OpenGL; 3.7 - glcfg.OGL.Header.RTSize = hmd->Resolution; 3.8 + glcfg.OGL.Header.BackBufferSize = hmd->Resolution; 3.9 glcfg.OGL.Header.Multisample = 1; 3.10 3.11 #ifdef WIN32