Merge branch 'main' into bjd/agx

NEW_RELEASE_NOTES.md

@@ -11,3 +11,4 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
 - engine: Added parameter for configuring JobSystem thread count
 - engine: In Java, introduce Engine.Builder
 - engine: New tone mapper: `AgXTonemapper`.
+- matinfo: Add support for viewing ESSL 1.0 shaders

filament/src/PerShadowMapUniforms.cpp

@@ -61,7 +61,7 @@ void PerShadowMapUniforms::prepareCamera(Transaction const& transaction,
     s.clipFromWorldMatrix[0] = clipFromWorld; // projection * view
     s.worldFromClipMatrix = worldFromClip;    // 1/(projection * view)
     s.userWorldFromWorldMatrix = mat4f(inverse(camera.worldOrigin));
-    s.clipTransform = camera.clipTransfrom;
+    s.clipTransform = camera.clipTransform;
     s.cameraFar = camera.zf;
     s.oneOverFarMinusNear = 1.0f / (camera.zf - camera.zn);
     s.nearOverFarMinusNear = camera.zn / (camera.zf - camera.zn);

filament/src/PerViewUniforms.cpp

@@ -75,7 +75,7 @@ void PerViewUniforms::prepareCamera(FEngine& engine, const CameraInfo& camera) n
     s.viewFromClipMatrix  = viewFromClip;     // 1/projection
     s.worldFromClipMatrix = worldFromClip;    // 1/(projection * view)
     s.userWorldFromWorldMatrix = mat4f(inverse(camera.worldOrigin));
-    s.clipTransform = camera.clipTransfrom;
+    s.clipTransform = camera.clipTransform;
     s.cameraFar = camera.zf;
     s.oneOverFarMinusNear = 1.0f / (camera.zf - camera.zn);
     s.nearOverFarMinusNear = camera.zn / (camera.zf - camera.zn);

filament/src/PostProcessManager.cpp

@@ -2503,7 +2503,7 @@ void PostProcessManager::prepareTaa(FrameGraph& fg, filament::Viewport const& sv
     inoutCameraInfo->projection[2].xy -= jitterInClipSpace;
     // VERTEX_DOMAIN_DEVICE doesn't apply the projection, but it still needs this
     // clip transform, so we apply it separately (see main.vs)
-    inoutCameraInfo->clipTransfrom.zw -= jitterInClipSpace;
+    inoutCameraInfo->clipTransform.zw -= jitterInClipSpace;
 
     fg.addTrivialSideEffectPass("Jitter Camera",
             [=, &uniforms] (DriverApi& driver) {

filament/src/details/Camera.h

@@ -241,7 +241,7 @@ struct CameraInfo {
     math::mat4f eyeFromView[CONFIG_STEREOSCOPIC_EYES];  // eye view matrix (only for stereoscopic)
     math::mat4 worldOrigin;                             // world origin transform (already applied
                                                         // to model and view)
-    math::float4 clipTransfrom{1, 1, 0, 0};  // clip-space transform, only for VERTEX_DOMAIN_DEVICE
+    math::float4 clipTransform{1, 1, 0, 0};  // clip-space transform, only for VERTEX_DOMAIN_DEVICE
     float zn{};                              // distance (positive) to the near plane
     float zf{};                              // distance (positive) to the far plane
     float ev100{};                           // exposure

filament/src/details/Renderer.cpp

@@ -598,7 +598,7 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) {
 
         // VERTEX_DOMAIN_DEVICE doesn't apply the projection, but it still needs this
         // clip transform, so we apply it separately (see main.vs)
-        cameraInfo.clipTransfrom = { ts[0][0], ts[1][1], ts[3].x, ts[3].y };
+        cameraInfo.clipTransform = { ts[0][0], ts[1][1], ts[3].x, ts[3].y };
 
         // adjust svp to the new, larger, rendering dimensions
         svp.width  = uint32_t(width);

libs/filamat/src/GLSLPostProcessor.cpp

@@ -487,23 +487,14 @@ void GLSLPostProcessor::fullOptimization(const TShader& tShader,
     // Compile GLSL to to SPIR-V
     SpvOptions options;
     options.generateDebugInfo = mGenerateDebugInfo;
-    // This step is required for what we attempt later using spirvbin_t::remap()
-    if (!internalConfig.spirvOutput && optimizeForSize) {
-        options.emitNonSemanticShaderDebugInfo = true;
-    }
     GlslangToSpv(*tShader.getIntermediate(), spirv, &options);
 
     if (internalConfig.spirvOutput) {
         // Run the SPIR-V optimizer
         OptimizerPtr const optimizer = createOptimizer(mOptimization, config);
         optimizeSpirv(optimizer, spirv);
     } else {
-        // When we optimize for size, and we generate text-based shaders, we save much more
-        // by preserving variable names and running a simple DCE pass instead of using spirv-opt
-        if (optimizeForSize) {
-            spv::spirvbin_t(0).remap(
-                    spirv, {}, spv::spirvbin_t::DCE_ALL | spv::spirvbin_t::OPT_ALL);
-        } else {
+        if (!optimizeForSize) {
             OptimizerPtr const optimizer = createOptimizer(mOptimization, config);
             optimizeSpirv(optimizer, spirv);
         }

libs/matdbg/CMakeLists.txt

@@ -22,6 +22,8 @@ set(PUBLIC_HDRS
 )
 
 set(SRCS
+    src/ApiHandler.cpp
+    src/ApiHandler.h
     src/CommonWriter.h
     src/CommonWriter.cpp
     src/DebugServer.cpp
@@ -59,7 +61,6 @@ endif()
 set(DUMMY_SRC "${RESOURCE_DIR}/dummy.c")
 add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
 
-
 add_library(matdbg_resources ${DUMMY_SRC} ${RESGEN_SOURCE})
 set_target_properties(matdbg_resources PROPERTIES FOLDER Libs)
 

libs/matdbg/include/matdbg/DebugServer.h

@@ -27,11 +27,19 @@
 
 class CivetServer;
 
-namespace filament {
-namespace matdbg {
+namespace filament::matdbg {
 
 using MaterialKey = uint32_t;
 
+struct MaterialRecord {
+    void* userdata;
+    const uint8_t* package;
+    size_t packageSize;
+    utils::CString name;
+    MaterialKey key;
+    VariantList activeVariants;
+};
+
 /**
  * Server-side material debugger.
  *
@@ -41,6 +49,9 @@ using MaterialKey = uint32_t;
  */
 class DebugServer {
 public:
+    static std::string_view const kSuccessHeader;
+    static std::string_view const kErrorHeader;
+
     DebugServer(backend::Backend backend, int port);
     ~DebugServer();
 
@@ -74,16 +85,7 @@ class DebugServer {
     bool isReady() const { return mServer; }
 
 private:
-    struct MaterialRecord {
-        void* userdata;
-        const uint8_t* package;
-        size_t packageSize;
-        utils::CString name;
-        MaterialKey key;
-        VariantList activeVariants;
-    };
-
-    const MaterialRecord* getRecord(const MaterialKey& key) const;
+    MaterialRecord const* getRecord(const MaterialKey& key) const;
 
     void updateActiveVariants();
 
@@ -109,15 +111,14 @@ class DebugServer {
     QueryCallback mQueryCallback = nullptr;
 
     class FileRequestHandler* mFileHandler = nullptr;
-    class RestRequestHandler* mRestHandler = nullptr;
+    class ApiHandler* mApiHandler = nullptr;
     class WebSocketHandler* mWebSocketHandler = nullptr;
 
     friend class FileRequestHandler;
-    friend class RestRequestHandler;
+    friend class ApiHandler;
     friend class WebSocketHandler;
 };
 
-} // namespace matdbg
-} // namespace filament
+} // namespace filament::matdbg
 
 #endif  // MATDBG_DEBUGSERVER_H

libs/matdbg/include/matdbg/ShaderExtractor.h

@@ -31,7 +31,7 @@ namespace matdbg {
 // in a manner similar to ShaderReplacer.
 class ShaderExtractor {
 public:
-    ShaderExtractor(backend::Backend backend, const void* data, size_t size);
+    ShaderExtractor(backend::ShaderLanguage target, const void* data, size_t size);
     bool parse() noexcept;
     bool getShader(backend::ShaderModel shaderModel,
             Variant variant, backend::ShaderStage stage, filaflat::ShaderContent& shader) noexcept;

libs/matdbg/include/matdbg/ShaderInfo.h

@@ -35,9 +35,7 @@ struct ShaderInfo {
 };
 
 size_t getShaderCount(const filaflat::ChunkContainer& container, filamat::ChunkType type);
-bool getMetalShaderInfo(const filaflat::ChunkContainer& container, ShaderInfo* info);
-bool getGlShaderInfo(const filaflat::ChunkContainer& container, ShaderInfo* info);
-bool getVkShaderInfo(const filaflat::ChunkContainer& container, ShaderInfo* info);
+bool getShaderInfo(const filaflat::ChunkContainer& container, ShaderInfo* info, filamat::ChunkType chunkType);
 
 } // namespace matdbg
 } // namespace filament