Skip to content

Fix OpenGL 3.3 detection and compilation on macOS #242

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
nschimme wants to merge 1 commit into from
Closed

Fix OpenGL 3.3 detection and compilation on macOS #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ if(Qt6OpenGL_FOUND)
OUTPUT_VARIABLE OUTPUT)
file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckQtOpenGL33.cpp
"#include <QOpenGLFunctions_3_3_Core>
#ifndef GL_QUADS
#ifndef GL_TRIANGLES
# error
#endif
int main(int argc, char** argv) { return 0; }")
Expand Down
7 changes: 7 additions & 0 deletions src/opengl/OpenGLTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
#include <QOpenGLTexture>
#include <qopengl.h>

#ifndef GL_QUADS
#define GL_QUADS 0x0007
#endif
#ifndef GL_POINT_SPRITE
#define GL_POINT_SPRITE 0x8861
#endif

struct NODISCARD Viewport final
{
glm::ivec2 offset{};
Expand Down
Loading