Browse Source

TravisCI: Try to fix the clang build

Panagiotis Christopoulos Charitos 8 years ago
parent
commit
5e947ce117
3 changed files with 5 additions and 4 deletions
  1. 1 2
      .travis.yml
  2. 4 1
      src/anki/gr/RenderGraph.cpp
  3. 0 1
      src/anki/gr/RenderGraph.h

+ 1 - 2
.travis.yml

@@ -20,12 +20,11 @@ addons:
   apt:
     sources:
       - sourceline: 'ppa:ubuntu-toolchain-r/test'
-      - sourceline: 'ppa:jonathonf/llvm'
       - sourceline: 'ppa:graphics-drivers/ppa'
     packages:
       - cmake
       - g++-6
-      - clang-3.7
+      - clang-3.5
       - libvulkan-dev
       - libegl1-mesa-dev
 

+ 4 - 1
src/anki/gr/RenderGraph.cpp

@@ -128,6 +128,8 @@ void GraphicsRenderPassFramebufferInfo::bake()
 
 	m_hash = 0;
 
+	ANKI_ASSERT(m_fbInitInfo.m_colorAttachmentCount > 0 || !!m_fbInitInfo.m_depthStencilAttachment.m_aspect);
+
 	// First the depth attachments
 	if(m_fbInitInfo.m_colorAttachmentCount)
 	{
@@ -329,7 +331,8 @@ FramebufferPtr RenderGraph::getOrCreateFramebuffer(
 
 		fb = getManager().newInstance<Framebuffer>(fbInit);
 
-		m_fbCache.emplace(getAllocator(), fb);
+		// TODO: Check why the hell it compiles if you remove the parameter "hash"
+		m_fbCache.emplace(getAllocator(), hash, fb);
 	}
 
 	return fb;

+ 0 - 1
src/anki/gr/RenderGraph.h

@@ -307,7 +307,6 @@ public:
 			m_alloc.deleteInstance(pass);
 		}
 		m_passes.destroy(m_alloc);
-
 		m_renderTargets.destroy(m_alloc);
 	}