Merge pull request #5 from q4a/bgfx-2022

Update bgfx and use SPIRV
gamedolphin · Jun 27, 2022 · a33a342 · a33a342
2 parents 0cf1932 + ee6a7e3
commit a33a342
Show file tree

Hide file tree

Showing 10 changed files with 475 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Setup
+      run: |
+        git submodule update --init --recursive
+    - name: Install deps
+      run: |
+        sudo apt-get update &&
+        sudo apt-get install -y libsdl2-dev libgl1-mesa-dev x11proto-core-dev libx11-dev
+    - name: Build bgfx
+      run: |
+        cd bgfx
+        make -j$(nproc) linux-release64
+    - name: Build sample
+      run: |
+        make all
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "bgfx"]
 	path = bgfx
-	url = git://github.com/bkaradzic/bgfx.git
+	url = https://github.com/bkaradzic/bgfx
 [submodule "bimg"]
 	path = bimg
-	url = git://github.com/bkaradzic/bimg.git
+	url = https://github.com/bkaradzic/bimg
 [submodule "bx"]
 	path = bx
-	url = git://github.com/bkaradzic/bx.git
+	url = https://github.com/bkaradzic/bx
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ CC = g++
 
 # COMPILER_FLAGS specifies the additional compilation options we're using
 # -w suppresses all warnings
-COMPILER_FLAGS = -w
+COMPILER_FLAGS = -w -DBX_CONFIG_DEBUG=0
 
 BGFX_HEADERS =  -Ibgfx/include -Ibx/include -Ibimg/include
 
@@ -16,13 +16,15 @@ all : main.cpp
 	-f v_simple.sc \
 	-o v_simple.bin \
 	--platform linux \
+	-p spirv \
 	--type vertex \
 	--verbose \
 	-i bgfx/src
 	./bgfx/.build/linux64_gcc/bin/shadercRelease \
 	-f f_simple.sc \
 	-o f_simple.bin \
 	--platform linux \
+	-p spirv \
 	--type fragment \
 	--verbose \
 	-i bgfx/src

diff --git a/bgfx b/bgfx
diff --git a/bimg b/bimg
diff --git a/bx b/bx
diff --git a/f_simple.sc b/f_simple.sc
@@ -1,5 +1,8 @@
 $input v_color0
 
+#include <bgfx_shader.sh>
+#include "shaderlib.sh"
+
 void main()
 {
     gl_FragColor = v_color0;

diff --git a/main.cpp b/main.cpp
@@ -1,10 +1,11 @@
 #include <stdio.h>
-#include <SDL2/SDL.h>
+#include <fstream>
+
+#include <bx/math.h>
 #include <bgfx/bgfx.h>
 #include <bgfx/platform.h>
+#include <SDL2/SDL.h>
 #include <SDL2/SDL_syswm.h>
-#include <fstream>
-#include <bx/math.h>
 
 
 SDL_Window* window = NULL;
+2 −1		.appveyor.yml
+4 −9		.editorconfig
+0 −32		.travis.yml
+1 −0		3rdparty/astc-codec/src/base/string_utils.h
+54 −170		3rdparty/astc/astc_lib.cpp
+4 −2		3rdparty/astc/astc_lib.h
+9 −9		3rdparty/astc/mathlib.cpp
+1 −1		3rdparty/astc/mathlib.h
+14 −14		3rdparty/astc/vectypes.h
+21 −0		3rdparty/lodepng/LICENSE
+0 −10		3rdparty/lodepng/README.md
+2,876 −2,690		3rdparty/lodepng/lodepng.cpp
+327 −141		3rdparty/lodepng/lodepng.h
+2 −2		3rdparty/nvtt/nvcore/nvcore.h
+4 −2		3rdparty/nvtt/nvcore/posh.h
+2 −2		3rdparty/nvtt/nvtt.cpp
+907 −334		3rdparty/stb/stb_image.h
+52 −48		3rdparty/stb/stb_image_resize.h
+735 −137		3rdparty/stb/stb_image_write.h
+393 −99		3rdparty/tinyexr/README.md
+196 −0		3rdparty/tinyexr/deps/miniz/ChangeLog.md
+22 −0		3rdparty/tinyexr/deps/miniz/LICENSE
+7,733 −0		3rdparty/tinyexr/deps/miniz/miniz.c
+1,350 −0		3rdparty/tinyexr/deps/miniz/miniz.h
+34 −0		3rdparty/tinyexr/deps/miniz/readme.md
+2,774 −7,456		3rdparty/tinyexr/tinyexr.h
+1 −1		LICENSE
+2 −3		README.md
+4 −2		include/bimg/bimg.h
+2 −2		include/bimg/decode.h
+6 −2		include/bimg/encode.h
+47 −56		makefile
+6 −2		scripts/bimg.lua
+4 −2		scripts/bimg_decode.lua
+17 −2		scripts/bimg_encode.lua
+3 −5		scripts/genie.lua
+5 −5		scripts/texturec.lua
+40 −3		src/bimg_p.h
+59 −0		src/config.h
+806 −558		src/image.cpp
+10 −8		src/image_cubemap_filter.cpp
+141 −19		src/image_decode.cpp
+31 −14		src/image_encode.cpp
+3 −3		src/image_gnf.cpp
+65 −50		tools/texturec/texturec.cpp