Merge branch 'sdlglcontext' into 'master' (2dfe276a) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

2dfe276a

Commit 2dfe276a authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'sdlglcontext' into 'master'

Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796

parents a4fa4351 bd7b2fcb

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_video.c 4 additions, 6 deletions

src/android/i_video.c
src/d_main.c 2 additions, 3 deletions

src/d_main.c
src/djgppdos/i_video.c 1 addition, 4 deletions

src/djgppdos/i_video.c
src/djgppdos/vid_vesa.c 2 additions, 4 deletions

src/djgppdos/vid_vesa.c
src/dummy/i_video.c 4 additions, 6 deletions

src/dummy/i_video.c
src/hardware/hw_main.c 0 additions, 1 deletion

src/hardware/hw_main.c
src/i_video.h 11 additions, 7 deletions

src/i_video.h
src/m_menu.c 1 addition, 1 deletion

src/m_menu.c
src/screen.c 2 additions, 2 deletions

src/screen.c
src/sdl/i_video.c 69 additions, 31 deletions

src/sdl/i_video.c
src/win32/win_vid.c 3 additions, 8 deletions

src/win32/win_vid.c

with 99 additions and 73 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment