Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1

Conflicts:
	LibOVR/Include/OVR_CAPI_0_5_0.h
	LibOVR/Src/CAPI/CAPI_HMDState.cpp
	LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
	LibOVR/Src/Kernel/OVR_System.cpp
	LibOVR/Src/OVR_CAPI.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVRKernel/Src/Kernel/OVR_Types.h

1 files changed, 5 insertions, 22 deletions

diff --git a/LibOVR/Src/Displays/OVR_Linux_Display.h b/LibOVR/Src/Displays/OVR_Linux_Display.h
index f685e6b..1ef1dab 100644
--- a/LibOVR/Src/Displays/OVR_Linux_Display.h
+++ b/LibOVR/Src/Displays/OVR_Linux_Display.h
@@ -33,23 +33,6 @@ namespace OVR { namespace Linux {
 
 
 //-------------------------------------------------------------------------------------
-// DisplayDesc
-
-// Display information enumerable through OS .
-// TBD: Should we just move this to public header, so it's a const member of Display?
-struct DisplayDesc
-{
-    HmdTypeEnum DeviceTypeGuess;
-    String      DisplayID; // This is the device identifier string from MONITORINFO (for app usage)
-    String      ModelName; // This is a "DK2" type string
-    String      EdidSerialNumber;
-    Sizei       LogicalResolutionInPixels;
-    Sizei       NativeResolutionInPixels;
-    Vector2i    DesktopDisplayOffset;
-};
-
-
-//-------------------------------------------------------------------------------------
 // DisplayEDID
 
 // Describes EDID information as reported from our display driver.
@@ -82,7 +65,7 @@ public:
 
     static const int DescArraySize = 16;
 
-    Linux::DisplayDesc  cachedDescriptorArray[DescArraySize];
+    DisplayDesc         cachedDescriptorArray[DescArraySize];
     bool                extended;
     bool                application;
     int                 extendedDisplayCount;
@@ -102,12 +85,12 @@ public:
                 dd.DisplayID,
                 dd.ModelName,
                 dd.EdidSerialNumber,
-                dd.LogicalResolutionInPixels,
-                dd.NativeResolutionInPixels,
+                dd.ResolutionInPixels,
+                dd.ResolutionInPixels,
                 dd.DesktopDisplayOffset,
                 0,
-                0,
-				false)
+                dd.Rotation,
+                false)
     {
     }