diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo index 5874f40..8cc6f7a 100644 Binary files a/.vs/shader2/v14/.suo and b/.vs/shader2/v14/.suo differ diff --git a/misc.cpp b/misc.cpp index e1d10c3..e10475a 100644 --- a/misc.cpp +++ b/misc.cpp @@ -284,4 +284,37 @@ void SaveImage(const char*imagePath, unsigned char*imgData, int width, int heigh fwrite(imgData, 1, width*height * 3, pFile); fclose(pFile); } +} + +void CheckGLError(const char*file, int line) +{ + + GLenum error = glGetError(); + if (error != GL_NO_ERROR) + { + switch (error) + { + case GL_INVALID_ENUM: + printf("GL Error GL_INVALID_ENUM %s : %d\n", file, line); + break; + case GL_INVALID_VALUE: + printf("GL Error GL_INVALID_VALUE %s : %d\n", file, line); + break; + case GL_INVALID_OPERATION: + printf("GL Error GL_INVALID_OPERATION %s : %d\n", file, line); + break; + case GL_STACK_OVERFLOW: + printf("GL Error GL_STACK_OVERFLOW %s : %d\n", file, line); + break; + case GL_STACK_UNDERFLOW: + printf("GL Error GL_STACK_UNDERFLOW %s : %d\n", file, line); + break; + case GL_OUT_OF_MEMORY: + printf("GL Error GL_OUT_OF_MEMORY %s : %d\n", file, line); + break; + default: + printf("GL Error 0x%x %s : %d\n", error, file, line); + break; + } + } } \ No newline at end of file diff --git a/misc.h b/misc.h index c333224..cd121b7 100644 --- a/misc.h +++ b/misc.h @@ -9,3 +9,6 @@ GLuint CreateTextureFromBMP(const char* imagePath); GLuint CreateTextureFromFile(const char* imagePath); GLuint CreateTextureFromDds(const char* imagePath); void SaveImage(const char* imgPath, unsigned char* imgData, int width, int height); + +void CheckGLError(const char* file, int line); +#define GL_CALL(x) do{x;CheckGLError(__FILE__,__LINE__);}while(0) diff --git a/timer.cpp b/timer.cpp index 758151f..8e6cbc2 100644 --- a/timer.cpp +++ b/timer.cpp @@ -23,7 +23,7 @@ int Timer::GetPassedTickers() SetThreadAffinityMask(mCurrentThread, 1); QueryPerformanceCounter(&mEnd); SetThreadAffinityMask(mCurrentThread, mProcessAffinityMask); - return mEnd.QuadPart - mStart.QuadPart; + return (int)(mEnd.QuadPart - mStart.QuadPart); } float Timer::GetPassedTime()