Browse Source

GL: properly specify Buffer target hints for tests on WebGL.

pull/299/head
Vladimír Vondruš 8 years ago
parent
commit
816869fc88
  1. 4
      src/Magnum/GL/Test/MeshGLTest.cpp
  2. 2
      src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp
  3. 22
      src/Magnum/GL/Test/TransformFeedbackGLTest.cpp

4
src/Magnum/GL/Test/MeshGLTest.cpp

@ -1982,7 +1982,7 @@ template<class T> void MeshGLTest::setIndexBufferTransferOwnership() {
"setIndexBufferTransferOwnership<Magnum::MeshIndexType>");
const UnsignedShort data = 0;
Buffer buffer;
Buffer buffer{Buffer::TargetHint::ElementArray};
buffer.setData({&data, 1}, BufferUsage::StaticDraw);
const GLuint id = buffer.id();
@ -2015,7 +2015,7 @@ template<class T> void MeshGLTest::setIndexBufferRangeTransferOwnership() {
"setIndexBufferRangeTransferOwnership<Magnum::MeshIndexType>");
const UnsignedShort data = 0;
Buffer buffer;
Buffer buffer{Buffer::TargetHint::ElementArray};
buffer.setData({&data, 1}, BufferUsage::StaticDraw);
const GLuint id = buffer.id();

2
src/Magnum/GL/Test/PrimitiveQueryGLTest.cpp

@ -290,7 +290,7 @@ void PrimitiveQueryGLTest::transformFeedbackPrimitivesWritten() {
}
} shader;
Buffer output;
Buffer output{Buffer::TargetHint::TransformFeedback};
output.setData({nullptr, 9*sizeof(Vector2)}, BufferUsage::StaticDraw);
Mesh mesh;

22
src/Magnum/GL/Test/TransformFeedbackGLTest.cpp

@ -276,9 +276,9 @@ void TransformFeedbackGLTest::attachBase() {
XfbShader shader;
Buffer input;
Buffer input{Buffer::TargetHint::Array};
input.setData(inputData, BufferUsage::StaticDraw);
Buffer output;
Buffer output{Buffer::TargetHint::TransformFeedback};
output.setData({nullptr, 2*sizeof(Vector2)}, BufferUsage::StaticRead);
Mesh mesh;
@ -323,9 +323,9 @@ void TransformFeedbackGLTest::attachRange() {
XfbShader shader;
Buffer input;
Buffer input{Buffer::TargetHint::Array};
input.setData(inputData, BufferUsage::StaticDraw);
Buffer output;
Buffer output{Buffer::TargetHint::TransformFeedback};
output.setData({nullptr, 512 + 2*sizeof(Vector2)}, BufferUsage::StaticRead);
Mesh mesh;
@ -416,9 +416,10 @@ void TransformFeedbackGLTest::attachBases() {
XfbMultiShader shader;
Buffer input;
Buffer input{Buffer::TargetHint::Array};
input.setData(inputData, BufferUsage::StaticDraw);
Buffer output1, output2;
Buffer output1{Buffer::TargetHint::TransformFeedback},
output2{Buffer::TargetHint::TransformFeedback};
output1.setData({nullptr, 2*sizeof(Vector2)}, BufferUsage::StaticRead);
output2.setData({nullptr, 2*sizeof(Float)}, BufferUsage::StaticRead);
@ -467,9 +468,10 @@ void TransformFeedbackGLTest::attachRanges() {
fb.attachRenderbuffer(Framebuffer::ColorAttachment{0}, color)
.bind();
Buffer input;
Buffer input{Buffer::TargetHint::Array};
input.setData(inputData, BufferUsage::StaticDraw);
Buffer output1, output2;
Buffer output1{Buffer::TargetHint::TransformFeedback},
output2{Buffer::TargetHint::TransformFeedback};
output1.setData({nullptr, 512 + 2*sizeof(Vector2)}, BufferUsage::StaticRead);
output2.setData({nullptr, 768 + 2*sizeof(Float)}, BufferUsage::StaticRead);
@ -552,9 +554,9 @@ void TransformFeedbackGLTest::interleaved() {
}
} shader;
Buffer input;
Buffer input{Buffer::TargetHint::Array};
input.setData(inputData, BufferUsage::StaticDraw);
Buffer output;
Buffer output{Buffer::TargetHint::TransformFeedback};
output.setData({nullptr, 4*sizeof(Vector2)}, BufferUsage::StaticRead);
Mesh mesh;

Loading…
Cancel
Save