diff options
Diffstat (limited to 'Samples/CommonSrc/Render')
| -rw-r--r-- | Samples/CommonSrc/Render/Render_GL_Device.h | 5 | ||||
| -rw-r--r-- | Samples/CommonSrc/Render/Render_XmlSceneLoader.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Samples/CommonSrc/Render/Render_GL_Device.h b/Samples/CommonSrc/Render/Render_GL_Device.h index 88eaff4..7b65d4c 100644 --- a/Samples/CommonSrc/Render/Render_GL_Device.h +++ b/Samples/CommonSrc/Render/Render_GL_Device.h @@ -34,7 +34,6 @@ limitations under the License. #include <OpenGL/gl.h> #include <OpenGL/glext.h> #else -#define GL_GLEXT_PROTOTYPES #include <GL/gl.h> #include <GL/glext.h> #endif @@ -154,7 +153,7 @@ public: // Set a uniform (other than the standard matrices). It is undefined whether the // uniforms from one shader occupy the same space as those in other shaders - // (unless a buffer is used, then each buffer is independent). + // (unless a buffer is used, then each buffer is independent). virtual bool SetUniform(const char* name, int n, const float* v); virtual bool SetUniform4x4f(const char* name, const Matrix4f& m); @@ -185,7 +184,7 @@ class RenderDevice : public Render::RenderDevice GLuint CurrentFbo; const LightingParams* Lighting; - + public: RenderDevice(const RendererParams& p); diff --git a/Samples/CommonSrc/Render/Render_XmlSceneLoader.h b/Samples/CommonSrc/Render/Render_XmlSceneLoader.h index 694fc2e..4a5fecd 100644 --- a/Samples/CommonSrc/Render/Render_XmlSceneLoader.h +++ b/Samples/CommonSrc/Render/Render_XmlSceneLoader.h @@ -33,7 +33,8 @@ using namespace OVR::Render; #undef new #endif -#include "../../../3rdParty/TinyXml/tinyxml2.h" +#include <tinyxml2.h> +//#include "../../../3rdParty/TinyXml/tinyxml2.h" namespace OVR { namespace Render { |