mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 08:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in shader that was crashing OS in MacOSX.

Browse Source
This commit is contained in:
Jonathas Costa
2016-06-07 13:51:28 -04:00
parent f0b76267c4
commit dd51c71fb1
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderableplanet.cpp
+20 -20
View File
@@ -769,14 +769,14 @@ void RenderablePlanet::render(const RenderData& data)
// Atmosphere Data
if (_atmosphereEnabled) {
GLenum err;
while ((err = glGetError()) != GL_NO_ERROR) {
const GLubyte * errorString = gluErrorString(err);
std::stringstream ss;
ss << "Error setting up atmosphere framebuffer. OpenGL error: "
<< err << " - " << errorString << std::endl;
LERROR(ss.str());
}
// GLenum err;
// while ((err = glGetError()) != GL_NO_ERROR) {
// const GLubyte * errorString = gluErrorString(err);
// std::stringstream ss;
// ss << "Error setting up atmosphere framebuffer. OpenGL error: "
// << err << " - " << errorString << std::endl;
// LERROR(ss.str());
// }
// Object Space (in Km)
glm::mat4 obj2World = glm::translate(glm::mat4(1.0), data.position.vec3() / 1000.0f);
@@ -1156,12 +1156,12 @@ void RenderablePlanet::loadTexture() {
}
}
while ((err = glGetError()) != GL_NO_ERROR) {
const GLubyte * errString = gluErrorString(err);
std::stringstream ss;
ss << "Error after reading memory 4. OpenGL error: " << errString << std::endl;
LERROR(ss.str());
}
// while ((err = glGetError()) != GL_NO_ERROR) {
// const GLubyte * errString = gluErrorString(err);
// std::stringstream ss;
// ss << "Error after reading memory 4. OpenGL error: " << errString << std::endl;
// LERROR(ss.str());
// }
if (_hasCloudsTexture) {
_cloudsTexture = nullptr;
@@ -1176,12 +1176,12 @@ void RenderablePlanet::loadTexture() {
}
}
while ((err = glGetError()) != GL_NO_ERROR) {
const GLubyte * errString = gluErrorString(err);
std::stringstream ss;
ss << "Error after reading memory 5. OpenGL error: " << errString << std::endl;
LERROR(ss.str());
}
// while ((err = glGetError()) != GL_NO_ERROR) {
// const GLubyte * errString = gluErrorString(err);
// std::stringstream ss;
// ss << "Error after reading memory 5. OpenGL error: " << errString << std::endl;
// LERROR(ss.str());
// }
}
void RenderablePlanet::loadComputationPrograms() {