Skip to content

Commit e6f1464

Browse files
Small fixes
1 parent c0ff137 commit e6f1464

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

src/libprojectM/projectM-opengl.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
// stuff that needs to be ported to newer GL calls
99
#define GL_TRANSITION
1010

11+
// Enable openGL extra checks, better not be enabled in release build
12+
#define OGL_DEBUG 0
13+
14+
1115
#define DUMP_SHADERS_ON_ERROR
1216

1317
#ifdef __APPLE__
@@ -27,7 +31,5 @@
2731
# endif
2832
#endif
2933

30-
void _check_gl_error(const char *file, int line);
31-
#define check_gl_error() _check_gl_error(__FILE__,__LINE__)
3234

3335
#endif // __PROJECTM_OPENGL_H__

src/libprojectM/projectM.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -936,21 +936,3 @@ void projectM::getMeshSize(int *w, int *h) {
936936
*h = _settings.meshY;
937937
}
938938

939-
void _check_gl_error(const char *file, int line) {
940-
GLenum err (glGetError());
941-
942-
while(err!=GL_NO_ERROR) {
943-
string error;
944-
945-
switch(err) {
946-
case GL_INVALID_OPERATION: error="INVALID_OPERATION"; break;
947-
case GL_INVALID_ENUM: error="INVALID_ENUM"; break;
948-
case GL_INVALID_VALUE: error="INVALID_VALUE"; break;
949-
case GL_OUT_OF_MEMORY: error="OUT_OF_MEMORY"; break;
950-
case GL_INVALID_FRAMEBUFFER_OPERATION: error="INVALID_FRAMEBUFFER_OPERATION"; break;
951-
}
952-
953-
std::cerr << "GL_" << error.c_str() <<" - "<<file<<":"<<line<<std::endl;
954-
err=glGetError();
955-
}
956-
}

src/projectM-sdl/projectM_SDL_main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "pmSDL.hpp"
1010

11-
#define OGL_DEBUG 0
1211
#define UNLOCK_FPS 0
1312
#define FAKE_AUDIO 0
1413
#define TEST_ALL_PRESETS 0
@@ -170,7 +169,9 @@ int main(int argc, char *argv[]) {
170169
}
171170
}
172171

173-
fprintf(stdout, "Preset loading errors: %d/%d [%d%%]\n", buildErrors, app->getPlaylistSize(), (buildErrors*100) / app->getPlaylistSize());
172+
if (app->getPlaylistSize()) {
173+
fprintf(stdout, "Preset loading errors: %d/%d [%d%%]\n", buildErrors, app->getPlaylistSize(), (buildErrors*100) / app->getPlaylistSize());
174+
}
174175

175176
return PROJECTM_SUCCESS;
176177
#endif

0 commit comments

Comments
 (0)