[PATCH v2 0/3] MR377: Draft: ci: Compile with -Werror.

[Giovanni Mascellani (＠giomasce)]

Manually disable some warnings that are currently emitted. Eventually
the warnings should be solved and -Werror should remain alone.

--
  v2: vkd3d: Always use CONST_VTABLE when including windows.h.
      ci: Store config.log as a build artifact.
      ci: Compile with -Werror.

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/377

[PATCH v2 1/3] ci: Compile with -Werror.

[Giovanni Mascellani]

From: Giovanni Mascellani

Manually disable some warnings that are currently emitted. Eventually
the warnings should be solved and -Werror should remain alone.
---
 gitlab/build-crosstest | 2 +-
 gitlab/build-linux     | 2 +-
 gitlab/build-mac       | 2 +-
 gitlab/build-mingw     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest
index 5561bffb..15b4d031 100755
--- a/gitlab/build-crosstest
+++ b/gitlab/build-crosstest
@@ -14,7 +14,7 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && \
+../configure CROSSCC32="i686-w64-mingw32-gcc" CROSSCC64="x86_64-w64-mingw32-gcc" CFLAGS="-g -O2 -Wno-array-bounds -Werror" && \
     make -j$(nproc) crosstest || \
         touch ../pipeline_failed

diff --git a/gitlab/build-linux b/gitlab/build-linux
index 566d772f..cc8faa5b 100755
--- a/gitlab/build-linux
+++ b/gitlab/build-linux
@@ -11,7 +11,7 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure --enable-demos && \
+../configure --enable-demos CFLAGS="-g -O2 -Werror" && \
     make -j$(nproc) && \
     make -j$(nproc) check || \
         touch ../pipeline_failed
diff --git a/gitlab/build-mac b/gitlab/build-mac
index 23c1ea96..aeed0988 100755
--- a/gitlab/build-mac
+++ b/gitlab/build-mac
@@ -11,7 +11,7 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure && \
+../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \
     make -j$(sysctl -n hw.ncpu) && \
     make -j$(sysctl -n hw.ncpu) check || \
         touch ../pipeline_failed
diff --git a/gitlab/build-mingw b/gitlab/build-mingw
index 0f9ab3a6..41483039 100755
--- a/gitlab/build-mingw
+++ b/gitlab/build-mingw
@@ -13,7 +13,7 @@ mkdir build
 cd build
 mkdir vulkan-headers
 cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
-../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds" LDFLAGS="-static-libgcc" && \
+../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-discarded-qualifiers -Werror" LDFLAGS="-static-libgcc" && \
     make -j$(nproc) && \
     make -j$(nproc) install DESTDIR="$PWD/destdir" || \
         touch ../pipeline_failed

[PATCH v2 2/3] ci: Store config.log as a build artifact.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 gitlab/build-crosstest | 2 +-
 gitlab/build-linux     | 2 +-
 gitlab/build-mac       | 2 +-
 gitlab/build-mingw     | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest
index 15b4d031..38eb3e11 100755
--- a/gitlab/build-crosstest
+++ b/gitlab/build-crosstest
@@ -19,6 +19,6 @@ cd build
         touch ../pipeline_failed

mkdir -p ../artifacts/$COMMIT
-rsync -Rr tests/*.exe ../artifacts/$COMMIT
+rsync -Rr config.log tests/*.exe ../artifacts/$COMMIT

git reset --hard
diff --git a/gitlab/build-linux b/gitlab/build-linux
index cc8faa5b..661180f5 100755
--- a/gitlab/build-linux
+++ b/gitlab/build-linux
@@ -17,6 +17,6 @@ cd build
         touch ../pipeline_failed

mkdir -p ../artifacts/$COMMIT
-rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT
+rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT

git reset --hard
diff --git a/gitlab/build-mac b/gitlab/build-mac
index aeed0988..854bc8e3 100755
--- a/gitlab/build-mac
+++ b/gitlab/build-mac
@@ -17,6 +17,6 @@ cd build
         touch ../pipeline_failed

mkdir -p ../artifacts/$COMMIT
-rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT
+rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT

git reset --hard
diff --git a/gitlab/build-mingw b/gitlab/build-mingw
index 41483039..32b5bea5 100755
--- a/gitlab/build-mingw
+++ b/gitlab/build-mingw
@@ -19,6 +19,7 @@ cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-header
         touch ../pipeline_failed

mkdir -p ../artifacts/$COMMIT
+cp config.log ../artifacts/$COMMIT
 cp destdir/usr/local/bin/* ../artifacts/$COMMIT

git reset --hard

[PATCH v2 3/3] vkd3d: Always use CONST_VTABLE when including windows.h.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 gitlab/build-mingw          | 2 +-
 include/vkd3d_windows.h     | 1 +
 tests/d3d12_crosstest.h     | 1 -
 tests/shader_runner.c       | 1 -
 tests/shader_runner_d3d11.c | 1 -
 tests/shader_runner_d3d12.c | 1 -
 tests/shader_runner_d3d9.c  | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gitlab/build-mingw b/gitlab/build-mingw
index 32b5bea5..14a2f7f4 100755
--- a/gitlab/build-mingw
+++ b/gitlab/build-mingw
@@ -13,7 +13,7 @@ mkdir build
 cd build
 mkdir vulkan-headers
 cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
-../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Wno-discarded-qualifiers -Werror" LDFLAGS="-static-libgcc" && \
+../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds -Wno-missing-prototypes -Werror" LDFLAGS="-static-libgcc" && \
     make -j$(nproc) && \
     make -j$(nproc) install DESTDIR="$PWD/destdir" || \
         touch ../pipeline_failed
diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h
index 7b0e972d..b35d7d0b 100644
--- a/include/vkd3d_windows.h
+++ b/include/vkd3d_windows.h
@@ -240,6 +240,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;

#elif !defined(__WIDL__)

+# define CONST_VTABLE
 # include <windows.h>

#endif  /* _WIN32 */
diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index 6c0a4ef1..ab642454 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -41,7 +41,6 @@ typedef int HRESULT;

#define VK_NO_PROTOTYPES
 #define COBJMACROS
-#define CONST_VTABLE
 #define INITGUID
 #include "vkd3d_test.h"
 #include "vkd3d_windows.h"
diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 05edf5da..dc32a83c 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -48,7 +48,6 @@ typedef int HRESULT;
 #endif

#define COBJMACROS
-#define CONST_VTABLE
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c
index 25b585b1..58146629 100644
--- a/tests/shader_runner_d3d11.c
+++ b/tests/shader_runner_d3d11.c
@@ -21,7 +21,6 @@
 #ifdef _WIN32

#define COBJMACROS
-#define CONST_VTABLE
 #define INITGUID
 #define VKD3D_TEST_NO_DEFS
 #include <d3d11_4.h>
diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c
index d620f1e2..88900bac 100644
--- a/tests/shader_runner_d3d12.c
+++ b/tests/shader_runner_d3d12.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <assert.h>
 #define COBJMACROS
-#define CONST_VTABLE
 #define VKD3D_TEST_NO_DEFS
 #include "d3d12_crosstest.h"
 #include "shader_runner.h"
diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c
index 0c6d3788..c27fc4e8 100644
--- a/tests/shader_runner_d3d9.c
+++ b/tests/shader_runner_d3d9.c
@@ -19,7 +19,6 @@
 #ifdef _WIN32

#define COBJMACROS
-#define CONST_VTABLE
 #define VKD3D_TEST_NO_DEFS
 #include <d3d9.h>
 #include "vkd3d_d3dcommon.h"