Adding --vendor_gl_extensions flag to disable NV stuff.

This commit is contained in:
Ben Vanik
2015-01-03 13:40:20 -08:00
parent 76c41edfd6
commit 70c0c0fea1
4 changed files with 14 additions and 4 deletions

View File

@@ -181,11 +181,16 @@ bool CommandProcessor::SetupGL() {
glGenVertexArrays(1, &vertex_array_);
glBindVertexArray(vertex_array_);
if (GLEW_NV_vertex_buffer_unified_memory) {
if (FLAGS_vendor_gl_extensions && GLEW_NV_vertex_buffer_unified_memory) {
has_bindless_vbos_ = true;
glEnableClientState(GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV);
glEnableClientState(GL_ELEMENT_ARRAY_UNIFIED_NV);
}
GLint max_vertex_attribs = 0;
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);
for (GLint i = 0; i < max_vertex_attribs; ++i) {
glEnableVertexAttribArray(i);
}
const std::string geometry_header =
"#version 450\n"
@@ -2242,7 +2247,6 @@ CommandProcessor::UpdateStatus CommandProcessor::PopulateVertexBuffers(
assert_unhandled_case(el.format);
break;
}
glEnableVertexAttribArray(el_index);
if (has_bindless_vbos_) {
glVertexAttribFormatNV(el_index, comp_count, comp_type,
el.is_normalized,