diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
index 6e6bfe4b77..ad02270de5 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
@@ -1140,8 +1140,8 @@ reset() {
   _max_fb_samples = 0;
 #ifndef OPENGLES
   if (_supports_framebuffer_multisample) {
-    GLfloat max_samples;
-    GLP(GetFloatv)(GL_MAX_SAMPLES_EXT, &max_samples);
+    GLint max_samples;
+    GLP(GetIntegerv)(GL_MAX_SAMPLES_EXT, &max_samples);
     _max_fb_samples = max_samples;
   }
 #endif
diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx
index 6488f1e64a..b2465bb6f9 100755
--- a/panda/src/glstuff/glShaderContext_src.cxx
+++ b/panda/src/glstuff/glShaderContext_src.cxx
@@ -969,7 +969,7 @@ glsl_compile_shader(GSG *gsg) {
     
     // Set the vertex output limit to the maximum
     nassertr(gsg->_glProgramParameteri != NULL, false);
-    int max_vertices;
+    GLint max_vertices;
     glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &max_vertices);
     gsg->_glProgramParameteri(_glsl_program, GL_GEOMETRY_VERTICES_OUT_EXT, max_vertices); 
   }