diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-13 16:17:42 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-13 16:17:42 -0600 |
| commit | 2a23bdde6f76c0bff0906bbbee298480b52ba0c2 (patch) | |
| tree | 22a7bccfb1cb25d4c9f247ca3d43904a4a6d79dc /Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp | |
| parent | 3c7613fc83981f9ef8efa2e4ac478af9fe23bdec (diff) | |
| parent | 63a9dff3bb8c88cdc5b941db1f3813843c7a8564 (diff) | |
Merge branch 'master' into android-new-control-input-overlay
Conflicts:
Source/Core/DolphinWX/Src/Android/ButtonManager.h
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp index 293e674cbb..c0112c4e9e 100644 --- a/Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp @@ -48,21 +48,21 @@ void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) vertex_stride = vtx_decl.stride; // We will not allow vertex components causing uneven strides. - if (vertex_stride & 3) + if (vertex_stride & 3) PanicAlert("Uneven vertex stride: %i", vertex_stride); - + VertexManager *vm = (OGL::VertexManager*)g_vertex_manager; - + glGenVertexArrays(1, &VAO); glBindVertexArray(VAO); - + // the element buffer is bound directly to the vao, so we must it set for every vao glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->m_index_buffers); glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers); glEnableVertexAttribArray(SHADER_POSITION_ATTRIB); glVertexAttribPointer(SHADER_POSITION_ATTRIB, 3, GL_FLOAT, GL_FALSE, vtx_decl.stride, (u8*)NULL); - + for (int i = 0; i < 3; i++) { if (vtx_decl.num_normals > i) { glEnableVertexAttribArray(SHADER_NORM0_ATTRIB+i); |