Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable new renderer on CI #819

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Enable new renderer on CI #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c2c81
Enable new renderer on CI
pbdot Jan 10, 2025
3bf7887
Web player already on the new renderer via cmake
pbdot Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEDGE_SOKOL_GL=ON

- name: Build
# Build your program with the given configuration
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Configure CMake MSVC
run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEDGE_SOKOL_D3D11=ON
- name: Build MSVC
run: cmake --build build --config ${{env.BUILD_TYPE}}
- uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEDGE_SOKOL_GL=ON

- name: Build
# Build your program with the given configuration
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)

# Rendering Options

# Sokol Renderer (Beta)
option(EDGE_SOKOL "Enable Sokol Renderer (Beta)" OFF)
# Sokol Renderer
option(EDGE_SOKOL_GL "Sokol GL" OFF)
option(EDGE_SOKOL_GLES3 "Sokol GLES3" OFF)
option(EDGE_SOKOL_D3D11 "Sokol D3D11" OFF)

if (EDGE_SOKOL_GL OR EDGE_SOKOL_GLES3 OR EDGE_SOKOL_D3D11)
set (EDGE_SOKOL ON)
endif()

# Optional Features
option(EDGE_COAL_SUPPORT "Enable support for COAL scripting" ON)
option(EDGE_DEHACKED_SUPPORT "Enable support for Dehacked patch conversion" ON)
Expand Down
2 changes: 2 additions & 0 deletions libraries/thread/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,11 +877,13 @@ struct thread_internal_signal_t

void thread_signal_init( thread_signal_t* signal )
{
#ifdef _MSC_VER
// Compile-time size check
#pragma warning( push )
#pragma warning( disable: 4214 ) // nonstandard extension used: bit field types other than int
struct x { char thread_signal_type_too_small : ( sizeof( thread_signal_t ) < sizeof( struct thread_internal_signal_t ) ? 0 : 1 ); };
#pragma warning( pop )
#endif

struct thread_internal_signal_t* internal = (struct thread_internal_signal_t*) signal;

Expand Down
2 changes: 1 addition & 1 deletion source_files/edge/m_argv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void ParseArguments(const int argc, const char *const *argv)

#ifdef __APPLE__
// ignore MacOS X rubbish
if (argv[i] == "-psn")
if (!strcmp(argv[i],"-psn"))
continue;
#endif
// Just place argv[0] as is
Expand Down
2 changes: 0 additions & 2 deletions source_files/edge/r_bsp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ ViewHeightZone view_height_zone;

static Subsector *bsp_current_subsector;

static constexpr uint8_t kMaximumEdgeVertices = 20;

static void UpdateSectorInterpolation(Sector *sector)
{
if (uncapped_frames.d_ && !time_stop_active && !paused && !erraticism_active && !menu_active && !rts_menu_active)
Expand Down
Loading