Apply device limit of supported multi-sampling in ExampleBase and fix…

…ed initialization of rendering caps in debug layer.

examples/Cpp/ExampleBase/ExampleBase.cpp

@@ -249,7 +249,6 @@ ExampleBase::ExampleBase(
 :
  profilerObj_ { new LLGL::RenderingProfiler() },
  debuggerObj_ { new LLGL::RenderingDebugger() },
- samples_ { samples },
  profiler { *profilerObj_ }
 {
  // Set report callback to standard output
@@ -280,11 +279,17 @@ ExampleBase::ExampleBase(
  if (!debugger)
  debuggerObj_.reset();
 
+ // Apply device limits (not for GL, because we won't have a valid GL context until we create our first swap chain)
+ if (renderer->GetRendererID() == LLGL::RendererID::OpenGL)
+ samples_ = samples;
+ else
+ samples_ = std::min(samples, renderer->GetRenderingCaps().limits.maxColorBufferSamples);
+
  // Create swap-chain
  LLGL::SwapChainDescriptor swapChainDesc;
  {
  swapChainDesc.resolution = resolution;
- swapChainDesc.samples = samples;
+ swapChainDesc.samples = GetSampleCount();
  }
  swapChain = renderer->CreateSwapChain(swapChainDesc);
 

sources/Renderer/DebugLayer/DbgRenderSystem.cpp

@@ -40,6 +40,8 @@ DbgRenderSystem::DbgRenderSystem(RenderSystemPtr&& instance, RenderingProfiler*
  features_ { caps_.features },
  limits_ { caps_.limits }
 {
+ /* Initialize rendering capabilities from wrapped instance */
+ UpdateRenderingCaps();
 }
 
 /* ----- Swap-chain ----- */
@@ -49,13 +51,10 @@ SwapChain* DbgRenderSystem::CreateSwapChain(const SwapChainDescriptor& swapChain
  /* Create primary swap-chain */
  auto swapChainInstance = instance_->CreateSwapChain(swapChainDesc, surface);
 
+ /* Instantiate command queue if not done and update rendering capabilities from wrapped instance */
  if (!commandQueue_)
  {
- /* Store meta data about render system */
- SetRendererInfo(instance_->GetRendererInfo());
- SetRenderingCaps(instance_->GetRenderingCaps());
-
- /* Instantiate command queue */
+ UpdateRenderingCaps();
  commandQueue_ = MakeUnique<DbgCommandQueue>(*(instance_->GetCommandQueue()), profiler_, debugger_);
  }
 
@@ -1823,6 +1822,13 @@ void DbgRenderSystem::ReleaseDbg(HWObjectContainer<T>& cont, TBase& entry)
  cont.erase(&entry);
 }
 
+void DbgRenderSystem::UpdateRenderingCaps()
+{
+ /* Store meta data about render system */
+ SetRendererInfo(instance_->GetRendererInfo());
+ SetRenderingCaps(instance_->GetRenderingCaps());
+}
+
 
 } // /namespace LLGL
 

sources/Renderer/DebugLayer/DbgRenderSystem.h

@@ -106,6 +106,8 @@ class DbgRenderSystem final : public RenderSystem
 
  std::vector<ResourceViewDescriptor> GetResourceViewInstanceCopy(const ArrayView<ResourceViewDescriptor>& resourceViews);
 
+ void UpdateRenderingCaps();
+
  private:
 
  /* ----- Common objects ----- */