main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit 6567ff558c - Show all commits

View File

@ -269,13 +269,12 @@ static void test_gpu_shader_ssbo_binding()
/* Build compute shader. */ /* Build compute shader. */
GPUShader *shader = GPU_shader_create_from_info_name("gpu_compute_ssbo_binding_test"); GPUShader *shader = GPU_shader_create_from_info_name("gpu_compute_ssbo_binding_test");
EXPECT_NE(shader, nullptr); EXPECT_NE(shader, nullptr);
GPU_shader_bind(shader);
/* Perform tests. */
EXPECT_EQ(0, GPU_shader_get_ssbo_binding(shader, "data0")); EXPECT_EQ(0, GPU_shader_get_ssbo_binding(shader, "data0"));
EXPECT_EQ(1, GPU_shader_get_ssbo_binding(shader, "data1")); EXPECT_EQ(1, GPU_shader_get_ssbo_binding(shader, "data1"));
/* Cleanup. */ /* Cleanup. */
GPU_shader_unbind();
GPU_shader_free(shader); GPU_shader_free(shader);
} }
GPU_TEST(gpu_shader_ssbo_binding) GPU_TEST(gpu_shader_ssbo_binding)