Merge SDL-ryan-batching-renderer branch to default.

--HG-- extra : rebase_source : 83b86d35497a01be6f48055490580bbba19ccc7a extra : amend_source : faae1a04859499ede43aba3ba50fc4f62b5afbcb
2018-10-31 15:03:41 -04:00 · 2018-10-31 15:03:41 -04:00 · 9f99a9c642
commit 9f99a9c642
parent 0d5be75013 7ac65007de
38 changed files with 6953 additions and 5554 deletions
--- a/src/render/opengl/SDL_shaders_gl.h
+++ b/src/render/opengl/SDL_shaders_gl.h
@ -27,6 +27,7 @@
 /* OpenGL shader implementation */

 typedef enum {
+    SHADER_INVALID = -1,
    SHADER_NONE,
    SHADER_SOLID,
    SHADER_RGB,