[Scummvm-git-logs] scummvm master -> ce5c63e0b39c69373e445cce21592e2677c4518a

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ce5c63e0b3 PLAYGROUND3D: Added tinygl blit test


Commit: ce5c63e0b39c69373e445cce21592e2677c4518a
    https://github.com/scummvm/scummvm/commit/ce5c63e0b39c69373e445cce21592e2677c4518a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-04T15:28:35+01:00

Commit Message:
PLAYGROUND3D: Added tinygl blit test

Changed paths:
    engines/playground3d/gfx_tinygl.cpp
    engines/playground3d/gfx_tinygl.h


diff --git a/engines/playground3d/gfx_tinygl.cpp b/engines/playground3d/gfx_tinygl.cpp
index 0867d80712..bbb6d1a67b 100644
--- a/engines/playground3d/gfx_tinygl.cpp
+++ b/engines/playground3d/gfx_tinygl.cpp
@@ -106,6 +106,11 @@ void TinyGLRenderer::init() {
 	tglGenTextures(2, _textureRgb565Id);
 	tglGenTextures(2, _textureRgba5551Id);
 	tglGenTextures(2, _textureRgba4444Id);
+	_blitImageRgba = Graphics::tglGenBlitImage();
+	_blitImageRgb = Graphics::tglGenBlitImage();
+	_blitImageRgb565 = Graphics::tglGenBlitImage();
+	_blitImageRgba5551 = Graphics::tglGenBlitImage();
+	_blitImageRgba4444 = Graphics::tglGenBlitImage();
 }
 
 void TinyGLRenderer::deinit() {
@@ -114,6 +119,11 @@ void TinyGLRenderer::deinit() {
 	tglDeleteTextures(2, _textureRgb565Id);
 	tglDeleteTextures(2, _textureRgba5551Id);
 	tglDeleteTextures(2, _textureRgba4444Id);
+	tglDeleteBlitImage(_blitImageRgba);
+	tglDeleteBlitImage(_blitImageRgb);
+	tglDeleteBlitImage(_blitImageRgb565);
+	tglDeleteBlitImage(_blitImageRgba5551);
+	tglDeleteBlitImage(_blitImageRgba4444);
 }
 
 void TinyGLRenderer::loadTextureRGBA(Graphics::Surface *texture) {
@@ -125,6 +135,7 @@ void TinyGLRenderer::loadTextureRGBA(Graphics::Surface *texture) {
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MIN_FILTER, TGL_NEAREST);
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MAG_FILTER, TGL_NEAREST);
 	tglTexImage2D(TGL_TEXTURE_2D, 0, TGL_RGBA, texture->w, texture->h, 0, TGL_BGRA, TGL_UNSIGNED_BYTE, texture->getPixels());
+	tglUploadBlitImage(_blitImageRgba, *texture, 0, false);
 }
 
 void TinyGLRenderer::loadTextureRGB(Graphics::Surface *texture) {
@@ -132,6 +143,7 @@ void TinyGLRenderer::loadTextureRGB(Graphics::Surface *texture) {
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MIN_FILTER, TGL_NEAREST);
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MAG_FILTER, TGL_NEAREST);
 	tglTexImage2D(TGL_TEXTURE_2D, 0, TGL_RGBA, texture->w, texture->h, 0, TGL_RGB, TGL_UNSIGNED_BYTE, texture->getPixels());
+	tglUploadBlitImage(_blitImageRgb, *texture, 0, false);
 }
 
 void TinyGLRenderer::loadTextureRGB565(Graphics::Surface *texture) {
@@ -139,6 +151,7 @@ void TinyGLRenderer::loadTextureRGB565(Graphics::Surface *texture) {
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MIN_FILTER, TGL_NEAREST);
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MAG_FILTER, TGL_NEAREST);
 	tglTexImage2D(TGL_TEXTURE_2D, 0, TGL_RGBA, texture->w, texture->h, 0, TGL_RGB, TGL_UNSIGNED_SHORT_5_6_5, texture->getPixels());
+	tglUploadBlitImage(_blitImageRgb565, *texture, 0, false);
 }
 
 void TinyGLRenderer::loadTextureRGBA5551(Graphics::Surface *texture) {
@@ -146,6 +159,7 @@ void TinyGLRenderer::loadTextureRGBA5551(Graphics::Surface *texture) {
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MIN_FILTER, TGL_NEAREST);
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MAG_FILTER, TGL_NEAREST);
 	tglTexImage2D(TGL_TEXTURE_2D, 0, TGL_RGBA, texture->w, texture->h, 0, TGL_RGBA, TGL_UNSIGNED_SHORT_5_5_5_1, texture->getPixels());
+	tglUploadBlitImage(_blitImageRgba5551, *texture, 0, false);
 }
 
 void TinyGLRenderer::loadTextureRGBA4444(Graphics::Surface *texture) {
@@ -153,6 +167,7 @@ void TinyGLRenderer::loadTextureRGBA4444(Graphics::Surface *texture) {
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MIN_FILTER, TGL_NEAREST);
 	tglTexParameteri(TGL_TEXTURE_2D, TGL_TEXTURE_MAG_FILTER, TGL_NEAREST);
 	tglTexImage2D(TGL_TEXTURE_2D, 0, TGL_RGBA, texture->w, texture->h, 0, TGL_RGBA, TGL_UNSIGNED_SHORT_4_4_4_4, texture->getPixels());
+	tglUploadBlitImage(_blitImageRgba4444, *texture, 0, false);
 }
 
 void TinyGLRenderer::clear(const Math::Vector4d &clearColor) {
@@ -372,6 +387,29 @@ void TinyGLRenderer::drawRgbaTexture() {
 	tglDisableClientState(TGL_VERTEX_ARRAY);
 	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
+	int blitTextureWidth, blitTextureHeight;
+	Graphics::tglGetBlitImageSize(_blitImageRgba, blitTextureWidth, blitTextureHeight);
+
+	Graphics::BlitTransform transform(0, 250);
+	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
+	tglBlit(_blitImageRgba, transform);
+	
+	transform = Graphics::BlitTransform(130, 250);
+	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
+	tglBlit(_blitImageRgb, transform);
+
+	transform = Graphics::BlitTransform(260, 250);
+	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
+	tglBlit(_blitImageRgb565, transform);
+
+	transform = Graphics::BlitTransform(390, 250);
+	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
+	tglBlit(_blitImageRgba5551, transform);
+
+	transform = Graphics::BlitTransform(520, 250);
+	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
+	tglBlit(_blitImageRgba4444, transform);
+
 	tglMatrixMode(TGL_MODELVIEW);
 	tglPopMatrix();
 
diff --git a/engines/playground3d/gfx_tinygl.h b/engines/playground3d/gfx_tinygl.h
index a3edd07444..bc9f509bd3 100644
--- a/engines/playground3d/gfx_tinygl.h
+++ b/engines/playground3d/gfx_tinygl.h
@@ -66,6 +66,11 @@ private:
 	TGLuint _textureRgb565Id[2];
 	TGLuint _textureRgba5551Id[2];
 	TGLuint _textureRgba4444Id[2];
+	Graphics::BlitImage *_blitImageRgba;
+	Graphics::BlitImage *_blitImageRgb;
+	Graphics::BlitImage *_blitImageRgb565;
+	Graphics::BlitImage *_blitImageRgba5551;
+	Graphics::BlitImage *_blitImageRgba4444;
 
 	void drawFace(uint face);
 };