Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
d4dab601
Commit
d4dab601
authored
Sep 15, 2017
by
Martin Schultz
Browse files
removed deprecated commands from core profile execution branch
parent
ea32b901
Changes
3
Hide whitespace changes
Inline
Side-by-side
libs_required/ACG/GL/IRenderer.cc
View file @
d4dab601
...
...
@@ -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
;
...
...
libs_required/ACG/GL/RenderObject.cc
View file @
d4dab601
...
...
@@ -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
;
...
...
widgets/glWidget/CursorPainter.cc
View file @
d4dab601
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment