X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=src%2Fvoglcommon%2Fvogl_context_info.cpp;h=2632bb007febb3dd69ca41f384ebabb3bcbddb10;hb=f68811cb11c76f4b6ecc982401c87a0bd49a26e6;hp=d5c607cd94eb0271cdf04e6304d5371c46207b3a;hpb=d73de670dade59a783990e5ac264bb3cfd9d45d9;p=vogl

diff --git a/src/voglcommon/vogl_context_info.cpp b/src/voglcommon/vogl_context_info.cpp
index d5c607c..2632bb0 100644
--- a/src/voglcommon/vogl_context_info.cpp
+++ b/src/voglcommon/vogl_context_info.cpp
@@ -399,15 +399,30 @@ void vogl_context_info::init_context_limits()
     VOGL_CHECK_GL_ERROR;
 
     m_max_vertex_attribs = vogl_get_gl_integer(GL_MAX_VERTEX_ATTRIBS);
-    m_max_texture_coords = vogl_get_gl_integer(GL_MAX_TEXTURE_COORDS);
-    m_max_texture_units = vogl_get_gl_integer(GL_MAX_TEXTURE_UNITS);
+    VOGL_CHECK_GL_ERROR;
+
+    m_max_texture_coords = is_core_profile() ? 0 : vogl_get_gl_integer(GL_MAX_TEXTURE_COORDS);
+    VOGL_CHECK_GL_ERROR;
+
+    m_max_texture_units = is_core_profile() ? 0 : vogl_get_gl_integer(GL_MAX_TEXTURE_UNITS);
+    VOGL_CHECK_GL_ERROR;
+
     m_max_texture_image_units = vogl_get_gl_integer(GL_MAX_TEXTURE_IMAGE_UNITS);
+    VOGL_CHECK_GL_ERROR;
+
     m_max_combined_texture_coords = vogl_get_gl_integer(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+    VOGL_CHECK_GL_ERROR;
+
     m_max_draw_buffers = (get_version() >= VOGL_GL_VERSION_2_0) ? vogl_get_gl_integer(GL_MAX_DRAW_BUFFERS) : 0;
+    VOGL_CHECK_GL_ERROR;
+
     m_max_lights = is_core_profile() ? 0 : vogl_get_gl_integer(GL_MAX_LIGHTS);
+    VOGL_CHECK_GL_ERROR;
+
     m_max_uniform_buffer_bindings = vogl_get_gl_integer(GL_MAX_UNIFORM_BUFFER_BINDINGS);
-    m_max_transform_feedback_separate_attribs = (get_version() >= VOGL_GL_VERSION_3_0) ? vogl_get_gl_integer(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS) : 0;
+    VOGL_CHECK_GL_ERROR;
 
+    m_max_transform_feedback_separate_attribs = (get_version() >= VOGL_GL_VERSION_3_0) ? vogl_get_gl_integer(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS) : 0;
     VOGL_CHECK_GL_ERROR;
 
     if (!is_core_profile() && supports_extension("GL_ARB_vertex_program") && GL_ENTRYPOINT(glGetProgramivARB))