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

Configurability fixups per code review.

Browse Source
This commit is contained in:
Philip Rideout
2019-03-27 08:37:43 -07:00
parent 5090fe6395
commit 0076de25fa
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filament/backend/include/backend/DriverEnums.h
View File

@@ -46,6 +46,9 @@ static constexpr size_t MAX_ATTRIBUTE_BUFFER_COUNT = 8; // FIXME: what should th
static constexpr size_t MAX_VERTEX_ATTRIBUTE_COUNT = 7; // FIXME: what should this be?
static constexpr size_t MAX_SAMPLER_COUNT = 16; // Matches the Adreno Vulkan driver.
static constexpr size_t CONFIG_UNIFORM_BINDING_COUNT = 6;
static constexpr size_t CONFIG_SAMPLER_BINDING_COUNT = 6;
/**
* Selects which driver a particular Engine should use.
*/

6
filament/backend/include/private/backend/Program.h
View File

@@ -21,7 +21,7 @@
#include <utils/CString.h>
#include <utils/Log.h>
#include <private/filament/EngineEnums.h>
#include <backend/DriverEnums.h>
#include <array>
#include <vector>
@@ -33,8 +33,8 @@ class Program {
public:
static constexpr size_t SHADER_TYPE_COUNT = 2;
static constexpr size_t UNIFORM_BINDING_COUNT = filament::CONFIG_UNIFORM_BINDING_COUNT;
static constexpr size_t SAMPLER_BINDING_COUNT = filament::CONFIG_SAMPLER_BINDING_COUNT;
static constexpr size_t UNIFORM_BINDING_COUNT = CONFIG_UNIFORM_BINDING_COUNT;
static constexpr size_t SAMPLER_BINDING_COUNT = CONFIG_SAMPLER_BINDING_COUNT;
enum class Shader : uint8_t {
VERTEX = 0,

10
filament/backend/src/vulkan/VulkanBinder.h
View File

@@ -22,6 +22,8 @@
#include <private/backend/Program.h>
#include <bluevk/BlueVK.h>
#include <utils/compiler.h>
#include <utils/Hash.h>
#include <tsl/robin_map.h>
@@ -166,8 +168,7 @@ private:
// The pipeline key is a POD that represents all currently bound states that form the immutable
// VkPipeline object. We apply a hash function to its contents only if has been mutated since
// the previous call to getOrCreatePipeline.
#pragma pack(push, 1)
struct PipelineKey {
struct UTILS_PACKED PipelineKey {
VkShaderModule shaders[SHADER_MODULE_COUNT]; // 8*2 bytes
RasterState rasterState; // 248 bytes
VkRenderPass renderPass; // 8 bytes
@@ -175,7 +176,6 @@ private:
VkVertexInputAttributeDescription vertexAttributes[VERTEX_ATTRIBUTE_COUNT]; // 16*5 bytes
VkVertexInputBindingDescription vertexBuffers[VERTEX_ATTRIBUTE_COUNT]; // 12*5 bytes
};
#pragma pack(pop)
static_assert(std::is_pod<PipelineKey>::value, "PipelineKey must be a POD for fast hashing.");
@@ -199,14 +199,12 @@ private:
// The descriptor key is a POD that represents all currently bound states that go into the
// descriptor set. We apply a hash function to its contents only if has been mutated since
// the previous call to getOrCreateDescriptor.
#pragma pack(push, 1)
struct DescriptorKey {
struct UTILS_PACKED DescriptorKey {
VkBuffer uniformBuffers[UBUFFER_BINDING_COUNT];
VkDescriptorImageInfo samplers[SAMPLER_BINDING_COUNT];
VkDeviceSize uniformBufferOffsets[UBUFFER_BINDING_COUNT];
VkDeviceSize uniformBufferSizes[UBUFFER_BINDING_COUNT];
};
#pragma pack(pop)
static_assert(std::is_pod<DescriptorKey>::value, "DescriptorKey must be a POD.");

3
libs/filabridge/include/private/filament/EngineEnums.h
View File

@@ -59,9 +59,6 @@ constexpr size_t CONFIG_MAX_BONE_COUNT = 256;
static constexpr bool CONFIG_IBL_RGBM = true;
static constexpr size_t CONFIG_IBL_SIZE = 256;
static constexpr size_t CONFIG_UNIFORM_BINDING_COUNT = 6;
static constexpr size_t CONFIG_SAMPLER_BINDING_COUNT = 6;
} // namespace filament
#endif // TNT_FILAMENT_driver/EngineEnums.h

2
libs/filabridge/include/private/filament/SibGenerator.h
View File

@@ -59,7 +59,7 @@ inline constexpr uint8_t getSamplerBindingsStart(backend::Backend api) noexcept
case backend::Backend::VULKAN:
// The Vulkan backend has single namespace for uniforms and samplers.
// To avoid collision, the sampler bindings start after the last UBO binding.
return CONFIG_UNIFORM_BINDING_COUNT;
return backend::CONFIG_UNIFORM_BINDING_COUNT;
case backend::Backend::OPENGL:
case backend::Backend::METAL:

8
libs/utils/include/utils/compiler.h
View File

@@ -36,6 +36,14 @@
# define UTILS_PUBLIC
#endif
#if __has_attribute(packed)
# define UTILS_PACKED __attribute__((packed))
#else
// If this happens, we may need to use "#pragma pack(push, 1)" instead.
# error Compiler does not support the packed attribute.
# define UTILS_PACKED
#endif
#if __has_attribute(visibility)
# ifndef TNT_DEV
# define UTILS_PRIVATE __attribute__((visibility("hidden")))