Commit 12a19938 authored by Jan Möbius's avatar Jan Möbius
Browse files

Reorder geometry shader code a bit

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17389 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b9db80e0
......@@ -707,16 +707,16 @@ int ShaderProgGenerator::checkForIncludes(QString _str, ShaderGenerator* _gen, Q
void ShaderProgGenerator::buildGeometryShader()
{
std::cerr << "TODO : buildGeometryShader" << std::endl;
delete geometry_;
// Only build a geometry shader if enabled
if ( !desc_.geometryShader )
return;
geometry_ = new ShaderGenerator();
std::cerr << "TODO : buildGeometryShader for object\n " << std::endl;
desc_.toString();
delete geometry_;
geometry_ = new ShaderGenerator();
geometry_->initGeometryShaderIO(&desc_);
......
......@@ -270,7 +270,7 @@ inline bool openGLVersion( const int _major, const int _minor ) {
// Read OpenGL Version string
std::string glVersionString = (const char*)glGetString(GL_VERSION);
// Use stringstream to pars
// Use string stream to parse
std::istringstream stream;
stream.str(glVersionString);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment