TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

int != GLint

Browse Source
This commit is contained in:
David Rose 2009-10-21 18:05:38 +00:00
parent f8576df31f
commit 6505a4fbe5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -1140,8 +1140,8 @@ reset() {
_max_fb_samples = 0; _max_fb_samples = 0;
#ifndef OPENGLES #ifndef OPENGLES
if (_supports_framebuffer_multisample) { if (_supports_framebuffer_multisample) {
GLfloat max_samples; GLint max_samples;
GLP(GetFloatv)(GL_MAX_SAMPLES_EXT, &max_samples); GLP(GetIntegerv)(GL_MAX_SAMPLES_EXT, &max_samples);
_max_fb_samples = max_samples; _max_fb_samples = max_samples;
} }
#endif #endif

2
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -969,7 +969,7 @@ glsl_compile_shader(GSG *gsg) {
// Set the vertex output limit to the maximum // Set the vertex output limit to the maximum
nassertr(gsg->_glProgramParameteri != NULL, false); nassertr(gsg->_glProgramParameteri != NULL, false);
int max_vertices; GLint max_vertices;
glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &max_vertices); glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &max_vertices);
gsg->_glProgramParameteri(_glsl_program, GL_GEOMETRY_VERTICES_OUT_EXT, max_vertices); gsg->_glProgramParameteri(_glsl_program, GL_GEOMETRY_VERTICES_OUT_EXT, max_vertices);
} }