From bbef13166bf25a509a52623929e5f82e2bddbc5a Mon Sep 17 00:00:00 2001 From: James Park Date: Sat, 8 Jun 2019 09:52:20 -0700 Subject: [PATCH] libobs-d3d11: Clean up device_projection_pop Simplify STL usage as requested by function comment. --- libobs-d3d11/d3d11-subsystem.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 6b7a00527..775580a30 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -1886,14 +1886,11 @@ void device_projection_push(gs_device_t *device) void device_projection_pop(gs_device_t *device) { - if (!device->projStack.size()) + if (device->projStack.empty()) return; - mat4float *mat = device->projStack.data(); - size_t end = device->projStack.size()-1; - - /* XXX - does anyone know a better way of doing this? */ - memcpy(&device->curProjMatrix, mat+end, sizeof(matrix4)); + const mat4float &mat = device->projStack.back(); + memcpy(&device->curProjMatrix, &mat, sizeof(matrix4)); device->projStack.pop_back(); }