Skip to content

Better support for MacOS and arm64 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DavJCosby wants to merge 2 commits into from
Closed

Better support for MacOS and arm64 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fbb6c0
Disabled intel intrinsics for arm64 architectures
DavJCosby Jan 28, 2025
e8a259a
Manually reimplemnted gluErrorString() for unsupporting apple devices
DavJCosby Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cyCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <type_traits>
#include <limits>

#if !defined(CY_NO_INTRIN_H) && !defined(CY_NO_EMMINTRIN_H) && !defined(CY_NO_IMMINTRIN_H)
#if !defined(CY_NO_INTRIN_H) && !defined(CY_NO_EMMINTRIN_H) && !defined(CY_NO_IMMINTRIN_H) && !defined(__aarch64__)
# include <immintrin.h>
#endif

Expand Down
32 changes: 31 additions & 1 deletion cyGL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,37 @@ inline void GL::CheckError( char const *sourcefile, int line, char const *call,
while ( (error = glGetError()) != GL_NO_ERROR) {
*outStream << "OpenGL ERROR: " << sourcefile << " (line " << line << "): ";
if ( call ) *outStream << call << " triggered ";
// gluErrorString() is deprecated and appears to not work on Apple devices.
#if !defined(__APPLE__)
*outStream << gluErrorString(error) << std::endl;
#else
// Manually reimplements these error messages as I've found them described here:
// https://github.com/gustafsson/freq/blob/master/lib/gpumisc/gluerrorstring.cpp
switch(error) {
case GL_NO_ERROR: *outStream << "GL_NO_ERROR: No error has been recorded" << std::endl;

case GL_INVALID_ENUM: *outStream << "GL_INVALID_ENUM: An unacceptable value is specified for an enumerated argument. The offending command is ignored and has no other side effect than to set the error flag" << std::endl;

case GL_INVALID_VALUE: *outStream << "GL_INVALID_VALUE: A numeric argument is out of range. The offending command is ignored and has no other side effect than to set the error flag" << std::endl;

case GL_INVALID_OPERATION: *outStream << "GL_INVALID_OPERATION: The specified operation is not allowed in the current state. The offending command is ignored and has no other side effect than to set the error flag" << std::endl;

#ifdef LEGACY_OPENGL
case GL_STACK_OVERFLOW: *outStream << "GL_STACK_OVERFLOW: An attempt has been made to perform an operation that would cause an internal stack to overflow" << std::endl;

case GL_STACK_UNDERFLOW: *outStream << "GL_STACK_UNDERFLOW: An attempt has been made to perform an operation that would cause an internal stack to underflow" << std::endl;
#endif

case GL_OUT_OF_MEMORY: *outStream << "GL_OUT_OF_MEMORY: There is not enough memory left to execute the command. The state of the GL is undefined, except for the state of the error flags, after this error is recorded" << std::endl;

case GL_INVALID_FRAMEBUFFER_OPERATION: *outStream << "GL_INVALID_FRAMEBUFFER_OPERATION: The framebuffer object is not complete. The offending command is ignored and has no other side effect than to set the error flag" << std::endl;

#ifdef ARB_KHR_robustness
// https://www.opengl.org/wiki/OpenGL_Error
case GL_CONTEXT_LOST: *outStream << "GL_CONTEXT_LOST: Given if the OpenGL context has been lost, due to a graphics card reset" << std::endl;
#endif
}
#endif
}
}

Expand Down Expand Up @@ -1787,4 +1817,4 @@ typedef cy::GLSLShader cyGLSLShader; //!< GLSL shader class
typedef cy::GLSLProgram cyGLSLProgram; //!< GLSL program class

//-------------------------------------------------------------------------------
#endif
#endif