Merge branch 'ogl-batching' into 'sal-oglshaderport' (ce17cc48) · 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

ce17cc48

Commit ce17cc48 authored 4 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'ogl-batching' into 'sal-oglshaderport'

OpenGL draw call batching

See merge request STJr/SRB2!986

parents 405f1550 0e521922

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 1 deletion

src/Makefile
src/d_main.c 22 additions, 0 deletions

src/d_main.c
src/hardware/hw_batching.c 450 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_cache.c 27 additions, 8 deletions

src/hardware/hw_cache.c
src/hardware/hw_drv.h 2 additions, 0 deletions

src/hardware/hw_drv.h
src/hardware/hw_main.c 49 additions, 25 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 13 additions, 0 deletions

src/hardware/hw_main.h
src/hardware/r_opengl/r_opengl.c 26 additions, 8 deletions

src/hardware/r_opengl/r_opengl.c
src/sdl/Srb2SDL-vc10.vcxproj 2 additions, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj
src/sdl/Srb2SDL-vc10.vcxproj.filters 6 additions, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj.filters
src/sdl/hwsym_sdl.c 1 addition, 0 deletions

src/sdl/hwsym_sdl.c
src/sdl/i_video.c 1 addition, 0 deletions

src/sdl/i_video.c

with 639 additions and 42 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