Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix backend tests

Browse Source 
The pipeline layout wasn't set properly
This commit is contained in:
Mathias Agopian
2024-06-24 22:08:02 -07:00
parent 80f151ccf7
commit a0dc7104b6
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filament/backend/test/test_Blit.cpp
+1 -1
View File
@@ -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;
filament/backend/test/test_BufferUpdates.cpp
+3 -3
View File
@@ -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;
filament/backend/test/test_FeedbackLoops.cpp
+1 -1
View File
@@ -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);
filament/backend/test/test_LoadImage.cpp
+8 -4
View File
@@ -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);
filament/backend/test/test_RenderExternalImage.cpp
+2 -2
View File
@@ -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;