summaryrefslogtreecommitdiffhomepage
path: root/src/raylib.h
diff options
context:
space:
mode:
authorRay <[email protected]>2018-02-12 11:27:26 +0100
committerGitHub <[email protected]>2018-02-12 11:27:26 +0100
commitdd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3 (patch)
tree298dc5f3d8890bdb478c73c3737c751486b6ec5b /src/raylib.h
parentb908a4078a2f318e6bc9cbdcb7045d1ccab0c6a4 (diff)
parent8af5f9dfe0e23d918bb88a5fca9e5671c9100f3a (diff)
downloadraylib-dd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3.tar.gz
raylib-dd8f0765b833bff2fbcc523e2d0a20d4fd28b5f3.zip
Merge pull request #465 from raysan5/develop
Integrate develop branch into master
Diffstat (limited to 'src/raylib.h')
-rw-r--r--src/raylib.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/raylib.h b/src/raylib.h
index 3d1f2a49..e3f30e43 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1044,7 +1044,8 @@ RLAPI RayHitInfo GetCollisionRayGround(Ray ray, float groundHeight);
// Shader loading/unloading functions
RLAPI char *LoadText(const char *fileName); // Load chars array from text file
-RLAPI Shader LoadShader(char *vsFileName, char *fsFileName); // Load shader from files and bind default locations
+RLAPI Shader LoadShader(const char *vsFileName, const char *fsFileName); // Load shader from files and bind default locations
+RLAPI Shader LoadShaderCode(char *vsCode, char *fsCode); // Load shader from code strings and bind default locations
RLAPI void UnloadShader(Shader shader); // Unload shader from GPU memory (VRAM)
RLAPI Shader GetShaderDefault(void); // Get default shader