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-Free
Commits
f2431647
Commit
f2431647
authored
Feb 22, 2016
by
Christopher Tenter
Browse files
disable instancing when deactivating a vertex declaration
parent
2a42b5a5
Pipeline
#893
passed with stage
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
ACG/GL/VertexDeclaration.cc
View file @
f2431647
...
@@ -486,8 +486,16 @@ void VertexDeclaration::deactivateShaderPipeline( GLSL::Program* _prog ) const
...
@@ -486,8 +486,16 @@ void VertexDeclaration::deactivateShaderPipeline( GLSL::Program* _prog ) const
int
loc
=
_prog
->
getAttributeLocation
(
pElem
->
shaderInputName_
);
int
loc
=
_prog
->
getAttributeLocation
(
pElem
->
shaderInputName_
);
if
(
loc
!=
-
1
)
if
(
loc
!=
-
1
)
{
glDisableVertexAttribArray
(
loc
);
glDisableVertexAttribArray
(
loc
);
if
(
supportsInstancedArrays
()
&&
pElem
->
divisor_
)
{
#ifdef GL_ARB_instanced_arrays
glVertexAttribDivisor
(
loc
,
0
);
#endif
}
}
}
}
}
}
...
...
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