[Scummvm-git-logs] scummvm master -> 70e714c722d4458531931ed3d49058371433a9d6
aquadran
noreply at scummvm.org
Fri Dec 3 23:20:39 UTC 2021
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:
70e714c722 PLAYGROUND3D: Limit number of pixel formats for test bitmap
Commit: 70e714c722d4458531931ed3d49058371433a9d6
https://github.com/scummvm/scummvm/commit/70e714c722d4458531931ed3d49058371433a9d6
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-04T00:20:33+01:00
Commit Message:
PLAYGROUND3D: Limit number of pixel formats for test bitmap
Changed paths:
engines/playground3d/gfx_opengl.cpp
engines/playground3d/gfx_opengl_shaders.cpp
engines/playground3d/gfx_tinygl.cpp
diff --git a/engines/playground3d/gfx_opengl.cpp b/engines/playground3d/gfx_opengl.cpp
index 359bebff9b..e34f2454a3 100644
--- a/engines/playground3d/gfx_opengl.cpp
+++ b/engines/playground3d/gfx_opengl.cpp
@@ -119,22 +119,6 @@ void OpenGLRenderer::loadTextureRGBA(Graphics::Surface *texture) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_BYTE, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[2]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[4]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[5]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texture->getPixels());
}
void OpenGLRenderer::loadTextureRGB(Graphics::Surface *texture) {
@@ -142,10 +126,6 @@ void OpenGLRenderer::loadTextureRGB(Graphics::Surface *texture) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGB, GL_UNSIGNED_BYTE, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbId[1]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGR, GL_UNSIGNED_BYTE, texture->getPixels());
}
void OpenGLRenderer::setupViewport(int x, int y, int width, int height) {
@@ -328,50 +308,6 @@ void OpenGLRenderer::drawRgbaTexture() {
glTranslatef(0.5, 0, 0);
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
- glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[2]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
- glTranslatef(0.5, 0, 0);
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
- glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[3]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
- glTranslatef(-1.5, -0.5, 0);
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
- glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[4]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
- glTranslatef(0.5, 0, 0);
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
- glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[5]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
- glTranslatef(0.5, 0, 0);
-
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
@@ -381,17 +317,6 @@ void OpenGLRenderer::drawRgbaTexture() {
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glTranslatef(0.5, 0, 0);
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
- glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
- glBindTexture(GL_TEXTURE_2D, _textureRgbId[1]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
diff --git a/engines/playground3d/gfx_opengl_shaders.cpp b/engines/playground3d/gfx_opengl_shaders.cpp
index dc926a1b89..bb74344631 100644
--- a/engines/playground3d/gfx_opengl_shaders.cpp
+++ b/engines/playground3d/gfx_opengl_shaders.cpp
@@ -128,22 +128,6 @@ void ShaderRenderer::loadTextureRGBA(Graphics::Surface *texture) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_BYTE, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[2]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[4]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[5]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texture->getPixels());
}
void ShaderRenderer::loadTextureRGB(Graphics::Surface *texture) {
@@ -151,10 +135,6 @@ void ShaderRenderer::loadTextureRGB(Graphics::Surface *texture) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGB, GL_UNSIGNED_BYTE, texture->getPixels());
- glBindTexture(GL_TEXTURE_2D, _textureRgbId[1]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_BGR, GL_UNSIGNED_BYTE, texture->getPixels());
}
void ShaderRenderer::setupViewport(int x, int y, int width, int height) {
@@ -221,39 +201,9 @@ void ShaderRenderer::drawRgbaTexture() {
offset.setX(0.2);
offset.setY(0.8);
_bitmapShader->setUniform("offsetXY", offset);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[2]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
- offset.setX(0.7);
- offset.setY(0.8);
- _bitmapShader->setUniform("offsetXY", offset);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[3]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
- offset.setX(-0.8);
- offset.setY(0.3);
- _bitmapShader->setUniform("offsetXY", offset);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[4]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
- offset.setX(-0.3);
- offset.setY(0.3);
- _bitmapShader->setUniform("offsetXY", offset);
- glBindTexture(GL_TEXTURE_2D, _textureRgbaId[5]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
- offset.setX(0.2);
- offset.setY(0.3);
- _bitmapShader->setUniform("offsetXY", offset);
glBindTexture(GL_TEXTURE_2D, _textureRgbId[0]);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- offset.setX(0.7);
- offset.setY(0.3);
- _bitmapShader->setUniform("offsetXY", offset);
- glBindTexture(GL_TEXTURE_2D, _textureRgbId[1]);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
_bitmapShader->unbind();
}
diff --git a/engines/playground3d/gfx_tinygl.cpp b/engines/playground3d/gfx_tinygl.cpp
index acea6b30bb..b8e57352b8 100644
--- a/engines/playground3d/gfx_tinygl.cpp
+++ b/engines/playground3d/gfx_tinygl.cpp
@@ -119,22 +119,6 @@ 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());
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[2]);
- 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_INT_8_8_8_8, texture->getPixels());
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[3]);
- 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_INT_8_8_8_8, texture->getPixels());
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[4]);
- 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_INT_8_8_8_8_REV, texture->getPixels());
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[5]);
- 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_INT_8_8_8_8_REV, texture->getPixels());
}
void TinyGLRenderer::loadTextureRGB(Graphics::Surface *texture) {
@@ -142,10 +126,6 @@ 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());
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbId[1]);
- 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_BGR, TGL_UNSIGNED_BYTE, texture->getPixels());
}
void TinyGLRenderer::clear(const Math::Vector4d &clearColor) {
@@ -339,50 +319,6 @@ void TinyGLRenderer::drawRgbaTexture() {
tglTranslatef(0.5, 0, 0);
- tglEnableClientState(TGL_VERTEX_ARRAY);
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
- tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[2]);
- tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
- tglDisableClientState(TGL_VERTEX_ARRAY);
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
-
- tglTranslatef(0.5, 0, 0);
-
- tglEnableClientState(TGL_VERTEX_ARRAY);
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
- tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[3]);
- tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
- tglDisableClientState(TGL_VERTEX_ARRAY);
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
-
- tglTranslatef(-1.5, -0.5, 0);
-
- tglEnableClientState(TGL_VERTEX_ARRAY);
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
- tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[4]);
- tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
- tglDisableClientState(TGL_VERTEX_ARRAY);
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
-
- tglTranslatef(0.5, 0, 0);
-
- tglEnableClientState(TGL_VERTEX_ARRAY);
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
- tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[5]);
- tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
- tglDisableClientState(TGL_VERTEX_ARRAY);
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
-
- tglTranslatef(0.5, 0, 0);
-
tglEnableClientState(TGL_VERTEX_ARRAY);
tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
@@ -392,17 +328,6 @@ void TinyGLRenderer::drawRgbaTexture() {
tglDisableClientState(TGL_VERTEX_ARRAY);
tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglTranslatef(0.5, 0, 0);
-
- tglEnableClientState(TGL_VERTEX_ARRAY);
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
- tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
- tglBindTexture(TGL_TEXTURE_2D, _textureRgbId[1]);
- tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
- tglDisableClientState(TGL_VERTEX_ARRAY);
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
-
tglMatrixMode(TGL_MODELVIEW);
tglPopMatrix();
More information about the Scummvm-git-logs
mailing list