RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gs-vertexbuffer: Fix support for 20.x graphics API 

Reverts an earlier change that made the plugin rely on 21.x features.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2017-12-14 02:59:50 +01:00
parent 911f7696bb
commit 09d5ac4635
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source/gs-vertexbuffer.cpp
View File

@ -33,16 +33,17 @@ GS::VertexBuffer::VertexBuffer(uint32_t maximumVertices) {
m_uvwLayers = MAXIMUM_UVW_LAYERS; m_uvwLayers = MAXIMUM_UVW_LAYERS;
// Reserve Space // Reserve Space
m_vertexbufferdata.num = m_maximumVertices; m_vertexbufferdata = gs_vbdata_create();
m_vertexbufferdata->num = m_maximumVertices;
m_data.positions.resize(m_maximumVertices); m_data.positions.resize(m_maximumVertices);
m_vertexbufferdata.points = m_data.positions.data(); m_vertexbufferdata->points = m_data.positions.data();
m_data.normals.resize(m_maximumVertices); m_data.normals.resize(m_maximumVertices);
m_vertexbufferdata.normals = m_data.normals.data(); m_vertexbufferdata->normals = m_data.normals.data();
m_data.tangents.resize(m_maximumVertices); m_data.tangents.resize(m_maximumVertices);
m_vertexbufferdata.tangents = m_data.tangents.data(); m_vertexbufferdata->tangents = m_data.tangents.data();
m_data.colors.resize(m_maximumVertices); m_data.colors.resize(m_maximumVertices);
m_vertexbufferdata.colors = m_data.colors.data(); m_vertexbufferdata->colors = m_data.colors.data();
m_vertexbufferdata.num_tex = m_uvwLayers; m_vertexbufferdata->num_tex = m_uvwLayers;
m_data.uvws.resize(m_uvwLayers); m_data.uvws.resize(m_uvwLayers);
m_data.uvwdata.resize(m_uvwLayers); m_data.uvwdata.resize(m_uvwLayers);
for (uint32_t n = 0; n < m_uvwLayers; n++) { for (uint32_t n = 0; n < m_uvwLayers; n++) {
@ -50,11 +51,12 @@ GS::VertexBuffer::VertexBuffer(uint32_t maximumVertices) {
m_data.uvwdata[n].width = 4; m_data.uvwdata[n].width = 4;
m_data.uvwdata[n].array = m_data.uvws[n].data(); m_data.uvwdata[n].array = m_data.uvws[n].data();
} }
m_vertexbufferdata.tvarray = m_data.uvwdata.data(); m_vertexbufferdata->tvarray = m_data.uvwdata.data();
// Allocate GPU // Allocate GPU
obs_enter_graphics(); obs_enter_graphics();
m_vertexbuffer = gs_vertexbuffer_create(&m_vertexbufferdata, GS_DYNAMIC | GS_DUP_BUFFER); m_vertexbuffer = gs_vertexbuffer_create(m_vertexbufferdata, GS_DYNAMIC);
std::memset(m_vertexbufferdata, 0, sizeof(gs_vb_data));
obs_leave_graphics(); obs_leave_graphics();
if (!m_vertexbuffer) { if (!m_vertexbuffer) {
throw std::runtime_error("Failed to create vertex buffer."); throw std::runtime_error("Failed to create vertex buffer.");
@ -77,7 +79,7 @@ GS::VertexBuffer::VertexBuffer(VertexBuffer& other) : VertexBuffer(other.m_maxim
GS::VertexBuffer::~VertexBuffer() { GS::VertexBuffer::~VertexBuffer() {
if (m_vertexbuffer) { if (m_vertexbuffer) {
std::memset(&m_vertexbufferdata, 0, sizeof(m_vertexbufferdata)); std::memset(m_vertexbufferdata, 0, sizeof(gs_vb_data));
obs_enter_graphics(); obs_enter_graphics();
gs_vertexbuffer_destroy(m_vertexbuffer); gs_vertexbuffer_destroy(m_vertexbuffer);
@ -99,6 +101,21 @@ gs_vertbuffer_t* GS::VertexBuffer::get(bool refreshGPU) {
if (size() > m_maximumVertices) if (size() > m_maximumVertices)
throw std::runtime_error("Too many vertices in Vertex Buffer."); throw std::runtime_error("Too many vertices in Vertex Buffer.");
m_vertexbufferdata = gs_vertexbuffer_get_data(m_vertexbuffer);
std::memset(m_vertexbufferdata, 0, sizeof(gs_vb_data));
m_vertexbufferdata->num = m_maximumVertices;
m_vertexbufferdata->points = m_data.positions.data();
m_vertexbufferdata->normals = m_data.normals.data();
m_vertexbufferdata->tangents = m_data.tangents.data();
m_vertexbufferdata->colors = m_data.colors.data();
m_vertexbufferdata->num_tex = m_uvwLayers;
m_data.uvws.resize(m_uvwLayers);
m_data.uvwdata.resize(m_uvwLayers);
for (uint32_t n = 0; n < m_uvwLayers; n++) {
m_data.uvwdata[n].width = 4;
m_data.uvwdata[n].array = m_data.uvws[n].data();
}
m_vertexbufferdata->tvarray = m_data.uvwdata.data();
for (size_t vertexIdx = 0; vertexIdx < size(); vertexIdx++) { for (size_t vertexIdx = 0; vertexIdx < size(); vertexIdx++) {
Vertex& v = this->at(vertexIdx); Vertex& v = this->at(vertexIdx);
vec3_copy(&m_data.positions[vertexIdx], &(v.position)); vec3_copy(&m_data.positions[vertexIdx], &(v.position));
@ -109,11 +126,12 @@ gs_vertbuffer_t* GS::VertexBuffer::get(bool refreshGPU) {
} }
m_data.colors[vertexIdx] = v.color; m_data.colors[vertexIdx] = v.color;
} }
m_vertexbufferdata.num = size(); m_vertexbufferdata->num = size();
m_vertexbufferdata.num_tex = m_uvwLayers; m_vertexbufferdata->num_tex = m_uvwLayers;
obs_enter_graphics(); obs_enter_graphics();
gs_vertexbuffer_flush_direct(m_vertexbuffer, &m_vertexbufferdata); gs_vertexbuffer_flush(m_vertexbuffer);
std::memset(m_vertexbufferdata, 0, sizeof(gs_vb_data));
obs_leave_graphics(); obs_leave_graphics();
} }
return m_vertexbuffer; return m_vertexbuffer;

2
source/gs-vertexbuffer.h
View File

@ -77,7 +77,7 @@ namespace GS {
protected: protected:
uint32_t m_maximumVertices; uint32_t m_maximumVertices;
uint32_t m_uvwLayers; uint32_t m_uvwLayers;
gs_vb_data m_vertexbufferdata; gs_vb_data* m_vertexbufferdata;
gs_vertbuffer_t* m_vertexbuffer; gs_vertbuffer_t* m_vertexbuffer;
// Data Storage // Data Storage