Merge branch 'sal-oglshaderport' into 'next' (5a52f9cb) · Commits · Toby Games / 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

5a52f9cb

Commit 5a52f9cb authored 4 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'sal-oglshaderport' into 'next'

OpenGL shaders

See merge request STJr/SRB2!724

parents d3d5496a 8365d975

No related branches found

No related tags found

Loading

Changes 53

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 3 deletions

src/Makefile
src/console.c 0 additions, 3 deletions

src/console.c
src/d_main.c 80 additions, 4 deletions

src/d_main.c
src/dehacked.c 0 additions, 2 deletions

src/dehacked.c
src/doomdef.h 3 additions, 7 deletions

src/doomdef.h
src/dummy/i_system.c 5 additions, 0 deletions

src/dummy/i_system.c
src/hardware/hw3dsdrv.h 5 additions, 13 deletions

src/hardware/hw3dsdrv.h
src/hardware/hw3sound.c 5 additions, 12 deletions

src/hardware/hw3sound.c
src/hardware/hw3sound.h 5 additions, 13 deletions

src/hardware/hw3sound.h
src/hardware/hw_batching.c 454 additions, 0 deletions

src/hardware/hw_batching.c
src/hardware/hw_batching.h 37 additions, 0 deletions

src/hardware/hw_batching.h
src/hardware/hw_bsp.c 5 additions, 12 deletions

src/hardware/hw_bsp.c
src/hardware/hw_cache.c 68 additions, 261 deletions

src/hardware/hw_cache.c
src/hardware/hw_clip.c 7 additions, 7 deletions

src/hardware/hw_clip.c
src/hardware/hw_clip.h 1 addition, 1 deletion

src/hardware/hw_clip.h
src/hardware/hw_data.h 7 additions, 14 deletions

src/hardware/hw_data.h
src/hardware/hw_defs.h 49 additions, 45 deletions

src/hardware/hw_defs.h
src/hardware/hw_dll.h 7 additions, 16 deletions

src/hardware/hw_dll.h
src/hardware/hw_draw.c 84 additions, 101 deletions

src/hardware/hw_draw.c

with 825 additions and 514 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