TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix RTM_copy_ram for multiview textures

Browse Source
This commit is contained in:
rdb 2019-11-10 19:09:31 +01:00
parent 6fd662335d
commit cb01d45eb6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7196,15 +7196,21 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z,
z_size = 1; z_size = 1;
} }
int num_views = tex->get_num_views();
if (tex->get_x_size() != w || tex->get_y_size() != h || if (tex->get_x_size() != w || tex->get_y_size() != h ||
tex->get_z_size() != z_size || tex->get_z_size() != z_size ||
tex->get_component_type() != component_type || tex->get_component_type() != component_type ||
tex->get_format() != format || tex->get_format() != format ||
tex->get_texture_type() != texture_type) { tex->get_texture_type() != texture_type ||
view >= num_views) {
// Re-setup the texture; its properties have changed. tex->setup_texture(texture_type, w, h, z_size, component_type, format);
tex->setup_texture(texture_type, w, h, z_size,
component_type, format); // The above resets the number of views to 1, so set this back.
num_views = std::max(view + 1, num_views);
if (num_views > 1) {
tex->set_num_views(num_views);
}
} }
nassertr(z < tex->get_z_size(), false); nassertr(z < tex->get_z_size(), false);
@ -7276,6 +7282,7 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z,
} }
if (view > 0) { if (view > 0) {
image_ptr += (view * tex->get_z_size()) * image_size; image_ptr += (view * tex->get_z_size()) * image_size;
nassertr(view < tex->get_num_views(), false);
} }
} }