[Bf-blender-cvs] [7238bbecc40] soc-2019-openxr: Cleanup: Rename graphics-lib to graphics-binding

[Julian Eisel]

Commit: 7238bbecc4040dcbc49a6c01acd1ef21abeb9a23
Author: Julian Eisel
Date:   Mon Jun 10 22:16:09 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB7238bbecc4040dcbc49a6c01acd1ef21abeb9a23

Cleanup: Rename graphics-lib to graphics-binding

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_xr.c
M	source/blender/windowmanager/wm.h
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index ad82c4ce43e..d1f85e37b7f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
+Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
diff --git a/release/scripts/addons b/release/scripts/addons
index c5452a62178..7317987baa8 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c5452a62178454d7e804ce711674dd0a400c2140
+Subproject commit 7317987baa8aac52a11d6af0a825d87acc658f60
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 4af87c687bc..97fa83e16f2 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 4af87c687bc1afa2968f13602897782d5c5d622a
+Subproject commit 97fa83e16f290b24f0a9c50153c2469b68b8c0aa
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index a2f3f6e0264..30965abc4e1 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3552,18 +3552,19 @@ static int xr_session_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
   wmWindowManager *wm = CTX_wm_manager(C);
   struct wmXRContext *xr_context = wm->xr_context;
-  const eWM_xrGraphicsBinding graphics_lib = wm_xr_session_active_graphics_lib_get(xr_context);
+  const eWM_xrGraphicsBinding gpu_binding = wm_xr_session_active_graphics_binding_type_get(
+      xr_context);
 
   if (wm_xr_session_is_running(xr_context)) {
     BLI_assert(wm->xr_gpu_context != NULL);
 
     wm_xr_session_end(xr_context);
-    xr_session_gpu_binding_context_destroy(graphics_lib, wm->xr_gpu_context);
+    xr_session_gpu_binding_context_destroy(gpu_binding, wm->xr_gpu_context);
   }
   else {
     BLI_assert(wm->xr_gpu_context == NULL);
 
-    wm->xr_gpu_context = xr_session_gpu_binding_context_create(graphics_lib);
+    wm->xr_gpu_context = xr_session_gpu_binding_context_create(gpu_binding);
     wm_xr_session_start(xr_context, wm->xr_gpu_context);
   }
   return OPERATOR_FINISHED;
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index b26e6123af3..c30ea44bc2f 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -345,7 +345,7 @@ static void wm_xr_system_init(OpenXRData *oxr)
   xrGetSystem(oxr->instance, &system_info, &oxr->system_id);
 }
 
-eWM_xrGraphicsBinding wm_xr_session_active_graphics_lib_get(const wmXRContext *xr_context)
+eWM_xrGraphicsBinding wm_xr_session_active_graphics_binding_type_get(const wmXRContext *xr_context)
 {
   return xr_context->gpu_binding;
 }
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 6681eb8e9ae..6eb3a16fd25 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -131,8 +131,8 @@ void wm_xr_context_destroy(struct wmXRContext *xr_context);
 
 /* sessions */
 bool wm_xr_session_is_running(const struct wmXRContext *xr_context) ATTR_WARN_UNUSED_RESULT;
-eWM_xrGraphicsBinding wm_xr_session_active_graphics_lib_get(const struct wmXRContext *xr_context)
-    ATTR_NONNULL();
+eWM_xrGraphicsBinding wm_xr_session_active_graphics_binding_type_get(
+    const struct wmXRContext *xr_context) ATTR_NONNULL();
 void wm_xr_session_start(struct wmXRContext *xr_context, void *ghost_context) ATTR_NONNULL();
 void wm_xr_session_end(struct wmXRContext *xr_context) ATTR_NONNULL();
 
diff --git a/source/tools b/source/tools
index 2afbb8ec472..2ea02bbd612 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit 2ea02bbd61284c4b5039c1733183a443f940de32