From a0dc7104b67ed67edbdc6dce2ff208f2da7130b7 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 24 Jun 2024 22:07:24 -0700 Subject: [PATCH] fix backend tests The pipeline layout wasn't set properly --- filament/backend/test/test_Blit.cpp | 2 +- filament/backend/test/test_BufferUpdates.cpp | 6 +++--- filament/backend/test/test_FeedbackLoops.cpp | 2 +- filament/backend/test/test_LoadImage.cpp | 12 ++++++++---- filament/backend/test/test_RenderExternalImage.cpp | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/filament/backend/test/test_Blit.cpp b/filament/backend/test/test_Blit.cpp index b71f263ba2..8ba0be44c9 100644 --- a/filament/backend/test/test_Blit.cpp +++ b/filament/backend/test/test_Blit.cpp @@ -402,7 +402,7 @@ TEST_F(BackendTest, ColorResolve) { PipelineState state = {}; state.program = program; - state.pipelineLayout.setLayout = { descriptorSetLayout }; + state.pipelineLayout.setLayout[1] = { descriptorSetLayout }; state.rasterState.colorWrite = true; state.rasterState.depthWrite = false; state.rasterState.depthFunc = RasterState::DepthFunc::A; diff --git a/filament/backend/test/test_BufferUpdates.cpp b/filament/backend/test/test_BufferUpdates.cpp index 96e1026d59..bcaa2fc21a 100644 --- a/filament/backend/test/test_BufferUpdates.cpp +++ b/filament/backend/test/test_BufferUpdates.cpp @@ -129,7 +129,7 @@ TEST_F(BackendTest, VertexBufferUpdate) { PipelineState state; state.program = program; - state.pipelineLayout.setLayout = { descriptorSetLayout }; + state.pipelineLayout.setLayout[1] = { descriptorSetLayout }; state.rasterState.colorWrite = true; state.rasterState.depthWrite = false; state.rasterState.depthFunc = RasterState::DepthFunc::A; @@ -280,7 +280,7 @@ TEST_F(BackendTest, BufferObjectUpdateWithOffset) { params.flags.discardEnd = TargetBufferFlags::NONE; params.viewport.height = 512; params.viewport.width = 512; - renderTriangle({ descriptorSetLayout }, + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, renderTarget, swapChain, program, params); // Upload uniforms for the second triangle. To test partial buffer updates, we'll only update @@ -301,7 +301,7 @@ TEST_F(BackendTest, BufferObjectUpdateWithOffset) { params.flags.clear = TargetBufferFlags::NONE; params.flags.discardStart = TargetBufferFlags::NONE; - renderTriangle({ descriptorSetLayout }, + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, renderTarget, swapChain, program, params); static const uint32_t expectedHash = 91322442; diff --git a/filament/backend/test/test_FeedbackLoops.cpp b/filament/backend/test/test_FeedbackLoops.cpp index c483d92799..8d49ef2acd 100644 --- a/filament/backend/test/test_FeedbackLoops.cpp +++ b/filament/backend/test/test_FeedbackLoops.cpp @@ -225,7 +225,7 @@ TEST_F(BackendTest, FeedbackLoops) { state.rasterState.depthWrite = false; state.rasterState.depthFunc = RasterState::DepthFunc::A; state.program = program; - state.pipelineLayout.setLayout = { descriptorSetLayout }; + state.pipelineLayout.setLayout[1] = { descriptorSetLayout }; api.makeCurrent(swapChain, swapChain); api.beginFrame(0, 0, 0); diff --git a/filament/backend/test/test_LoadImage.cpp b/filament/backend/test/test_LoadImage.cpp index cf140b065b..c5946cd229 100644 --- a/filament/backend/test/test_LoadImage.cpp +++ b/filament/backend/test/test_LoadImage.cpp @@ -352,7 +352,8 @@ TEST_F(BackendTest, UpdateImage2D) { api.bindDescriptorSet(descriptorSet, 1, {}); - renderTriangle({ descriptorSetLayout }, defaultRenderTarget, swapChain, program); + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, + defaultRenderTarget, swapChain, program); readPixelsAndAssertHash(t.name, 512, 512, defaultRenderTarget, expectedHash); @@ -446,7 +447,8 @@ TEST_F(BackendTest, UpdateImageSRGB) { api.bindDescriptorSet(descriptorSet, 1, {}); - renderTriangle({ descriptorSetLayout }, defaultRenderTarget, swapChain, program); + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, + defaultRenderTarget, swapChain, program); static const uint32_t expectedHash = 359858623; readPixelsAndAssertHash("UpdateImageSRGB", 512, 512, defaultRenderTarget, expectedHash); @@ -524,7 +526,8 @@ TEST_F(BackendTest, UpdateImageMipLevel) { api.bindDescriptorSet(descriptorSet, 1, {}); - renderTriangle({ descriptorSetLayout }, defaultRenderTarget, swapChain, program); + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, + defaultRenderTarget, swapChain, program); static const uint32_t expectedHash = 3644679986; readPixelsAndAssertHash("UpdateImageMipLevel", 512, 512, defaultRenderTarget, expectedHash); @@ -614,7 +617,8 @@ TEST_F(BackendTest, UpdateImage3D) { api.bindDescriptorSet(descriptorSet, 1, {}); - renderTriangle({ descriptorSetLayout }, defaultRenderTarget, swapChain, program); + renderTriangle({{ DescriptorSetLayoutHandle{}, descriptorSetLayout }}, + defaultRenderTarget, swapChain, program); static const uint32_t expectedHash = 3644679986; readPixelsAndAssertHash("UpdateImage3D", 512, 512, defaultRenderTarget, expectedHash); diff --git a/filament/backend/test/test_RenderExternalImage.cpp b/filament/backend/test/test_RenderExternalImage.cpp index 08e94c737d..57e138dea1 100644 --- a/filament/backend/test/test_RenderExternalImage.cpp +++ b/filament/backend/test/test_RenderExternalImage.cpp @@ -116,7 +116,7 @@ TEST_F(BackendTest, RenderExternalImageWithoutSet) { PipelineState state; state.program = program; - state.pipelineLayout.setLayout = { descriptorSetLayout }; + state.pipelineLayout.setLayout[1] = { descriptorSetLayout }; state.rasterState.colorWrite = true; state.rasterState.depthWrite = false; state.rasterState.depthFunc = RasterState::DepthFunc::A; @@ -247,7 +247,7 @@ TEST_F(BackendTest, RenderExternalImage) { PipelineState state; state.program = program; - state.pipelineLayout.setLayout = { descriptorSetLayout }; + state.pipelineLayout.setLayout[1] = { descriptorSetLayout }; state.rasterState.colorWrite = true; state.rasterState.depthWrite = false; state.rasterState.depthFunc = RasterState::DepthFunc::A;