Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing merge conflict

Browse source
This commit is contained in:
Brad Davis 2015-07-31 16:17:32 -07:00
parent aea07fe671
commit e8fafeb601
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/render-utils/src/main.cpp
View file

@ -252,7 +252,6 @@ void QTestWindow::draw() {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glViewport(0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio()); glViewport(0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio());
<<<<<<< HEAD
static std::once_flag once; static std::once_flag once;
std::call_once(once, [&]{ std::call_once(once, [&]{
testShaderBuild(Skybox_vert, Skybox_frag); testShaderBuild(Skybox_vert, Skybox_frag);
@ -293,8 +292,6 @@ void QTestWindow::draw() {
}); });
// renderText(); // renderText();
=======
>>>>>>> master
_context->swapBuffers(this); _context->swapBuffers(this);
glFinish(); glFinish();