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

[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:
e22f1a6cc4 WME3D: Removed packed flag, it's not needed


Commit: e22f1a6cc4a36c5f440b52dddb5836e28f1bbf13
    https://github.com/scummvm/scummvm/commit/e22f1a6cc4a36c5f440b52dddb5836e28f1bbf13
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-29T23:23:55+01:00

Commit Message:
WME3D: Removed packed flag, it's not needed

Changed paths:
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
    engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp


diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 057ed31a9d6..86bfddb665d 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -545,21 +545,17 @@ BaseSurface *Wintermute::BaseRenderOpenGL3D::createSurface() {
 	return new BaseSurfaceOpenGL3D(_gameRef, this);
 }
 
-#include "common/pack-start.h"
-
 struct SpriteVertex {
 	float u;
 	float v;
+	float x;
+	float y;
+	float z;
 	uint8 r;
 	uint8 g;
 	uint8 b;
 	uint8 a;
-	float x;
-	float y;
-	float z;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute::Rect32 &rect,
 									  const Wintermute::Vector2 &pos, const Wintermute::Vector2 &rot, const Wintermute::Vector2 &scale,
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 5daf580c3cf..b60b55f97e0 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -39,8 +39,6 @@ namespace Wintermute {
 
 class BaseSurfaceOpenGL3D;
 
-#include "common/pack-start.h"
-
 struct SimpleShadowVertex {
 	float u;
 	float v;
@@ -50,9 +48,7 @@ struct SimpleShadowVertex {
 	float x;
 	float y;
 	float z;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 class BaseRenderOpenGL3D : public BaseRenderer3D {
 public:
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index ec4780ed616..866f007e87a 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -40,8 +40,6 @@ BaseRenderer3D *makeOpenGL3DShaderRenderer(BaseGame *inGame) {
 	return new BaseRenderOpenGL3DShader(inGame);
 }
 
-#include "common/pack-start.h"
-
 struct SpriteVertexShader {
 	float x;
 	float y;
@@ -51,9 +49,7 @@ struct SpriteVertexShader {
 	float g;
 	float b;
 	float a;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 BaseRenderOpenGL3DShader::BaseRenderOpenGL3DShader(BaseGame *inGame)
 	: BaseRenderer3D(inGame), _spriteBatchMode(false), _flatShadowMaskShader(nullptr) {
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
index 764b124cb3c..b85a528d8d4 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
@@ -36,14 +36,10 @@
 
 namespace Wintermute {
 
-#include "common/pack-start.h"
-
 struct ShadowVertexShader {
 	float x;
 	float y;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 //////////////////////////////////////////////////////////////////////////
 ShadowVolumeOpenGLShader::ShadowVolumeOpenGLShader(BaseGame *inGame, OpenGL::ShaderGL *volumeShader, OpenGL::ShaderGL *maskShader)