[Bf-blender-cvs] [0d6c6a67878] xr-controller-support: Merge branch 'master' into xr-controller-support

[Peter Kim]

Commit: 0d6c6a67878f4473d33ffc7023410935ee5598b8
Author: Peter Kim
Date:   Wed Jun 23 20:35:06 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB0d6c6a67878f4473d33ffc7023410935ee5598b8

Merge branch 'master' into xr-controller-support

===================================================================



===================================================================

diff --cc intern/ghost/GHOST_Types.h
index 2a13812365d,7efbd00c2eb..1380a17d9ff
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@@ -642,11 -650,13 +650,13 @@@ typedef void *(*GHOST_XrGraphicsContext
  typedef void (*GHOST_XrGraphicsContextUnbindFn)(GHOST_ContextHandle graphics_context);
  typedef void (*GHOST_XrDrawViewFn)(const struct GHOST_XrDrawViewInfo *draw_view, void *customdata);
  
- /* An array of GHOST_TXrGraphicsBinding items defining the candidate bindings to use. The first
-  * available candidate will be chosen, so order defines priority. */
+ /**
+  * An array of #GHOST_TXrGraphicsBinding items defining the candidate bindings to use.
+  * The first available candidate will be chosen, so order defines priority.
+  */
  typedef const GHOST_TXrGraphicsBinding *GHOST_XrGraphicsBindingCandidates;
  
 -typedef struct {
 +typedef struct GHOST_XrPose {
    float position[3];
    /* Blender convention (w, x, y, z) */
    float orientation_quat[4];
@@@ -684,11 -694,8 +694,11 @@@ typedef struct GHOST_XrDrawViewInfo 
      float angle_up, angle_down;
    } fov;
  
-   /** Set if the buffer should be submitted with a srgb transfer applied. */
+   /** Set if the buffer should be submitted with a SRGB transfer applied. */
    char expects_srgb_buffer;
 +
 +  /** The eye (left or right) that this view represents. */
 +  char view;
  } GHOST_XrDrawViewInfo;
  
  typedef struct GHOST_XrError {