Merge pull request #1920 from jpark37/vector-pop

libobs-d3d11: Clean up device_projection_pop
This commit is contained in:
Jim 2019-06-17 19:32:18 -07:00 committed by GitHub
commit 55740f6f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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();
}