TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: deal with false negatives with feature checks on Intel

Browse Source
This commit is contained in:
rdb 2017-04-14 19:37:18 +02:00
parent fa1b656961
commit e67ebd80cd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1139,7 +1139,7 @@ reset() {
_supports_multisample = false; _supports_multisample = false;
#else #else
_supports_multisample = _supports_multisample =
has_extension("GL_ARB_multisample") || is_at_least_gl_version(1, 3); is_at_least_gl_version(1, 3) || has_extension("GL_ARB_multisample");
#endif #endif
#ifdef OPENGLES_1 #ifdef OPENGLES_1
@ -1305,7 +1305,7 @@ reset() {
if (gl_support_shadow_filter && if (gl_support_shadow_filter &&
_supports_depth_texture && _supports_depth_texture &&
(is_at_least_gl_version(1, 4) || has_extension("GL_ARB_shadow")) && (is_at_least_gl_version(1, 4) || has_extension("GL_ARB_shadow")) &&
has_extension("GL_ARB_fragment_program_shadow")) { (is_at_least_gl_version(2, 0) || has_extension("GL_ARB_fragment_program_shadow"))) {
_supports_shadow_filter = true; _supports_shadow_filter = true;
} }
#endif #endif
@ -2550,8 +2550,8 @@ reset() {
_border_clamp = _edge_clamp; _border_clamp = _edge_clamp;
#ifndef OPENGLES #ifndef OPENGLES
if (gl_support_clamp_to_border && if (gl_support_clamp_to_border &&
(has_extension("GL_ARB_texture_border_clamp") || (is_at_least_gl_version(1, 3) ||
is_at_least_gl_version(1, 3))) { has_extension("GL_ARB_texture_border_clamp"))) {
_border_clamp = GL_CLAMP_TO_BORDER; _border_clamp = GL_CLAMP_TO_BORDER;
} }
#endif #endif
@ -2580,6 +2580,11 @@ reset() {
_mirror_clamp = GL_MIRROR_CLAMP_EXT; _mirror_clamp = GL_MIRROR_CLAMP_EXT;
_mirror_edge_clamp = GL_MIRROR_CLAMP_TO_EDGE_EXT; _mirror_edge_clamp = GL_MIRROR_CLAMP_TO_EDGE_EXT;
_mirror_border_clamp = GL_MIRROR_CLAMP_TO_BORDER_EXT; _mirror_border_clamp = GL_MIRROR_CLAMP_TO_BORDER_EXT;
} else if (is_at_least_gl_version(4, 4) ||
has_extension("GL_ARB_texture_mirror_clamp_to_edge")) {
_mirror_clamp = GL_MIRROR_CLAMP_TO_EDGE;
_mirror_edge_clamp = GL_MIRROR_CLAMP_TO_EDGE;
} }
#endif #endif