TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2023-03-09 11:23:19 +01:00
commit 05436a749f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -1180,7 +1180,7 @@ write_class_details(ostream &out, Object *obj) {
out << "static void *Dtool_UpcastInterface_" << ClassName << "(PyObject *self, Dtool_PyTypedObject *requested_type) {\n";
out << " Dtool_PyTypedObject *type = DtoolInstance_TYPE(self);\n";
out << " if (type != &Dtool_" << ClassName << ") {\n";
out << " printf(\"" << ClassName << " ** Bad Source Type-- Requesting Conversion from %s to %s\\n\", Py_TYPE(self)->tp_name, requested_type->_PyType.tp_name); fflush(nullptr);\n";;
out << " printf(\"%s ** Bad Source Type-- Requesting Conversion from %s to %s\\n\", \"" << ClassName << "\", Py_TYPE(self)->tp_name, requested_type->_PyType.tp_name); fflush(nullptr);\n";
out << " return nullptr;\n";
out << " }\n";
out << "\n";

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

@ -848,7 +848,7 @@ reset() {
_supported_geom_rendering =
#ifndef OPENGLES
Geom::GR_render_mode_wireframe | Geom::GR_render_mode_point |
Geom::GR_render_mode_point |
#endif
Geom::GR_indexed_point |
Geom::GR_point | Geom::GR_point_uniform_size |
@ -857,6 +857,16 @@ reset() {
Geom::GR_line_strip |
Geom::GR_flat_last_vertex;
#ifndef OPENGLES
// Observed bug on PINEBOOK Pro: regular OpenGL 3.3 driver doesn't support
// wireframe mode, it just renders the solid mesh
// GL_RENDERER = Mali-T860 (Panfrost)
// GL_VERSION = 3.3 (Compatibility Profile) Mesa 22.3.6
if (_gl_vendor != "Panfrost") {
_supported_geom_rendering |= Geom::GR_render_mode_wireframe;
}
#endif
_supports_point_parameters = false;
#ifdef OPENGLES_1