Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GLMeta: "Finish" -> "End"

This commit is contained in:
Jonas Kulla 2014-07-16 04:53:08 +02:00
parent a26c73930d
commit bae977d4ab
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bitmap.cpp
View File

@ -387,7 +387,7 @@ void Bitmap::stretchBlt(const IntRect &destRect,
GLMeta::blitBegin(p->gl); GLMeta::blitBegin(p->gl);
GLMeta::blitSource(source.p->gl); GLMeta::blitSource(source.p->gl);
GLMeta::blitRectangle(sourceRect, destRect); GLMeta::blitRectangle(sourceRect, destRect);
GLMeta::blitFinish(); GLMeta::blitEnd();
} }
else else
{ {
@ -399,7 +399,7 @@ void Bitmap::stretchBlt(const IntRect &destRect,
GLMeta::blitBegin(gpTex); GLMeta::blitBegin(gpTex);
GLMeta::blitSource(p->gl); GLMeta::blitSource(p->gl);
GLMeta::blitRectangle(destRect, Vec2i()); GLMeta::blitRectangle(destRect, Vec2i());
GLMeta::blitFinish(); GLMeta::blitEnd();
FloatRect bltSubRect((float) sourceRect.x / source.width(), FloatRect bltSubRect((float) sourceRect.x / source.width(),
(float) sourceRect.y / source.height(), (float) sourceRect.y / source.height(),
@ -906,7 +906,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
posRect.x, posRect.y, posRect.x, posRect.y,
posRect.w, posRect.h, posRect.w, posRect.h,
txtSurf, GL_BGRA); txtSurf, GL_BGRA);
GLMeta::subRectImageFinish(); GLMeta::subRectImageEnd();
} }
} }
} }
@ -922,7 +922,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
GLMeta::blitSource(gpTF); GLMeta::blitSource(gpTF);
GLMeta::blitRectangle(IntRect(0, 0, txtSurf->w, txtSurf->h), GLMeta::blitRectangle(IntRect(0, 0, txtSurf->w, txtSurf->h),
posRect, FBO::Linear); posRect, FBO::Linear);
GLMeta::blitFinish(); GLMeta::blitEnd();
} }
} }
else else
@ -934,7 +934,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
GLMeta::blitBegin(gpTex2); GLMeta::blitBegin(gpTex2);
GLMeta::blitSource(p->gl); GLMeta::blitSource(p->gl);
GLMeta::blitRectangle(posRect, Vec2i()); GLMeta::blitRectangle(posRect, Vec2i());
GLMeta::blitFinish(); GLMeta::blitEnd();
FloatRect bltRect(0, 0, FloatRect bltRect(0, 0,
(float) gpTexSize.x / gpTex2.width, (float) gpTexSize.x / gpTex2.width,

4
src/gl-meta.cpp
View File

@ -52,7 +52,7 @@ void subRectImageUpload(GLint srcW, GLint srcX, GLint srcY,
} }
} }
void subRectImageFinish() void subRectImageEnd()
{ {
if (gl.unpack_subimage) if (gl.unpack_subimage)
PixelStore::reset(); PixelStore::reset();
@ -195,7 +195,7 @@ void blitRectangle(const IntRect &src, const IntRect &dst, FBO::BlitMode mode)
} }
} }
void blitFinish() void blitEnd()
{ {
if (!HAVE_NATIVE_BLIT) if (!HAVE_NATIVE_BLIT)
glState.viewport.pop(); glState.viewport.pop();

4
src/gl-meta.h
View File

@ -35,7 +35,7 @@ namespace GLMeta
void subRectImageUpload(GLint srcW, GLint srcX, GLint srcY, void subRectImageUpload(GLint srcW, GLint srcX, GLint srcY,
GLint dstX, GLint dstY, GLsizei dstW, GLsizei dstH, GLint dstX, GLint dstY, GLsizei dstW, GLsizei dstH,
SDL_Surface *src, GLenum format); SDL_Surface *src, GLenum format);
void subRectImageFinish(); void subRectImageEnd();
/* ARB_vertex_array_object */ /* ARB_vertex_array_object */
struct VAO struct VAO
@ -72,7 +72,7 @@ void blitRectangle(const IntRect &src, const Vec2i &dstPos,
FBO::BlitMode mode = FBO::Nearest); FBO::BlitMode mode = FBO::Nearest);
void blitRectangle(const IntRect &src, const IntRect &dst, void blitRectangle(const IntRect &src, const IntRect &dst,
FBO::BlitMode mode = FBO::Nearest); FBO::BlitMode mode = FBO::Nearest);
void blitFinish(); void blitEnd();
} }

28
src/graphics.cpp
View File

