Skip to content

Commit

Permalink
rlLoadShaderCode - set ShaderId variables to RLGL.State.default[VF]Sh…
Browse files Browse the repository at this point in the history
…aderId if repesctive Code is NULL (#2281)
  • Loading branch information
MatthewOwens authored Jan 13, 2022
1 parent 464026f commit e621efe
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/rlgl.h
Original file line number Diff line number Diff line change
Expand Up @@ -3544,8 +3544,16 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode)
unsigned int vertexShaderId = 0;
unsigned int fragmentShaderId = 0;

if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER);
if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER);
if (vsCode != NULL) {
vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER);
} else {
vertexShaderId = RLGL.State.defaultVShaderId;
}
if (fsCode != NULL) {
fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER);
} else {
fragmentShaderId = RLGL.State.defaultFShaderId;
}

// Load shader program if provided vertex/fragment shaders compile successfully
if ((vertexShaderId != 0) && (fragmentShaderId != 0)) id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId);
Expand Down

0 comments on commit e621efe

Please sign in to comment.