History

address Sam's concerns

Brad Hefta-Gaub committed 11 years ago

Commit 9a0e5b91 parent 62c1e4013 files · +29 −68Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp (1 of 13 files). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp+1−2
@@ -16,7 +16,6 @@ · 15 unmodified lines
1616 #include "GeometryCache.h"
1717 #include <gpu/Batch.h>
1818 #include <gpu/Context.h>
19−#include <gpu/DoInBatch.h>
2019 #include <DeferredLightingEffect.h>
2120 #include <display-plugins/openvr/OpenVrHelpers.h>
2221 #include "NumericalConstants.h"
@@ -174,7 +173,7 @@ void ViveControllerManager::updateRendering(RenderArgs* args, render::ScenePoint · 151 unmodified lines
174173 UserInputMapper::PoseValue leftHand = _poseStateMap[makeInput(JointChannel::LEFT_HAND).getChannel()];
175174 UserInputMapper::PoseValue rightHand = _poseStateMap[makeInput(JointChannel::RIGHT_HAND).getChannel()];
176175
177− doInBatch(args, [=](gpu::Batch& batch) {
176+ doInBatch(args->_context, [=](gpu::Batch& batch) {
178177 auto geometryCache = DependencyManager::get<GeometryCache>();
179178 geometryCache->useSimpleDrawPipeline(batch);
180179 DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch, true);