@ -163,9 +163,9 @@ public:
glState.scissorTest.pushSet(false); glState.scissorTest.pushSet(false);
GLMeta::blitBegin(pp.frontBuffer()); GLMeta::blitBegin(pp.frontBuffer());
GLMeta::blitSetSource(pp.backBuffer()); GLMeta::blitSource(pp.backBuffer());
GLMeta::blitRectangle(geometry.rect, Vec2i()); GLMeta::blitRectangle(geometry.rect, Vec2i());
GLMeta::blitFinish(); GLMeta::blitEnd();
glState.scissorTest.pop(); glState.scissorTest.pop();
@ -504,9 +504,9 @@ struct GraphicsPrivate
screen.composite(); screen.composite();
GLMeta::blitBegin(buffer); GLMeta::blitBegin(buffer);
GLMeta::blitSetSource(screen.getPP().frontBuffer()); GLMeta::blitSource(screen.getPP().frontBuffer());
GLMeta::blitRectangle(IntRect(0, 0, scRes.x, scRes.y), Vec2i()); GLMeta::blitRectangle(IntRect(0, 0, scRes.x, scRes.y), Vec2i());
GLMeta::blitFinish(); GLMeta::blitEnd();
} }
void metaBlitBufferFlippedScaled() void metaBlitBufferFlippedScaled()
@ -521,12 +521,12 @@ struct GraphicsPrivate
screen.composite(); screen.composite();
GLMeta::blitBeginScreen(winSize); GLMeta::blitBeginScreen(winSize);
GLMeta::blitSetSource(screen.getPP().frontBuffer()); GLMeta::blitSource(screen.getPP().frontBuffer());
FBO::clear(); FBO::clear();
metaBlitBufferFlippedScaled(); metaBlitBufferFlippedScaled();
GLMeta::blitFinish(); GLMeta::blitEnd();
swapGLBuffer(); swapGLBuffer();
} }
@ -663,9 +663,9 @@ void Graphics::transition(int duration,
FBO::clear(); FBO::clear();
GLMeta::blitBeginScreen(Vec2i(p->winSize)); GLMeta::blitBeginScreen(Vec2i(p->winSize));
GLMeta::blitSetSource(p->transBuffer); GLMeta::blitSource(p->transBuffer);
p->metaBlitBufferFlippedScaled(); p->metaBlitBufferFlippedScaled();
GLMeta::blitFinish(); GLMeta::blitEnd();
p->swapGLBuffer(); p->swapGLBuffer();
} }
@ -725,12 +725,12 @@ void Graphics::fadeout(int duration)
if (p->frozen) if (p->frozen)
{ {
GLMeta::blitBeginScreen(p->scSize); GLMeta::blitBeginScreen(p->scSize);
GLMeta::blitSetSource(p->frozenScene); GLMeta::blitSource(p->frozenScene);
FBO::clear(); FBO::clear();
p->metaBlitBufferFlippedScaled(); p->metaBlitBufferFlippedScaled();
GLMeta::blitFinish(); GLMeta::blitEnd();
p->swapGLBuffer(); p->swapGLBuffer();
} }
@ -752,12 +752,12 @@ void Graphics::fadein(int duration)
if (p->frozen) if (p->frozen)
{ {
GLMeta::blitBeginScreen(p->scSize); GLMeta::blitBeginScreen(p->scSize);
GLMeta::blitSetSource(p->frozenScene); GLMeta::blitSource(p->frozenScene);
FBO::clear(); FBO::clear();
p->metaBlitBufferFlippedScaled(); p->metaBlitBufferFlippedScaled();
GLMeta::blitFinish(); GLMeta::blitEnd();
p->swapGLBuffer(); p->swapGLBuffer();
} }
@ -868,7 +868,7 @@ void Graphics::repaintWait(volatile bool *exitCond)
/* Repaint the screen with the last good frame we drew */ /* Repaint the screen with the last good frame we drew */
TEXFBO &lastFrame = p->screen.getPP().frontBuffer(); TEXFBO &lastFrame = p->screen.getPP().frontBuffer();
GLMeta::blitBeginScreen(p->winSize); GLMeta::blitBeginScreen(p->winSize);
GLMeta::blitSetSource(lastFrame); GLMeta::blitSource(lastFrame);
while (!*exitCond) while (!*exitCond)
{ {
@ -882,5 +882,5 @@ void Graphics::repaintWait(volatile bool *exitCond)
p->threadData->ethread->notifyFrame(); p->threadData->ethread->notifyFrame();
} }
GLMeta::blitFinish(); GLMeta::blitEnd();
} }

6
src/tilemap.cpp
View File

@ -588,7 +588,7 @@ struct TilemapPrivate
} }
} }
GLMeta::blitFinish(); GLMeta::blitEnd();
/* Blit tileset */ /* Blit tileset */
if (tileset->megaSurface()) if (tileset->megaSurface())
@ -606,7 +606,7 @@ struct TilemapPrivate
blitOp.dst.x, blitOp.dst.y, tsLaneW, blitOp.h, tsSurf, GL_RGBA); blitOp.dst.x, blitOp.dst.y, tsLaneW, blitOp.h, tsSurf, GL_RGBA);
} }
GLMeta::subRectImageFinish(); GLMeta::subRectImageEnd();
} }
else else
{ {
@ -622,7 +622,7 @@ struct TilemapPrivate
blitOp.dst); blitOp.dst);
} }
GLMeta::blitFinish(); GLMeta::blitEnd();
} }
} }