From dff1927d120ac037104cab3b0315d460fdb686a6 Mon Sep 17 00:00:00 2001 From: Christopher Bruns Date: Sun, 3 Apr 2016 18:17:11 -0400 Subject: [PATCH] Call OVR commit so player can see opening and intermission screens too. Increment version to 1.8.10_c. Update top level readme for new release. --- CMakeLists.txt | 2 +- README.md | 4 ++-- src/gl/scene/gl_stereo3d.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a95cd604b3b..8b9b6a812f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,7 +277,7 @@ set(CPACK_PACKAGE_EXECUTABLES ${ZDOOM_EXE_NAME} ${INSTALL_PROGRAM_NAME}) # TODO - read actual zdoom version from somewheare set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "8") -set(CPACK_PACKAGE_VERSION_PATCH "10_cpre") +set(CPACK_PACKAGE_VERSION_PATCH "10_c") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/LICENSE.txt") set(CPACK_PACKAGE_NAME ${INSTALL_PROGRAM_NAME}) set(COMBINED_VERSION "v${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/README.md b/README.md index 93f42381323..037a87effbc 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Click to visit the Official GZ3Doom SiteAbout GZ3Doom diff --git a/src/gl/scene/gl_stereo3d.cpp b/src/gl/scene/gl_stereo3d.cpp index a2b1177a2a4..901d6e402b0 100644 --- a/src/gl/scene/gl_stereo3d.cpp +++ b/src/gl/scene/gl_stereo3d.cpp @@ -369,6 +369,7 @@ void Stereo3D::render(FGLRenderer& renderer, GL_IRECT * bounds, float fov0, floa sharedRiftHmd->bindToSceneFrameBufferAndUpdate(); glClearColor(0, 0, 0, 0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + sharedRiftHmd->commitFrame(); sharedRiftHmd->submitFrame(1.0/calc_mapunits_per_meter(player)); // Start rendering to screen, at least to start @@ -895,6 +896,7 @@ void Stereo3D::updateScreen() { sharedRiftHmd->bindToSceneFrameBufferAndUpdate(); glClearColor(0, 0, 0, 0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + sharedRiftHmd->commitFrame(); sharedRiftHmd->submitFrame(1.0/41.0); // Start rendering to screen, at least for the moment glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); @@ -934,8 +936,8 @@ void Stereo3D::updateScreen() { sharedRiftHmd->paintHudQuad(vr_hud_scale, 0); } + sharedRiftHmd->commitFrame(); blitRiftBufferToScreen(); - sharedRiftHmd->submitFrame(1.0/41.0); if (true) {