break dependency of filaflat on filabridge
filaflat only had on header dependency on filabridge (DriverEnums.h) and only needed two small enum types. In fact, I don't think it was right for filaflat to assume any particular value for these fields -- this is the responsibility of the callers.
This commit is contained in:
committed by
Mathias Agopian
parent
6e7c705c92
commit
8d484dd762
@@ -303,7 +303,8 @@ bool MaterialParserDetails::getVkShader(driver::ShaderModel shaderModel, uint8_t
|
||||
|
||||
Unflattener unflattener(container.getChunkStart(ChunkType::MaterialSpirv),
|
||||
container.getChunkEnd(ChunkType::MaterialSpirv));
|
||||
return mMaterialChunk.getSpirvShader(unflattener, mBlobDictionary, shader, shaderModel, variant, st);
|
||||
return mMaterialChunk.getSpirvShader(unflattener, mBlobDictionary, shader,
|
||||
(uint8_t)shaderModel, variant, st);
|
||||
}
|
||||
|
||||
bool MaterialParserDetails::getGlShader(driver::ShaderModel shaderModel, uint8_t variant,
|
||||
@@ -325,7 +326,8 @@ bool MaterialParserDetails::getGlShader(driver::ShaderModel shaderModel, uint8_t
|
||||
|
||||
Unflattener unflattener(container.getChunkStart(ChunkType::MaterialGlsl),
|
||||
container.getChunkEnd(ChunkType::MaterialGlsl));
|
||||
return mMaterialChunk.getTextShader(unflattener, mBlobDictionary, shader, shaderModel, variant, st);
|
||||
return mMaterialChunk.getTextShader(unflattener, mBlobDictionary, shader,
|
||||
(uint8_t)shaderModel, variant, st);
|
||||
}
|
||||
|
||||
bool MaterialParserDetails::getMtlShader(driver::ShaderModel shaderModel, uint8_t variant,
|
||||
@@ -346,7 +348,8 @@ bool MaterialParserDetails::getMtlShader(driver::ShaderModel shaderModel, uint8_
|
||||
|
||||
Unflattener unflattener(container.getChunkStart(ChunkType::MaterialMetal),
|
||||
container.getChunkEnd(ChunkType::MaterialMetal));
|
||||
return mMaterialChunk.getTextShader(unflattener, mBlobDictionary, shader, shaderModel, variant, st);
|
||||
return mMaterialChunk.getTextShader(unflattener, mBlobDictionary, shader,
|
||||
(uint8_t)shaderModel, variant, st);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -25,7 +25,7 @@ include_directories(${PUBLIC_HDR_DIR})
|
||||
add_library(${TARGET} ${HDRS} ${SRCS})
|
||||
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
|
||||
|
||||
target_link_libraries(${TARGET} filabridge utils)
|
||||
target_link_libraries(${TARGET} utils)
|
||||
|
||||
if (FILAMENT_SUPPORTS_VULKAN)
|
||||
target_link_libraries(${TARGET} smol-v)
|
||||
|
||||
@@ -22,23 +22,20 @@
|
||||
#include <filaflat/ShaderBuilder.h>
|
||||
#include <filaflat/Unflattener.h>
|
||||
|
||||
#include <filament/driver/DriverEnums.h>
|
||||
|
||||
#include <tsl/robin_map.h>
|
||||
|
||||
namespace filaflat {
|
||||
|
||||
class MaterialChunk {
|
||||
public:
|
||||
|
||||
bool getTextShader(
|
||||
Unflattener unflattener, BlobDictionary& dictionary, ShaderBuilder& shaderBuilder,
|
||||
filament::driver::ShaderModel shaderModel, uint8_t variant,
|
||||
filament::driver::ShaderType stage);
|
||||
uint8_t shaderModel, uint8_t variant, uint8_t stage);
|
||||
|
||||
bool getSpirvShader(
|
||||
Unflattener unflattener, BlobDictionary& dictionary, ShaderBuilder& shaderBuilder,
|
||||
filament::driver::ShaderModel shaderModel, uint8_t variant,
|
||||
filament::driver::ShaderType stage);
|
||||
uint8_t shaderModel, uint8_t variant, uint8_t stage);
|
||||
|
||||
private:
|
||||
bool readIndex(Unflattener& unflattener);
|
||||
|
||||
@@ -18,15 +18,10 @@
|
||||
|
||||
#include <utils/Log.h>
|
||||
|
||||
using namespace filament::driver;
|
||||
|
||||
namespace filaflat {
|
||||
|
||||
|
||||
static inline uint32_t makeKey(ShaderModel shaderModel, uint8_t variant, ShaderType type) noexcept {
|
||||
static_assert(sizeof(ShaderModel) == 1, "ShaderModel must not exceed 8 bits");
|
||||
static_assert(sizeof(ShaderType) == 1, "ShaderType must not exceed 8 bits");
|
||||
return (uint8_t(shaderModel) << 16) | (uint8_t(type) << 8) | variant;
|
||||
static inline uint32_t makeKey(uint8_t shaderModel, uint8_t variant, uint8_t type) noexcept {
|
||||
return (shaderModel << 16) | (type << 8) | variant;
|
||||
}
|
||||
|
||||
bool MaterialChunk::readIndex(Unflattener& unflattener) {
|
||||
@@ -61,25 +56,14 @@ bool MaterialChunk::readIndex(Unflattener& unflattener) {
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (ShaderModel(shaderModelValue)) {
|
||||
case ShaderModel::GL_ES_30:
|
||||
case ShaderModel::GL_CORE_41:
|
||||
// skip unsupported shader models (needed for older materials that support GL4.5)
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
|
||||
pipelineStageValue = std::min(pipelineStageValue, uint8_t(filament::driver::PIPELINE_STAGE_COUNT));
|
||||
|
||||
uint32_t key = makeKey(ShaderModel(shaderModelValue), variantValue, ShaderType(pipelineStageValue));
|
||||
uint32_t key = makeKey(shaderModelValue, variantValue, pipelineStageValue);
|
||||
mOffsets[key] = offsetValue;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MaterialChunk::getTextShader(Unflattener unflattener, BlobDictionary& dictionary,
|
||||
ShaderBuilder& shader, ShaderModel shaderModel, uint8_t variant, ShaderType ps) {
|
||||
ShaderBuilder& shader, uint8_t shaderModel, uint8_t variant, uint8_t ps) {
|
||||
|
||||
shader.reset();
|
||||
if (mBase == nullptr ) {
|
||||
@@ -136,7 +120,7 @@ bool MaterialChunk::getTextShader(Unflattener unflattener, BlobDictionary& dicti
|
||||
|
||||
|
||||
bool MaterialChunk::getSpirvShader(Unflattener unflattener, BlobDictionary& dictionary,
|
||||
ShaderBuilder& builder, ShaderModel shaderModel, uint8_t variant, ShaderType stage) {
|
||||
ShaderBuilder& builder, uint8_t shaderModel, uint8_t variant, uint8_t stage) {
|
||||
if (mBase == nullptr ) {
|
||||
if (!readIndex(unflattener)) {
|
||||
return false;
|
||||
|
||||
@@ -113,13 +113,13 @@ public:
|
||||
switch (mBackend) {
|
||||
case Backend::OPENGL:
|
||||
return materialChunk.getTextShader(unflattener, blobDictionary,
|
||||
shader, shaderModel, variant, st);
|
||||
shader, (uint8_t)shaderModel, variant, st);
|
||||
case Backend::METAL:
|
||||
return materialChunk.getTextShader(unflattener, blobDictionary,
|
||||
shader, shaderModel, variant, st);
|
||||
shader, (uint8_t)shaderModel, variant, st);
|
||||
case Backend::VULKAN:
|
||||
return materialChunk.getSpirvShader(unflattener, blobDictionary,
|
||||
shader, shaderModel, variant, st);
|
||||
shader, (uint8_t)shaderModel, variant, st);
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user