github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-09 11:34:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12003 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-06-19 07:48:36 +00:00
parent b411fd3aac
commit 3684740e5e
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
uppsrc/GLDraw/GLDrawS.cpp
View file

@ -117,7 +117,6 @@ void initializeGL()
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
void GLOrtho(float left, float right, float bottom, float top, float near_, float far_, GLuint u_projection)
@ -282,12 +281,6 @@ void GLDraw::PutRect(const Rect& rect, Color color)
#endif
}
int PutImagePixels;
EXITBLOCK {
RDUMP(PutImagePixels);
}
void GLDraw::PutImage(Point p, const Image& img, const Rect& src)
{
LTIMING("PutImage");
@ -299,8 +292,6 @@ void GLDraw::PutImage(Point p, const Image& img, const Rect& src)
Rect s = src & isz;
Rect r(p, s.GetSize());
PutImagePixels += isz.cx * isz.cy;
GLshort vertex[] = {
(GLshort)r.left, (GLshort)r.top,
(GLshort)r.left, (GLshort)r.bottom,
@ -348,25 +339,16 @@ void GLDraw::PutImage(Point p, const Image& img, const Rect& src)
glDisableVertexAttribArray(ATTRIB_TEXPOS);
}
int PutImageCPixels;
EXITBLOCK {
RDUMP(PutImageCPixels);
}
void GLDraw::PutImage(Point p, const Image& img, const Rect& src, Color color)
{
FlushPutRect();
RTIMING("PutImage colored");
gl_image_colored.Use();
Size isz = img.GetSize();
Rect s = src & isz;
Rect rect(p, s.GetSize());
PutImageCPixels += isz.cx * isz.cy;
GLshort vertex[] = {
(GLshort)rect.left, (GLshort)rect.top,
(GLshort)rect.left, (GLshort)rect.bottom,
@ -433,7 +415,7 @@ void GLDraw::Init(Size sz, uint64 context_)
SDraw::Init(sz);
ONCELOCK {
initializeGL();
initializeGL();
}
gl_image.Use();