diff options
| author | victorfisac <[email protected]> | 2016-06-09 13:12:18 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2016-06-09 13:12:18 +0200 |
| commit | 3524fc414b734efdf69d2fef176e8eb469885b4b (patch) | |
| tree | d1232880300af915fd7035cbcef71c46ef14922d /src/standard_shader.h | |
| 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/standard_shader.h')
| -rw-r--r-- | src/standard_shader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/standard_shader.h b/src/standard_shader.h index 956b5c32..b2b8980c 100644 --- a/src/standard_shader.h +++ b/src/standard_shader.h @@ -1,6 +1,6 @@ // Vertex shader definition to embed, no external file required -const static unsigned char vStandardShaderStr[] = +static const char vStandardShaderStr[] = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" #elif defined(GRAPHICS_API_OPENGL_ES2) @@ -37,7 +37,7 @@ const static unsigned char vStandardShaderStr[] = "} \n"; // Fragment shader definition to embed, no external file required -const static unsigned char fStandardShaderStr[] = +static const char fStandardShaderStr[] = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" #elif defined(GRAPHICS_API_OPENGL_ES2) @@ -163,4 +163,4 @@ const static unsigned char fStandardShaderStr[] = #elif defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) " gl_FragColor = vec4(texelColor.rgb*lighting*colDiffuse.rgb, texelColor.a*colDiffuse.a); \n" #endif -"} \n";
\ No newline at end of file +"}\n"; |