diff options
| author | Joshua Reisenauer <[email protected]> | 2016-05-25 11:26:31 -0700 |
|---|---|---|
| committer | Joshua Reisenauer <[email protected]> | 2016-05-25 11:26:31 -0700 |
| commit | 5a041a6af58a221060e8202cd0a12a1aa562838c (patch) | |
| tree | 8755884114784e71d424ce10d72c572a3f6d9350 /src/rlgl.h | |
| parent | f74791ed7bcb3585c576f40766bf4e22b0923a7e (diff) | |
| parent | 3d6696f6c981a7a8f523d631926380eced475733 (diff) | |
| download | raylib-5a041a6af58a221060e8202cd0a12a1aa562838c.tar.gz raylib-5a041a6af58a221060e8202cd0a12a1aa562838c.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/rlgl.h')
| -rw-r--r-- | src/rlgl.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -171,10 +171,10 @@ typedef enum { OPENGL_11 = 1, OPENGL_33, OPENGL_ES_20 } GlVersion; int mvpLoc; // ModelView-Projection matrix uniform location point (vertex shader) int tintColorLoc; // Color uniform location point (fragment shader) - // Texture map locations - int mapDiffuseLoc; // Diffuse map texture uniform location point (fragment shader) - int mapNormalLoc; // Normal map texture uniform location point (fragment shader) - int mapSpecularLoc; // Specular map texture uniform location point (fragment shader) + // Texture map locations (generic for any kind of map) + int mapTexture0Loc; // Map texture uniform location point (default-texture-unit = 0) + int mapTexture1Loc; // Map texture uniform location point (default-texture-unit = 1) + int mapTexture2Loc; // Map texture uniform location point (default-texture-unit = 2) } Shader; // Texture2D type |
