griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Fix shader builder on hardware that does not have all features

Browse Source
This commit is contained in:
Clément Foucault
2022-07-15 11:03:42 +02:00
parent 862170c0b1
commit 98f688ac42
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/intern/gpu_shader_create_info.cc
View File

@@ -333,8 +333,11 @@ bool gpu_shader_create_info_compile_all()
int skipped = 0;
int total = 0;
for (ShaderCreateInfo *info : g_create_infos->values()) {
info->finalize();
if (info->do_static_compilation_) {
if (GPU_compute_shader_support() == false && info->compute_source_ != nullptr) {
if ((GPU_compute_shader_support() == false && info->compute_source_ != nullptr) ||
(GPU_shader_image_load_store_support() == false && info->has_resource_image()) ||
(GPU_shader_storage_buffer_objects_support() == false && info->has_resource_storage())) {
skipped++;
continue;
}

25
source/blender/gpu/intern/gpu_shader_create_info.hh
View File

@@ -872,6 +872,31 @@ struct ShaderCreateInfo {
return stream;
}
bool has_resource_type(Resource::BindType bind_type) const
{
for (auto &res : batch_resources_) {
if (res.bind_type == bind_type) {
return true;
}
}
for (auto &res : pass_resources_) {
if (res.bind_type == bind_type) {
return true;
}
}
return false;
}
bool has_resource_image() const
{
return has_resource_type(Resource::BindType::IMAGE);
}
bool has_resource_storage() const
{
return has_resource_type(Resource::BindType::STORAGE_BUFFER);
}
/** \} */
#undef TEST_EQUAL