4 Commits

Author SHA1 Message Date
  Ray e00c5eb8b1
Merge pull request #5043 from vinnyhorgan/master 2 weeks ago
  Ray cbea2ff502
Merge pull request #5046 from maiconpintoabreu/updatestream-music 2 weeks ago
  Maicon Santana 3320a2c837 Fix to prevent UpdateMusicStream to run without music playing 2 weeks ago
  Daniel Vincent Horgan 901afadbf1 fix warning log macro in rlgl 2 weeks ago
2 changed files with 8 additions and 7 deletions
Unified View
  1. +1
    -0
      src/raudio.c
  2. +7
    -7
      src/rlgl.h

+ 1
- 0
src/raudio.c View File

@ -1871,6 +1871,7 @@ void SeekMusicStream(Music music, float position)
void UpdateMusicStream(Music music) void UpdateMusicStream(Music music)
{ {
if (music.stream.buffer == NULL) return; if (music.stream.buffer == NULL) return;
if (!music.stream.buffer->playing) return;
ma_mutex_lock(&AUDIO.System.lock); ma_mutex_lock(&AUDIO.System.lock);

+ 7
- 7
src/rlgl.h View File

@ -1885,7 +1885,7 @@ void rlActiveDrawBuffers(int count)
if (count > 0) if (count > 0)
{ {
if (count > 8) TRACELOG(LOG_WARNING, "GL: Max color buffers limited to 8");
if (count > 8) TRACELOG(RL_LOG_WARNING, "GL: Max color buffers limited to 8");
else else
{ {
unsigned int buffers[8] = { unsigned int buffers[8] = {
@ -1902,7 +1902,7 @@ void rlActiveDrawBuffers(int count)
glDrawBuffers(count, buffers); glDrawBuffers(count, buffers);
} }
} }
else TRACELOG(LOG_WARNING, "GL: One color buffer active by default");
else TRACELOG(RL_LOG_WARNING, "GL: One color buffer active by default");
#endif #endif
} }
@ -2219,10 +2219,10 @@ static void GLAPIENTRY rlDebugMessageCallback(GLenum source, GLenum type, GLuint
default: break; default: break;
} }
TRACELOG(LOG_WARNING, "GL: OpenGL debug message: %s", message);
TRACELOG(LOG_WARNING, " > Type: %s", msgType);
TRACELOG(LOG_WARNING, " > Source = %s", msgSource);
TRACELOG(LOG_WARNING, " > Severity = %s", msgSeverity);
TRACELOG(RL_LOG_WARNING, "GL: OpenGL debug message: %s", message);
TRACELOG(RL_LOG_WARNING, " > Type: %s", msgType);
TRACELOG(RL_LOG_WARNING, " > Source = %s", msgSource);
TRACELOG(RL_LOG_WARNING, " > Severity = %s", msgSeverity);
} }
#endif #endif
@ -4178,7 +4178,7 @@ unsigned int rlCompileShader(const char *shaderCode, int type)
RL_FREE(log); RL_FREE(log);
} }
// Unload object allocated by glCreateShader(),
// Unload object allocated by glCreateShader(),
// despite failing in the compilation process // despite failing in the compilation process
glDeleteShader(shader); glDeleteShader(shader);
shader = 0; shader = 0;

Loading…
Cancel
Save