From 783b8936d2eb315add9d1098b126e7352ffdb2ba Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmail.com>
Date: Sun, 21 Jun 2020 12:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8BOpenGL=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/shader2/v14/.suo | Bin 43520 -> 43520 bytes
 misc.cpp             |  33 +++++++++++++++++++++++++++++++++
 misc.h               |   3 +++
 timer.cpp            |   2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.vs/shader2/v14/.suo b/.vs/shader2/v14/.suo
index 5874f40a67f1b107244617864a9a5731aeebdd2c..8cc6f7ad1eb095516eadcd8fd094cd656bb25d2a 100644
GIT binary patch
delta 907
zcmZp;!qjkuX@Y?)0}Kc-FaQw)6A=IV|NlQom~k>AtMbN#35=7Na`+e|?{qY{Ut?4O
z$(T;AVya@iy!k7WI%B;&PyndozXXt$17eVNMIg-y#G*h9l4FI^!9dy)h<SjR9f&1?
z7$gsJhcFP!K=~juM1X8wAm)aO@j+>jdTj)I@@y7c9x(*}|KukuF^p219a*&*`5HQP
zvACKI>S`9CE@W4OOa{3cM1x!hqWOU|%++jAF>xRbaxKW!AT`oJ8suUSKzFquR1HXu
z7*})tW)!>tHSZFX{x>mj^Cm7E>=KLkm?pV7Pd?0KxVglwhjEbr(;^X;MIMZk8zhw&
z%_l1|$xc3?$iia{Gz%7jlP{{Ou$~7B<W8=X)MPXRD{_!EVZ8_x%iR1^lAUFd5Yr@u
z6CC<L0g%f<IwpTnxWZw8B)}R2<fL!@$q!Vn#<Zx2X_CZYUIr_mAS~KJ+9s*7Z2lpk
z!8ln#VFiBkc);cXwS&MS4VFn3hbKFW8gBk#!Na&o>i{#O$K=Km3&l)^T!vJJA_hH%
zWQGDDJecdYH1SXW_16Uk4S64beqjJ6Tj9ytO2U&HN-Sj&sxufwu5eZdKR&$qvBtqb
rUBCRl5S0z8;sO)@iKjcua?~@dcxQiq@yWi;7nBSbrD$)(BAYw_;EYqS

delta 654
zcmb7=ze_?<6vywmJx%Lrg+{+npFc>VEQ=@wkxU_|Nn9O_hL(s1TO7hY1ATXEd=Rzf
zYp5-9X)DT_8XAKB0h<Et98)o<p>z3gesb>j-h7qktGpO=aMrRx#(FWNyxwRusM;gI
z;62Y2LFGHv%)!M;ZtWR-)L9fco`XC6gZm+X(~SWvP9RQ%ayNQ2Vn94d2%)tpTIqIR
zMpFuU3*tp&#Dutzx;T<H<YkOd6$>NcO-jR%9y3gX^`2e+qQvNju!NJ{N{pD(J*0#@
zDIrgm!q|>9m6ehs9Z~&QY>T47pQ3E76&+E-dd&O@P%kAb<-W*wpjo-*ku<xct#Wln
z(UtMnp0Y>bLQ&34!PW+mO!!1isfx{gn@A_dd}(ZKBTd_4dw6P3SBLA-2k~xr%)Cs^
z95ehrn+Sw#dNg<g<)v#7*QYDmB-du8cBV$+79insxQIMmq-P@qC_57%16Jv;+Z~a0
s6;ylN!szqp?d^u1wHIKN{YQwpP!SbAuh$l2P?g(1pDK4hRg3I?0Y6jD4gdfE

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()