Skip to content

Use VAO #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lrusak wants to merge 1 commit into
base: Omega
Choose a base branch
from
Open

Use VAO #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/opengl_spectrum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class ATTR_DLL_LOCAL CVisualizationSpectrum
std::vector<glm::vec3> m_vertex_buffer_data;
std::vector<glm::vec3> m_color_buffer_data;

GLuint m_vao = 0;

#ifdef HAS_GL
GLuint m_vertexVBO[2] = {0};
#endif
Expand Down Expand Up @@ -150,6 +152,8 @@ bool CVisualizationSpectrum::Start(int channels, int samplesPerSec, int bitsPerS

m_projMat = glm::frustum(-1.0f, 1.0f, -1.0f, 1.0f, 1.5f, 10.0f);

glGenVertexArrays(1, &m_vao);

#ifdef HAS_GL
glGenBuffers(2, m_vertexVBO);
#endif
Expand All @@ -166,11 +170,12 @@ void CVisualizationSpectrum::Stop()
m_startOK = false;

#ifdef HAS_GL
glBindBuffer(GL_ARRAY_BUFFER, 0);
glDeleteBuffers(2, m_vertexVBO);
m_vertexVBO[0] = 0;
m_vertexVBO[1] = 0;
#endif

glDeleteVertexArrays(1, &m_vao);
}

//-- Render -------------------------------------------------------------------
Expand All @@ -181,6 +186,8 @@ void CVisualizationSpectrum::Render()
if (!m_startOK)
return;

glBindVertexArray(m_vao);

#ifdef HAS_GL
glBindBuffer(GL_ARRAY_BUFFER, m_vertexVBO[0]);
glVertexAttribPointer(m_hPos, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat)*3, nullptr);
Expand Down Expand Up @@ -242,6 +249,8 @@ void CVisualizationSpectrum::Render()
glDisableVertexAttribArray(m_hPos);
glDisableVertexAttribArray(m_hCol);

glBindVertexArray(0);

glDisable(GL_DEPTH_TEST);
#ifdef HAS_GL
glDisable(GL_PROGRAM_POINT_SIZE);
Expand Down