From 6057101f26db17c30ad126e63e04f92822518fa5 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 29 Apr 2018 03:00:40 +0200 Subject: [PATCH] gs-vertexbuffer: Fix usage of gs_vertexbuffer_get_data() --- source/gs-vertexbuffer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/gs-vertexbuffer.cpp b/source/gs-vertexbuffer.cpp index 5b49e9f7..3cb86b1e 100644 --- a/source/gs-vertexbuffer.cpp +++ b/source/gs-vertexbuffer.cpp @@ -76,6 +76,7 @@ gs::vertex_buffer::vertex_buffer(uint32_t maximumVertices) { // Assign limits. m_capacity = maximumVertices; + m_size = m_capacity; m_layers = MAXIMUM_UVW_LAYERS; // Allocate memory for data. @@ -110,7 +111,11 @@ gs::vertex_buffer::vertex_buffer(uint32_t maximumVertices) { } gs::vertex_buffer::vertex_buffer(gs_vertbuffer_t* vb) { + obs_enter_graphics(); gs_vb_data* vbd = gs_vertexbuffer_get_data(vb); + if (!vbd) + throw std::runtime_error("vertex buffer with no data"); + vertex_buffer((uint32_t)vbd->num); this->set_uv_layers((uint32_t)vbd->num_tex); @@ -138,9 +143,9 @@ gs::vertex_buffer::vertex_buffer(gs_vertbuffer_t* vb) { } } } + obs_leave_graphics(); } - gs::vertex_buffer::vertex_buffer(vertex_buffer const& other) : vertex_buffer(other.m_capacity) { // Copy Constructor std::memcpy(m_positions, other.m_positions, m_capacity * sizeof(vec3)); @@ -296,6 +301,7 @@ gs_vertbuffer_t* gs::vertex_buffer::update(bool refreshGPU) { throw std::out_of_range("size is larger than capacity"); // Update VertexBuffer data. + obs_enter_graphics(); m_vertexbufferdata = gs_vertexbuffer_get_data(m_vertexbuffer); std::memset(m_vertexbufferdata, 0, sizeof(gs_vb_data)); m_vertexbufferdata->num = m_capacity; @@ -311,7 +317,6 @@ gs_vertbuffer_t* gs::vertex_buffer::update(bool refreshGPU) { } // Update GPU - obs_enter_graphics(); gs_vertexbuffer_flush(m_vertexbuffer); obs_leave_graphics();