Commit d4dab601 authored by Martin Schultz's avatar Martin Schultz
Browse files

removed deprecated commands from core profile execution branch

parent ea32b901
......@@ -648,12 +648,13 @@ void IRenderer::prepareRenderingPipeline(ACG::GLState* _glState, ACG::SceneGraph
// save active fbo and viewport
saveInputFbo();
if(_glState->compatibilityProfile())
{
// get global ambient factor
GLfloat lightModelAmbient[4];
glGetFloatv(GL_LIGHT_MODEL_AMBIENT, lightModelAmbient);
globalLightModelAmbient_ = ACG::Vec3f(lightModelAmbient[0], lightModelAmbient[1], lightModelAmbient[2]);
}
// search list of render object for objects requiring the scene depth map
bool requiresSceneDepths = false;
......
......@@ -125,7 +125,8 @@ void RenderObject::initFromState( GLState* _glState )
pointSize = _glState->point_size();
}
if(_glState->compatibilityProfile())
{
// get texcoord generation params
if (glIsEnabled(GL_TEXTURE_GEN_Q))
shaderDesc.texGenDim = 4;
......@@ -135,7 +136,7 @@ void RenderObject::initFromState( GLState* _glState )
shaderDesc.texGenDim = 2;
else if (glIsEnabled(GL_TEXTURE_GEN_S))
shaderDesc.texGenDim = 1;
}
if (shaderDesc.texGenDim)
{
GLint genMode = 0;
......
......@@ -117,8 +117,11 @@ void CursorPainter::initializeGL()
glGenTextures (1, &texture_);
ACG::GLState::bindTexture (GL_TEXTURE_2D, texture_);
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
if(!OpenFlipper::Options::coreProfile())
{
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
}
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
ACG::GLState::bindTexture (GL_TEXTURE_2D, 0);
......
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