Merge pull request #34 from bghgary/update-bgfx

Merge latest from upstream

.gitattributes

@@ -1,11 +1,12 @@
+*.bin binary diff=hex
 *.c   eol=lf
 *.cpp eol=lf
 *.h   eol=lf
-*.sc  eol=lf
-*.sh  eol=lf
+*.lua eol=lf
 *.m   eol=lf
-*.mm  eol=lf
 *.md  eol=lf
-*.lua eol=lf
 *.mk  eol=lf
+*.mm  eol=lf
+*.sc  eol=lf
+*.sh  eol=lf
 makefile eol=lf

.github/workflows/main.yml

@@ -206,3 +206,45 @@ jobs:
           ".build/osx-x64/bin/geometryc${{ matrix.binsuffix}}" --version
           ".build/osx-x64/bin/shaderc${{ matrix.binsuffix}}" --version
           ".build/osx-x64/bin/texturec${{ matrix.binsuffix}}" --version
+  android:
+    strategy:
+      fail-fast: true
+      matrix:
+        include: [
+          { platform: arm    },
+          { platform: arm64  },
+          { platform: x86    },
+          { platform: x86_64 },
+        ]
+    name: android-${{ matrix.platform }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r25b
+          add-to-path: false
+      - name: Checkout bgfx
+        uses: actions/checkout@v3
+        with:
+          path: bgfx
+      - name: Checkout bx
+        uses: actions/checkout@v3
+        with:
+          repository: bkaradzic/bx
+          path: bx
+      - name: Checkout bimg
+        uses: actions/checkout@v3
+        with:
+          repository: bkaradzic/bimg
+          path: bimg
+      - name: Build
+        run: |
+          cd bgfx
+          make -j$(sysctl -n hw.physicalcpu) android-${{ matrix.platform }}
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+      - name: Check
+        run: |
+          cd bgfx
+          ls -lash ".build/android-${{ matrix.platform }}/bin"

.gitignore

@@ -1,9 +1,11 @@
+*.TMP
+*.dxvk-cache
+*.log
+.DS_Store
 .build
 .debug
-.DS_Store
+.gdb_history
 .git
 .svn
-tags
-.gdb_history
 .vscode
-*.TMP
+tags

3rdparty/cgltf/cgltf.h

@@ -89,6 +89,7 @@
 #define CGLTF_H_INCLUDED__
 
 #include <stddef.h>
+#include <stdint.h> /* For uint8_t, uint32_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -829,6 +830,8 @@ void cgltf_free(cgltf_data* data);
 void cgltf_node_transform_local(const cgltf_node* node, cgltf_float* out_matrix);
 void cgltf_node_transform_world(const cgltf_node* node, cgltf_float* out_matrix);
 
+const uint8_t* cgltf_buffer_view_data(const cgltf_buffer_view* view);
+
 cgltf_bool cgltf_accessor_read_float(const cgltf_accessor* accessor, cgltf_size index, cgltf_float* out, cgltf_size element_size);
 cgltf_bool cgltf_accessor_read_uint(const cgltf_accessor* accessor, cgltf_size index, cgltf_uint* out, cgltf_size element_size);
 cgltf_size cgltf_accessor_read_index(const cgltf_accessor* accessor, cgltf_size index);
@@ -860,7 +863,6 @@ cgltf_result cgltf_copy_extras_json(const cgltf_data* data, const cgltf_extras*
 
 #ifdef CGLTF_IMPLEMENTATION
 
-#include <stdint.h> /* For uint8_t, uint32_t */
 #include <string.h> /* For strncpy */
 #include <stdio.h>  /* For fopen */
 #include <limits.h> /* For UINT_MAX etc */