Skip to content
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

Jump to bottom

Update test config to run ogre 1.x tests in ign-rendering6 on macOS #407

Merged
merged 1 commit into from
Sep 15, 2021
Merged

Update test config to run ogre 1.x tests in ign-rendering6 on macOS #407

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 ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ namespace ignition
public: virtual void Destroy() override;

// Documentation inherited.
public: virtual bool IsRenderWindow() const;
public: virtual bool IsRenderWindow() const override;

// Documentation inherited.
public: virtual Ogre::TextureGpu *RenderTarget() const override;
Expand Down
1 change: 1 addition & 0 deletions ogre2/src/Ogre2DepthCamera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#ifdef __APPLE__
#define GL_SILENCE_DEPRECATION
#include <OpenGL/gl.h>
#else
#ifndef _WIN32
Expand Down
1 change: 1 addition & 0 deletions ogre2/src/Ogre2ThermalCamera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#ifdef __APPLE__
#define GL_SILENCE_DEPRECATION
#include <OpenGL/gl.h>
#else
#ifndef _WIN32
Expand Down
5 changes: 5 additions & 0 deletions test/test_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
#define RENDER_ENGINE_VALUES ::testing::ValuesIn(\
ignition::rendering::TestValues())

/// \todo(anyone) re-enable ogre2 test once ogre 2.2 works on macOS
#ifdef __APPLE__
static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
#else
static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
#endif

#include <vector>
#include <ignition/common/Util.hh>
Expand Down