diff options
| author | victorfisac <victorfisac@gmail.com> | 2016-06-09 13:12:18 +0200 |
|---|---|---|
| committer | victorfisac <victorfisac@gmail.com> | 2016-06-09 13:12:18 +0200 |
| commit | 3524fc414b734efdf69d2fef176e8eb469885b4b (patch) | |
| tree | d1232880300af915fd7035cbcef71c46ef14922d /src/rlgl.c | |
| parent | 8323f81ab598d9a9e6720e55eb7269e410f10d2e (diff) | |
| parent | 420b85da98fff2603d94985a42cf86d6e4182204 (diff) | |
| download | raylib-3524fc414b734efdf69d2fef176e8eb469885b4b.tar.gz raylib-3524fc414b734efdf69d2fef176e8eb469885b4b.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/rlgl.c')
| -rw-r--r-- | src/rlgl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -236,7 +236,7 @@ unsigned int whiteTexture; //---------------------------------------------------------------------------------- #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) static void LoadCompressedTexture(unsigned char *data, int width, int height, int mipmapCount, int compressedFormat); -static unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr); // Load custom shader strings and return program id +static unsigned int LoadShaderProgram(const char *vShaderStr, const char *fShaderStr); // Load custom shader strings and return program id static Shader LoadDefaultShader(void); // Load default shader (just vertex positioning and texture coloring) static Shader LoadStandardShader(void); // Load standard shader (support materials and lighting) @@ -2403,7 +2403,7 @@ static void LoadCompressedTexture(unsigned char *data, int width, int height, in } // Load custom shader strings and return program id -static unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) +static unsigned int LoadShaderProgram(const char *vShaderStr, const char *fShaderStr) { unsigned int program = 0; |
