fixed compilation on Android & Linux

azhirnov · azhirnov · commit 0f1cda100e9e · 2020-09-07T19:24:20.000+03:00
diff --git a/Android/HelloAR/src/main/cpp/BackgroundRenderer.cc b/Android/HelloAR/src/main/cpp/BackgroundRenderer.cc
@@ -117,7 +117,7 @@ void BackgroundRenderer::Initialize(Diligent::IRenderDevice* pDevice)
         PipelineStateDesc&      PSODesc = PSOCreateInfo.PSODesc;
         PSODesc.Name                    = "Backround PSO";
 
-        PSODesc.IsComputePipeline                             = false;
+        PSODesc.PipelineType                                  = PIPELINE_TYPE_GRAPHICS;
         PSODesc.GraphicsPipeline.NumRenderTargets             = 1;
         PSODesc.GraphicsPipeline.RTVFormats[0]                = TEX_FORMAT_RGBA8_UNORM;
         PSODesc.GraphicsPipeline.PrimitiveTopology            = PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
diff --git a/Android/HelloAR/src/main/cpp/ObjectRenderer.cc b/Android/HelloAR/src/main/cpp/ObjectRenderer.cc
@@ -86,7 +86,7 @@ void ObjRenderer::Initialize(IRenderDevice* pDevice)
 
         PSODesc.Name = "Object rendering PSO";
 
-        PSODesc.IsComputePipeline                             = false;
+        PSODesc.PipelineType                                  = PIPELINE_TYPE_GRAPHICS;
         PSODesc.GraphicsPipeline.NumRenderTargets             = 1;
         PSODesc.GraphicsPipeline.RTVFormats[0]                = TEX_FORMAT_RGBA8_UNORM;
         PSODesc.GraphicsPipeline.DSVFormat                    = TEX_FORMAT_D24_UNORM_S8_UINT;
diff --git a/Android/HelloAR/src/main/cpp/PlaneRenderer.cc b/Android/HelloAR/src/main/cpp/PlaneRenderer.cc
@@ -70,7 +70,7 @@ void PlaneRenderer::Initialize(IRenderDevice* pDevice)
 
         PSODesc.Name = "Plane rendering PSO";
 
-        PSODesc.IsComputePipeline                                     = false;
+        PSODesc.PipelineType                                          = PIPELINE_TYPE_GRAPHICS;
         PSODesc.GraphicsPipeline.NumRenderTargets                     = 1;
         PSODesc.GraphicsPipeline.RTVFormats[0]                        = TEX_FORMAT_RGBA8_UNORM;
         PSODesc.GraphicsPipeline.DSVFormat                            = TEX_FORMAT_D24_UNORM_S8_UINT;
diff --git a/Android/HelloAR/src/main/cpp/PointCloudRenderer.cc b/Android/HelloAR/src/main/cpp/PointCloudRenderer.cc
@@ -112,7 +112,7 @@ void PointCloudRenderer::Initialize(IRenderDevice* pDevice)
 
         PSODesc.Name = "Point cloud PSO";
 
-        PSODesc.IsComputePipeline                                  = false;
+        PSODesc.PipelineType                                       = PIPELINE_TYPE_GRAPHICS;
         PSODesc.GraphicsPipeline.NumRenderTargets                  = 1;
         PSODesc.GraphicsPipeline.RTVFormats[0]                     = TEX_FORMAT_RGBA8_UNORM;
         PSODesc.GraphicsPipeline.DSVFormat                         = TEX_FORMAT_D24_UNORM_S8_UINT;
diff --git a/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp b/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp
@@ -235,7 +235,7 @@ class Tutorial00App
         PSODesc.Name = "Simple triangle PSO";
 
         // This is a graphics pipeline
-        PSODesc.IsComputePipeline = false;
+        PSODesc.PipelineType = PIPELINE_TYPE_GRAPHICS;
 
         // This tutorial will render to a single render target
         PSODesc.GraphicsPipeline.NumRenderTargets = 1;
