summaryrefslogtreecommitdiffhomepage
path: root/src/core.c
diff options
context:
space:
mode:
authorRay <[email protected]>2021-03-25 14:28:12 +0100
committerRay <[email protected]>2021-03-25 14:28:12 +0100
commitcba412cc313e4f95eafb3fba9303400e65c98984 (patch)
tree672a1ae3117e96210cd4d43801748799f5740eea /src/core.c
parent9569d6a802a2230c92503456d544a5470a59d5cf (diff)
downloadraylib-cba412cc313e4f95eafb3fba9303400e65c98984.tar.gz
raylib-cba412cc313e4f95eafb3fba9303400e65c98984.zip
WARNING: BREAKING: rlgl redesign -WIP-
rlgl module has been completely redesigned to move Mesh/Material structures to [models] module. Still some work to do, broken elements: - [models] OpenGL 1.1 mesh rendering: DrawMesh() - [models] Mesh Instancing: DrawMeshInstanced() - [models] Stereo rendering: DrawMesh() - [models] GL_FLOAT, GL_UNSIGNED_INT exposed - [models] GenMeshCustom() - [rlgl] GenTexture*() functions removal?
Diffstat (limited to 'src/core.c')
-rw-r--r--src/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core.c b/src/core.c
index 99b4fa28..d4f9f4fc 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2082,13 +2082,13 @@ void UnloadShader(Shader shader)
// Begin custom shader mode
void BeginShaderMode(Shader shader)
{
- rlSetShaderActive(shader);
+ rlSetShader(shader);
}
// End custom shader mode (returns to default shader)
void EndShaderMode(void)
{
- BeginShaderMode(rlGetShaderDefault());
+ rlSetShader(rlGetShaderDefault());
}
// Get shader uniform location
@@ -2129,7 +2129,7 @@ void SetShaderValueMatrix(Shader shader, int locIndex, Matrix mat)
void SetShaderValueTexture(Shader shader, int locIndex, Texture2D texture)
{
rlEnableShader(shader.id);
- rlSetUniformSampler(locIndex, texture);
+ rlSetUniformSampler(locIndex, texture.id);
//rlDisableShader();
}