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

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-05-11 21:15:11 +02:00
commit f0df4b3b77
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,6 +381,10 @@ rebuild_bitplanes() {
// buffer was requested.
_use_depth_stencil = true;
}
} else if (attach[RTP_depth_stencil] != NULL && attach[RTP_depth] == NULL) {
// The depth stencil slot was assigned a texture, but we don't support it.
// Downgrade to a regular depth texture.
swap(attach[RTP_depth], attach[RTP_depth_stencil]);
}
// Knowing this, we can already be a tiny bit more accurate about the

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

@ -1129,6 +1129,9 @@ reset() {
#else
_supports_depth_texture = (is_at_least_gl_version(1, 4) ||
has_extension("GL_ARB_depth_texture"));
_supports_depth_stencil = (is_at_least_gl_version(3, 0) ||
has_extension("GL_ARB_framebuffer_object") ||
has_extension("GL_EXT_packed_depth_stencil"));
#endif
#ifdef OPENGLES_2

6
panda/src/gobj/shader.cxx
View File

@ -413,8 +413,10 @@ cp_dependency(ShaderMatInput inp) {
if (inp == SMO_attr_fog || inp == SMO_attr_fogcolor) {
dep |= SSD_fog;
}
if ((inp == SMO_model_to_view)||
(inp == SMO_view_to_model)) {
if ((inp == SMO_model_to_view) ||
(inp == SMO_view_to_model) ||
(inp == SMO_model_to_apiview) ||
(inp == SMO_apiview_to_model)) {
dep |= SSD_transform;
}
if ((inp == SMO_texpad_x) ||