From 6ad68d95cbe4b20e4cb138939724e1b5708c4f0f Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 27 Sep 2022 22:26:08 +0300 Subject: [PATCH 1/2] device: Fix missing init_type for InputDeviceNode --- panda/src/device/config_device.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/panda/src/device/config_device.cxx b/panda/src/device/config_device.cxx index f06c91422d..4eab1ee1ef 100644 --- a/panda/src/device/config_device.cxx +++ b/panda/src/device/config_device.cxx @@ -23,6 +23,7 @@ #include "dialNode.h" #include "evdevInputDevice.h" #include "inputDevice.h" +#include "inputDeviceNode.h" #include "linuxJoystickDevice.h" #include "trackerNode.h" #include "virtualMouse.h" @@ -68,6 +69,7 @@ init_libdevice() { ClientTrackerDevice::init_type(); DialNode::init_type(); InputDevice::init_type(); + InputDeviceNode::init_type(); TrackerNode::init_type(); VirtualMouse::init_type(); From f6fac95a782b7e0a130401a95cca556706a735ea Mon Sep 17 00:00:00 2001 From: DJs3000 Date: Thu, 8 Sep 2022 04:06:43 +0300 Subject: [PATCH 2/2] Added e2k support (MCST Elbrus 2000) (#1367) Closes #1367 --- dtool/src/dtoolbase/dtool_platform.h | 3 +++ panda/src/glstuff/glGraphicsStateGuardian_src.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dtool/src/dtoolbase/dtool_platform.h b/dtool/src/dtoolbase/dtool_platform.h index 3f32e2d238..ad2f85767f 100644 --- a/dtool/src/dtoolbase/dtool_platform.h +++ b/dtool/src/dtoolbase/dtool_platform.h @@ -79,6 +79,9 @@ #elif defined(__ppc__) #define DTOOL_PLATFORM "linux_ppc" + +#elif defined(__e2k__) +#define DTOOL_PLATFORM "linux_e2k" #endif #if !defined(DTOOL_PLATFORM) && !defined(CPPPARSER) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h index b56cbf1774..d9c8ab3265 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.h +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h @@ -55,7 +55,7 @@ typedef double GLdouble; // mainly because they will not be included from glext.h if the system GL // version matches or exceeds the GL version in which these functions are // defined, and the system gl.h sometimes doesn't declare these typedefs. -#if !defined( __EDG__ ) || defined( __INTEL_COMPILER ) // Protect the following from the Tau instrumentor and expose it for the intel compiler. +#if !defined( __EDG__ ) || defined( __INTEL_COMPILER ) || defined( __MCST__ ) // Protect the following from the Tau instrumentor and expose it for the intel compiler. typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); typedef void (APIENTRY *GLDEBUGPROC_P)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam); typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC_P) (GLDEBUGPROC_P callback, const void *userParam);