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

more bitdepth fixes

Browse Source
This commit is contained in:
David Rose 2013-01-11 21:01:49 +00:00
parent ab40d5456e
commit de10a2ae4e
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,13 +480,16 @@ bind_slot(int face, bool rb_resize, Texture **attach, RenderTexturePlane slot, G
GLclampf priority = 1.0f; GLclampf priority = 1.0f;
glPrioritizeTextures(1, &gtc->_index, &priority); glPrioritizeTextures(1, &gtc->_index, &priority);
#endif #endif
GLint depth_size = 0;
if (!is_cube_map) { if (!is_cube_map) {
glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
GL_TEXTURE_2D, gtc->_index, 0); GL_TEXTURE_2D, gtc->_index, 0);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_2D, 0, GL_TEXTURE_DEPTH_SIZE, &depth_size);
} else { } else {
glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
gtc->_index, 0); gtc->_index, 0);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_TEXTURE_DEPTH_SIZE, &depth_size);
} }
if (_use_depth_stencil) { if (_use_depth_stencil) {
if (!is_cube_map) { if (!is_cube_map) {
@ -498,6 +501,8 @@ bind_slot(int face, bool rb_resize, Texture **attach, RenderTexturePlane slot, G
gtc->_index, 0); gtc->_index, 0);
} }
} }
_fb_properties.set_depth_bits(depth_size);
} else { } else {
#ifdef OPENGLES #ifdef OPENGLES
tex->set_format(Texture::F_rgba4); tex->set_format(Texture::F_rgba4);
@ -516,13 +521,27 @@ bind_slot(int face, bool rb_resize, Texture **attach, RenderTexturePlane slot, G
glPrioritizeTextures(1, &gtc->_index, &priority); glPrioritizeTextures(1, &gtc->_index, &priority);
#endif #endif
glgsg->update_texture(tc, true); glgsg->update_texture(tc, true);
GLint red_size = 0, green_size = 0, blue_size = 0, alpha_size = 0;
if (!is_cube_map) { if (!is_cube_map) {
glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, attachpoint, glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, attachpoint,
GL_TEXTURE_2D, gtc->_index, 0); GL_TEXTURE_2D, gtc->_index, 0);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &red_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_2D, 0, GL_TEXTURE_GREEN_SIZE, &green_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_2D, 0, GL_TEXTURE_BLUE_SIZE, &blue_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size);
} else { } else {
glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, attachpoint, glgsg->_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, attachpoint,
GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
gtc->_index, 0); gtc->_index, 0);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_TEXTURE_RED_SIZE, &red_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_TEXTURE_GREEN_SIZE, &green_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_TEXTURE_BLUE_SIZE, &blue_size);
GLP(GetTexLevelParameteriv)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size);
}
if (attachpoint == GL_COLOR_ATTACHMENT0_EXT) {
_fb_properties.set_color_bits(red_size + green_size + blue_size);
_fb_properties.set_alpha_bits(alpha_size);
} }
} }
@ -602,13 +621,11 @@ bind_slot(int face, bool rb_resize, Texture **attach, RenderTexturePlane slot, G
// If we get here, we're using the simple fallback case. // If we get here, we're using the simple fallback case.
#endif #endif
#ifdef OPENGLES
glgsg->_glRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT16, glgsg->_glRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT16,
_rb_size_x, _rb_size_y); _rb_size_x, _rb_size_y);
#else GLint depth_size = 0;
glgsg->_glRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, glgsg->_glGetRenderbufferParameteriv(GL_RENDERBUFFER_EXT, GL_RENDERBUFFER_DEPTH_SIZE_EXT, &depth_size);
_rb_size_x, _rb_size_y); _fb_properties.set_depth_bits(depth_size);
#endif
glgsg->_glBindRenderbuffer(GL_RENDERBUFFER_EXT, 0); glgsg->_glBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
@ -624,9 +641,17 @@ bind_slot(int face, bool rb_resize, Texture **attach, RenderTexturePlane slot, G
} else { } else {
glgsg->_glRenderbufferStorage(GL_RENDERBUFFER_EXT, glFormat, glgsg->_glRenderbufferStorage(GL_RENDERBUFFER_EXT, glFormat,
_rb_size_x, _rb_size_y); _rb_size_x, _rb_size_y);
GLint red_size = 0, green_size = 0, blue_size = 0, alpha_size = 0;
glgsg->_glGetRenderbufferParameteriv(GL_RENDERBUFFER_EXT, GL_RENDERBUFFER_RED_SIZE_EXT, &red_size);
glgsg->_glGetRenderbufferParameteriv(GL_RENDERBUFFER_EXT, GL_RENDERBUFFER_GREEN_SIZE_EXT, &green_size);
glgsg->_glGetRenderbufferParameteriv(GL_RENDERBUFFER_EXT, GL_RENDERBUFFER_BLUE_SIZE_EXT, &blue_size);
glgsg->_glGetRenderbufferParameteriv(GL_RENDERBUFFER_EXT, GL_RENDERBUFFER_ALPHA_SIZE_EXT, &alpha_size);
_fb_properties.set_color_bits(red_size + green_size + blue_size);
_fb_properties.set_alpha_bits(alpha_size);
glgsg->_glBindRenderbuffer(GL_RENDERBUFFER_EXT, 0); glgsg->_glBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
glgsg->_glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, attachpoint, glgsg->_glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, attachpoint,
GL_RENDERBUFFER_EXT, _rb[slot]); GL_RENDERBUFFER_EXT, _rb[slot]);
} }
} }
@ -882,6 +907,7 @@ open_buffer() {
// tell the truth about what we actually provide by setting // tell the truth about what we actually provide by setting
// the _fb_properties accurately. // the _fb_properties accurately.
_fb_properties.set_depth_bits(1);
_fb_properties.set_color_bits(1); _fb_properties.set_color_bits(1);
_fb_properties.set_alpha_bits(_host->get_fb_properties().get_alpha_bits()); _fb_properties.set_alpha_bits(_host->get_fb_properties().get_alpha_bits());
if (_gsg->get_supports_depth_stencil()) { if (_gsg->get_supports_depth_stencil()) {

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

@ -4177,12 +4177,16 @@ framebuffer_copy_to_texture(Texture *tex, int z, const DisplayRegion *dr,
switch (tex->get_format()) { switch (tex->get_format()) {
case Texture::F_depth_component: case Texture::F_depth_component:
case Texture::F_depth_component16:
case Texture::F_depth_component24:
case Texture::F_depth_component32:
case Texture::F_depth_stencil: case Texture::F_depth_stencil:
// If the texture is one of these special formats, we don't want // Don't remap if we're one of these special format.
// to adapt it to the framebuffer's color format.
break; break;
default: default:
// If the texture is a color format, we want to match the
// presence of alpha according to the framebuffer.
if (_current_properties->get_alpha_bits()) { if (_current_properties->get_alpha_bits()) {
tex->set_format(Texture::F_rgba); tex->set_format(Texture::F_rgba);
} else { } else {
@ -4303,12 +4307,17 @@ framebuffer_copy_to_ram(Texture *tex, int z, const DisplayRegion *dr,
Texture::Format format = tex->get_format(); Texture::Format format = tex->get_format();
switch (format) { switch (format) {
case Texture::F_depth_component:
case Texture::F_depth_stencil: case Texture::F_depth_stencil:
component_type = Texture::T_unsigned_int_24_8;
break;
case Texture::F_depth_component:
if (_current_properties->get_depth_bits() <= 8) { if (_current_properties->get_depth_bits() <= 8) {
component_type = Texture::T_unsigned_byte; component_type = Texture::T_unsigned_byte;
} else { } else if (_current_properties->get_depth_bits() <= 16) {
component_type = Texture::T_unsigned_short; component_type = Texture::T_unsigned_short;
} else {
component_type = Texture::T_float;
} }
break; break;
@ -9589,6 +9598,9 @@ do_extract_texture_data(CLP(TextureContext) *gtc) {
case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT:
#endif #endif
case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT16:
type = Texture::T_unsigned_short;
format = Texture::F_depth_component;
break;
case GL_DEPTH_COMPONENT24: case GL_DEPTH_COMPONENT24:
case GL_DEPTH_COMPONENT32: case GL_DEPTH_COMPONENT32:
type = Texture::T_float; type = Texture::T_float;
@ -9597,7 +9609,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc) {
#ifndef OPENGLES_2 #ifndef OPENGLES_2
case GL_DEPTH_STENCIL_EXT: case GL_DEPTH_STENCIL_EXT:
case GL_DEPTH24_STENCIL8_EXT: case GL_DEPTH24_STENCIL8_EXT:
type = Texture::T_float; type = Texture::T_unsigned_int_24_8;
format = Texture::F_depth_stencil; format = Texture::F_depth_stencil;
break; break;
#endif #endif