From 9b7295fd8f076867545c85650bbb3d5dbbb9c16c Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 22 Aug 2022 09:56:25 -0700 Subject: [PATCH] remove unused mIsMobile attribute --- filament/backend/test/ShaderGenerator.cpp | 14 ++++++++------ filament/backend/test/ShaderGenerator.h | 11 +++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/filament/backend/test/ShaderGenerator.cpp b/filament/backend/test/ShaderGenerator.cpp index 93a9228820..70068910ad 100644 --- a/filament/backend/test/ShaderGenerator.cpp +++ b/filament/backend/test/ShaderGenerator.cpp @@ -101,14 +101,16 @@ void ShaderGenerator::shutdown() { FinalizeProcess(); } -ShaderGenerator::ShaderGenerator(std::string vertex, std::string fragment, Backend backend, - bool isMobile) noexcept : mBackend(backend), mIsMobile(isMobile) { - mVertexBlob = transpileShader(backend, isMobile, std::move(vertex), ShaderStage::VERTEX); - mFragmentBlob = transpileShader(backend, isMobile, std::move(fragment), ShaderStage::FRAGMENT); +ShaderGenerator::ShaderGenerator(std::string vertex, std::string fragment, + Backend backend, bool isMobile) noexcept + : mBackend(backend), + mVertexBlob(transpileShader(ShaderStage::VERTEX, std::move(vertex), backend, isMobile)), + mFragmentBlob(transpileShader(ShaderStage::FRAGMENT, std::move(fragment), backend, + isMobile)) { } -ShaderGenerator::Blob ShaderGenerator::transpileShader(Backend backend, bool isMobile, std::string shader, - ShaderStage stage) noexcept { +ShaderGenerator::Blob ShaderGenerator::transpileShader( + ShaderStage stage, std::string shader, Backend backend, bool isMobile) noexcept { TProgram program; const EShLanguage language = stage == ShaderStage::VERTEX ? EShLangVertex : EShLangFragment; TShader tShader(language); diff --git a/filament/backend/test/ShaderGenerator.h b/filament/backend/test/ShaderGenerator.h index 647782b6a9..6de2b7481f 100644 --- a/filament/backend/test/ShaderGenerator.h +++ b/filament/backend/test/ShaderGenerator.h @@ -46,18 +46,13 @@ public: filament::backend::Program getProgram(filament::backend::DriverApi&) noexcept; private: - - enum class ShaderStage { - VERTEX, - FRAGMENT - }; + using ShaderStage = filament::backend::ShaderType; using Blob = std::vector; - static Blob transpileShader(Backend backend, bool isMobile, std::string shader, - ShaderStage stage) noexcept; + static Blob transpileShader(ShaderStage stage, std::string shader, Backend backend, + bool isMobile) noexcept; Backend mBackend; - bool mIsMobile; Blob mVertexBlob; Blob mFragmentBlob;