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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2021-02-06 19:36:39 +01:00
commit 64f0414f57
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
panda/src/glstuff/glGeomMunger_src.cxx
View File

@ -13,6 +13,12 @@
#include "dcast.h"
#ifdef OPENGLES
#include <atomic>
static std::atomic_flag warned_downgrade_float64 = ATOMIC_FLAG_INIT;
#endif
TypeHandle CLP(GeomMunger)::_type_handle;
ALLOC_DELETED_CHAIN_DEF(CLP(GeomMunger));
@ -102,6 +108,7 @@ munge_format_impl(const GeomVertexFormat *orig,
(InternalName::get_vertex(), 3, NT_int16,
C_point, vertex_type->get_start(), vertex_type->get_column_alignment());
}
#endif // !OPENGLES
// Convert packed formats that OpenGL may not understand.
for (size_t i = 0; i < orig->get_num_columns(); ++i) {
@ -123,8 +130,25 @@ munge_format_impl(const GeomVertexFormat *orig,
column->get_contents(), column->get_start(),
column->get_column_alignment());
}
#ifdef OPENGLES
else if (column->get_numeric_type() == NT_float64) {
if (!warned_downgrade_float64.test_and_set()) {
GLCAT.warning()
<< "OpenGL ES does not support 64-bit floats; converting vertex data to 32-bit.\n";
#ifndef NDEBUG
if (vertices_float64) {
GLCAT.warning()
<< "You may want to disable vertices-float64 for better performance.\n";
}
#endif
}
PT(GeomVertexArrayFormat) array_format = new_format->modify_array(array);
array_format->add_column(column->get_name(), column->get_num_components(),
NT_float32, column->get_contents(),
column->get_start(), column->get_column_alignment());
}
#endif
}
#endif // !OPENGLES
const GeomVertexColumn *color_type = orig->get_color_column();
if (color_type != nullptr &&
@ -288,6 +312,7 @@ premunge_format_impl(const GeomVertexFormat *orig) {
(InternalName::get_vertex(), 3, NT_int16,
C_point, vertex_type->get_start(), vertex_type->get_column_alignment());
}
#endif // !OPENGLES
// Convert packed formats that OpenGL may not understand.
for (size_t i = 0; i < orig->get_num_columns(); ++i) {
@ -309,8 +334,25 @@ premunge_format_impl(const GeomVertexFormat *orig) {
column->get_contents(), column->get_start(),
column->get_column_alignment());
}
#ifdef OPENGLES
else if (column->get_numeric_type() == NT_float64) {
if (!warned_downgrade_float64.test_and_set()) {
GLCAT.warning()
<< "OpenGL ES does not support 64-bit floats; converting vertex data to 32-bit.\n";
#ifndef NDEBUG
if (vertices_float64) {
GLCAT.warning()
<< "You may want to disable vertices-float64 for better performance.\n";
}
#endif
}
PT(GeomVertexArrayFormat) array_format = new_format->modify_array(array);
array_format->add_column(column->get_name(), column->get_num_components(),
NT_float32, column->get_contents(),
column->get_start(), column->get_column_alignment());
}
#endif
}
#endif // !OPENGLES
CPT(GeomVertexFormat) format = GeomVertexFormat::register_format(new_format);

4
pandatool/src/deploy-stub/deploy-stub.c
View File

@ -672,12 +672,12 @@ int main(int argc, char *argv[]) {
}
if (log_filename != NULL) {
char log_filename_buf[PATH_MAX];
char log_filename_buf[4096];
if (blobinfo.flags & F_log_filename_strftime) {
log_filename_buf[0] = 0;
time_t now = time(NULL);
if (strftime(log_filename_buf, sizeof(log_filename_buf), log_filename, localtime(&now)) > 0) {
log_filename = &log_filename_buf;
log_filename = log_filename_buf;
}
}
setup_logging(log_filename, (blobinfo.flags & F_log_append) != 0);