[Bf-blender-cvs] [52e007dbb22] HMD_viewport: Fix for building without HMD

Campbell Barton noreply at git.blender.org
Sun Apr 2 16:41:25 CEST 2017


Commit: 52e007dbb2214f90d3fb038e5b7cc5bd3fd2bba1
Author: Campbell Barton
Date:   Mon Apr 3 01:43:54 2017 +1000
Branches: HMD_viewport
https://developer.blender.org/rB52e007dbb2214f90d3fb038e5b7cc5bd3fd2bba1

Fix for building without HMD

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

M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/gpu/GPU_compositing.h
M	source/blender/gpu/intern/gpu_compositing.c
M	source/blender/windowmanager/WM_api.h

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 3472f5b2fd7..53e7ecb1a5e 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3226,10 +3226,15 @@ void ED_view3d_draw_offscreen(
 
 	/* post process */
 	if (do_compositing) {
-		if (!winmat)
+		if (!winmat) {
 			is_persp = rv3d->is_persp;
+		}
 		const bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
-		void* hmd_distortion_params = WM_device_HMD_distortion_parameters_get();
+#ifdef WITH_INPUT_HMD
+		void *hmd_distortion_params = WM_device_HMD_distortion_parameters_get()
+#else
+		void *hmd_distortion_params = NULL;
+#endif
 		GPU_fx_do_composite_pass(fx, winmat, is_persp, scene, ofs, is_left, hmd_distortion_params);
 	}
 
@@ -4003,8 +4008,15 @@ static void view3d_main_region_draw_objects(
 	/* post process */
 	if (do_compositing) {
 		const bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
-		void *hmd_distortion_params = (wm->hmd_view.hmd_win == win && win->screen->is_hmd_running) ? WM_device_HMD_distortion_parameters_get() : NULL;
-		GPU_fx_do_composite_pass(rv3d->compositor, rv3d->winmat, rv3d->is_persp, scene, NULL, is_left, hmd_distortion_params);
+#ifdef WITH_INPUT_HMD
+		void *hmd_distortion_params =
+		        (wm->hmd_view.hmd_win == win && win->screen->is_hmd_running) ?
+		        WM_device_HMD_distortion_parameters_get() : NULL;
+#else
+		void *hmd_distortion_params = NULL;
+#endif
+		GPU_fx_do_composite_pass(
+		        rv3d->compositor, rv3d->winmat, rv3d->is_persp, scene, NULL, is_left, hmd_distortion_params);
 	}
 
 	/* Disable back anti-aliasing */
diff --git a/source/blender/gpu/GPU_compositing.h b/source/blender/gpu/GPU_compositing.h
index d7ee1239ba7..98917235004 100644
--- a/source/blender/gpu/GPU_compositing.h
+++ b/source/blender/gpu/GPU_compositing.h
@@ -94,7 +94,7 @@ bool GPU_fx_compositor_initialize_passes(
 bool GPU_fx_do_composite_pass(
         GPUFX *fx, float projmat[4][4], bool is_persp,
         struct Scene *scene, struct GPUOffScreen *ofs,
-        bool is_left, void* hmd_distortion_parms);
+        bool is_left, void *hmd_distortion_parms);
 
 /* bind new depth buffer for XRay pass */
 void GPU_fx_compositor_setup_XRay_pass(GPUFX *fx, bool do_xray);
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index ad8baeaf40f..d65af07511f 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -1308,7 +1308,7 @@ bool GPU_fx_do_composite_pass(
 				float right_lens_center[2];
 			};
 
-			struct OpenHMDDistortionParameters* distparams = (struct OpenHMDDistortionParameters*)hmd_distortion_params;
+			struct OpenHMDDistortionParameters *distparams = hmd_distortion_params;
 
 			distparams->left_lens_center[0] = distparams->viewport_scale[0] - distparams->sep/2.0f;
 			distparams->right_lens_center[0] = distparams->sep/2.0f;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 07b31065a3f..8a176558f03 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -541,7 +541,7 @@ float       WM_device_HMD_lens_horizontal_separation_get(void) ATTR_WARN_UNUSED_
 void WM_device_HMD_state_set(const int device, const bool enable);
 void WM_device_HMD_modelview_matrix_get(const bool is_left, float r_modelviewmat[4][4]) ATTR_NONNULL();
 void WM_device_HMD_projection_matrix_get(const bool is_left, float r_projmat[4][4]) ATTR_NONNULL();
-void* WM_device_HMD_distortion_parameters_get(void);
+void *WM_device_HMD_distortion_parameters_get(void);
 
 #endif /* WITH_INPUT_HMD */




More information about the Bf-blender-cvs mailing list