Browse Source

GCC 4.4 compatibility: more explicit std::reference_wrapper constructors.

Vladimír Vondruš 11 years ago
parent
commit
c08cfb8b1a
  1. 9
      src/Magnum/Test/TransformFeedbackGLTest.cpp

9
src/Magnum/Test/TransformFeedbackGLTest.cpp

@ -161,7 +161,8 @@ XfbShader::XfbShader() {
#else
/* ES for some reason needs both vertex and fragment shader */
CORRADE_INTERNAL_ASSERT_OUTPUT(frag.addSource("void main() {}\n").compile());
attachShaders({vert, frag});
/* GCC 4.4 has explicit std::reference_wrapper constructor */
attachShaders({std::ref(vert), std::ref(frag)});
#endif
bindAttributeLocation(Input::Location, "inputData");
setTransformFeedbackOutputs({"outputData"}, TransformFeedbackBufferMode::SeparateAttributes);
@ -260,7 +261,8 @@ XfbMultiShader::XfbMultiShader() {
#else
/* ES for some reason needs both vertex and fragment shader */
CORRADE_INTERNAL_ASSERT_OUTPUT(frag.addSource("void main() {}\n").compile());
attachShaders({vert, frag});
/* GCC 4.4 has explicit std::reference_wrapper constructor */
attachShaders({std::ref(vert), std::ref(frag)});
#endif
bindAttributeLocation(Input::Location, "inputData");
setTransformFeedbackOutputs({"output1", "output2"}, TransformFeedbackBufferMode::SeparateAttributes);
@ -375,7 +377,8 @@ void TransformFeedbackGLTest::interleaved() {
#else
/* ES for some reason needs both vertex and fragment shader */
CORRADE_INTERNAL_ASSERT_OUTPUT(frag.addSource("void main() {}\n").compile());
attachShaders({vert, frag});
/* GCC 4.4 has explicit std::reference_wrapper constructor */
attachShaders({std::ref(vert), std::ref(frag)});
#endif
bindAttributeLocation(Input::Location, "inputData");
setTransformFeedbackOutputs({"output1", "gl_SkipComponents1", "output2"}, TransformFeedbackBufferMode::InterleavedAttributes);

Loading…
Cancel
Save