Write sc size into binary header [release 3.3.0]

Author: halx99

CMakeLists.txt

@@ -71,6 +71,7 @@ if (NOT (IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/3rdparty/glslang"))
     message(STATUS "Downloading glslang ...")
     find_program(GIT_COMMAND NAMES git REQUIRED)
     execute_process(COMMAND ${GIT_COMMAND} clone "https://github.com/KhronosGroup/glslang.git" "${CMAKE_CURRENT_LIST_DIR}/3rdparty/glslang")
+    execute_process(COMMAND ${GIT_COMMAND} -C "${CMAKE_CURRENT_LIST_DIR}/3rdparty/glslang" checkout "dffbc79733f63435ae24e73f64384f1374e0dda2")
     find_program(PYTHON_COMMAND NAMES python3 python REQUIRED)
     execute_process(COMMAND ${PYTHON_COMMAND} "${CMAKE_CURRENT_LIST_DIR}/3rdparty/glslang/update_glslang_sources.py" 
         WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/3rdparty/glslang")

README.md

@@ -9,6 +9,11 @@ It uses [glslang](https://github.com/KhronosGroup/glslang) for parsing GLSL and
 
 ## ChangeLog
 
+### 3.3.0
+
+- Write sc size into binary header
+- Update glslang: dffbc79(5382) (Until Dec 12, 2025)
+
 ### 3.2.0
 
 - Unify and re-enumerate vertex input & uniform variable types (Break changes)

src/axslc-writer.cpp

@@ -148,16 +148,18 @@ bool sc_commit(sc_file* f)
 
     // write main chunk
     const uint32_t sc_magic = SC_CHUNK;
-    const uint32_t sc_size = 0;       // doesn't matter
-    sx_file_write_var(&writer, sc_magic);
-    sx_file_write_var(&writer, sc_size);
+    uint32_t sc_size = 0; // place holder
+
+    sc_size += sx_file_write_var(&writer, sc_magic);
+    const uint32_t sc_size_offset = sizeof(sc_magic);
+    sc_size += sx_file_write_var(&writer, sc_size);
 
     sc_chunk sc_header;
     sc_header.major = f->major_ver;
     sc_header.minor = f->minor_ver;
     sc_header.lang = f->lang;
     sc_header.profile_ver = f->profile_ver;
-    sx_file_write_var(&writer, sc_header);
+    sc_size += sx_file_write_var(&writer, sc_header);
 
     // write stages
     for (int i = 0; i < sx_array_count(f->stages); i++) {
@@ -174,34 +176,38 @@ bool sc_commit(sc_file* f)
 
         // `STAG`
         const uint32_t _stage = SC_CHUNK_STAG;
-        sx_file_write_var(&writer, _stage);
-        sx_file_write_var(&writer, stage_size);
-        sx_file_write_var(&writer, s->stage);
+        sc_size += sx_file_write_var(&writer, _stage);
+        sc_size += sx_file_write_var(&writer, stage_size);
+        sc_size += sx_file_write_var(&writer, s->stage);
 
         if (code_size) {
             // `CODE`
             const uint32_t _code = SC_CHUNK_CODE;
             const uint32_t code_size = sx_strlen(s->code) + 1;
-            sx_file_write_var(&writer, _code);
-            sx_file_write_var(&writer, code_size);
-            sx_file_write(&writer, s->code, code_size);
+            sc_size += sx_file_write_var(&writer, _code);
+            sc_size += sx_file_write_var(&writer, code_size);
+            sc_size += sx_file_write(&writer, s->code, code_size);
         } else if (data_size) {
             // `DATA`
             const uint32_t _data = SC_CHUNK_DATA;
-            sx_file_write_var(&writer, _data);
-            sx_file_write_var(&writer, s->data_size);
-            sx_file_write(&writer, s->data, s->data_size);
+            sc_size += sx_file_write_var(&writer, _data);
+            sc_size += sx_file_write_var(&writer, s->data_size);
+            sc_size += sx_file_write(&writer, s->data, s->data_size);
         }
 
         // `REFL`
         if (s->refl) {
             const uint32_t _refl = SC_CHUNK_REFL;
-            sx_file_write_var(&writer, _refl);
-            sx_file_write_var(&writer, s->refl_size);
-            sx_file_write(&writer, s->refl, s->refl_size);
+            sc_size += sx_file_write_var(&writer, _refl);
+            sc_size += sx_file_write_var(&writer, s->refl_size);
+            sc_size += sx_file_write(&writer, s->refl, s->refl_size);
         }
     }
 
+    // finish sc size
+    sx_file_seekw(&writer, sc_size_offset, SX_WHENCE_BEGIN);
+    sx_file_write_var(&writer, sc_size);
+
     sx_file_close_writer(&writer);
 
     return true;

src/axslcc.cpp

@@ -76,6 +76,7 @@
 //      3.1.1       Register builtin sampler state symbols
 // 
 //      3.2.0       Unify and re-enumerate vertex input & uniform variable types
+//      3.3.0       Write sc size into binary header
 //
 
 /**
@@ -133,7 +134,7 @@
 #include "../3rdparty/sjson/sjson.h"
 
 #define AXSLCC_VERSION_MAJOR 3
-#define AXSLCC_VERSION_MINOR 2
+#define AXSLCC_VERSION_MINOR 3
 #define AXSLCC_VERSION_REVISION 0
 
 using namespace axslc;