diff options
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/draw/DRW_engine.h | 9 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 40 |
3 files changed, 51 insertions, 2 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index a1213be4be0..81f2214b402 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -390,4 +390,8 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() +if(WITH_XR_OPENXR) + add_definitions(-DWITH_XR_OPENXR) +endif() + blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index b4c23d5e57c..7ecf9df275d 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -93,6 +93,7 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph, struct RenderEngineType *engine_type, struct ARegion *region, struct View3D *v3d, + const bool is_image_render, const bool draw_background, const bool do_color_management, struct GPUOffScreen *ofs, @@ -139,6 +140,14 @@ void DRW_opengl_context_destroy(void); void DRW_opengl_context_enable(void); void DRW_opengl_context_disable(void); +#ifdef WITH_XR_OPENXR +/* XXX see comment on DRW_xr_opengl_context_get() */ +void *DRW_xr_opengl_context_get(void); +void *DRW_xr_gpu_context_get(void); +void DRW_xr_drawing_begin(void); +void DRW_xr_drawing_end(void); +#endif + /* For garbage collection */ void DRW_cache_free_old_batches(struct Main *bmain); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 71e2d8d9b57..618922d8544 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -562,7 +562,7 @@ static void drw_viewport_var_init(void) DRW_view_camtexco_set(DST.view_default, rv3d->viewcamtexcofac); if (DST.draw_ctx.sh_cfg == GPU_SHADER_CFG_CLIPPED) { - int plane_len = (rv3d->viewlock & RV3D_BOXCLIP) ? 4 : 6; + int plane_len = (RV3D_LOCK_FLAGS(rv3d) & RV3D_BOXCLIP) ? 4 : 6; DRW_view_clip_planes_set(DST.view_default, rv3d->clip, plane_len); } @@ -1554,6 +1554,7 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph, RenderEngineType *engine_type, ARegion *region, View3D *v3d, + const bool is_image_render, const bool draw_background, const bool do_color_management, GPUOffScreen *ofs, @@ -1569,7 +1570,7 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph, /* Reset before using it. */ drw_state_prepare_clean_for_draw(&DST); - DST.options.is_image_render = true; + DST.options.is_image_render = is_image_render; DST.options.do_color_management = do_color_management; DST.options.draw_background = draw_background; DRW_draw_render_loop_ex(depsgraph, engine_type, region, v3d, render_viewport, NULL); @@ -2829,4 +2830,39 @@ void DRW_gpu_render_context_disable(void *UNUSED(re_gpu_context)) GPU_context_active_set(NULL); } +#ifdef WITH_XR_OPENXR + +/* XXX + * There should really be no such getter, but for VR we currently can't easily avoid it. OpenXR + * needs some low level info for the OpenGL context that will be used for submitting the + * final framebuffer. VR could in theory create its own context, but that would mean we have to + * switch to it just to submit the final frame, which has notable performance impact. + * + * We could "inject" a context through DRW_opengl_render_context_enable(), but that would have to + * work from the main thread, which is tricky to get working too. The preferable solution would be + * using a separate thread for VR drawing where a single context can stay active. */ +void *DRW_xr_opengl_context_get(void) +{ + return DST.gl_context; +} + +/* XXX See comment on DRW_xr_opengl_context_get(). */ +void *DRW_xr_gpu_context_get(void) +{ + return DST.gpu_context; +} + +/* XXX See comment on DRW_xr_opengl_context_get(). */ +void DRW_xr_drawing_begin(void) +{ + BLI_ticket_mutex_lock(DST.gl_context_mutex); +} + +/* XXX See comment on DRW_xr_opengl_context_get(). */ +void DRW_xr_drawing_end(void) +{ + BLI_ticket_mutex_unlock(DST.gl_context_mutex); +} + +#endif /** \} */ |