[Scummvm-git-logs] scummvm master -> 8224aeffaed45e7e7ea3ba49464bc43a4763558d

[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:
8224aeffae STARK: No need structs to be set as packed


Commit: 8224aeffaed45e7e7ea3ba49464bc43a4763558d
    https://github.com/scummvm/scummvm/commit/8224aeffaed45e7e7ea3ba49464bc43a4763558d
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-01T19:42:42+01:00

Commit Message:
STARK: No need structs to be set as packed

Changed paths:
    engines/stark/gfx/openglactor.h
    engines/stark/gfx/openglprop.h
    engines/stark/gfx/openglsurface.h
    engines/stark/gfx/tinyglactor.h
    engines/stark/gfx/tinyglprop.h


diff --git a/engines/stark/gfx/openglactor.h b/engines/stark/gfx/openglactor.h
index a837f0bfcd..f861bb403f 100644
--- a/engines/stark/gfx/openglactor.h
+++ b/engines/stark/gfx/openglactor.h
@@ -39,8 +39,6 @@ namespace Gfx {
 
 class OpenGLDriver;
 
-#include "common/pack-start.h"
-
 struct _ActorVertex {
 	float pos1x;
 	float pos1y;
@@ -68,11 +66,9 @@ struct _ActorVertex {
 	float r;
 	float g;
 	float b;
-} PACKED_STRUCT;
+};
 typedef _ActorVertex ActorVertex;
 
-#include "common/pack-end.h"
-
 class OpenGLActorRenderer : public VisualActor {
 public:
 	OpenGLActorRenderer(OpenGLDriver *gfx);
diff --git a/engines/stark/gfx/openglprop.h b/engines/stark/gfx/openglprop.h
index 0ebf32081c..cd578d2e0d 100644
--- a/engines/stark/gfx/openglprop.h
+++ b/engines/stark/gfx/openglprop.h
@@ -40,8 +40,6 @@ namespace Gfx {
 
 class Driver;
 
-#include "common/pack-start.h"
-
 struct _PropVertex {
 	float x;
 	float y;
@@ -56,11 +54,9 @@ struct _PropVertex {
 	float r;
 	float g;
 	float b;
-} PACKED_STRUCT;
+};
 typedef _PropVertex PropVertex;
 
-#include "common/pack-end.h"
-
 class OpenGLPropRenderer : public VisualProp {
 public:
 	explicit OpenGLPropRenderer(OpenGLDriver *gfx);
diff --git a/engines/stark/gfx/openglsurface.h b/engines/stark/gfx/openglsurface.h
index 427b6fa9cf..f61c618d31 100644
--- a/engines/stark/gfx/openglsurface.h
+++ b/engines/stark/gfx/openglsurface.h
@@ -36,16 +36,12 @@ namespace Gfx {
 class OpenGLDriver;
 class Texture;
 
-#include "common/pack-start.h"
-
 struct _SurfaceVertex {
 	float x;
 	float y;
-} PACKED_STRUCT;
+};
 typedef _SurfaceVertex SurfaceVertex;
 
-#include "common/pack-end.h"
-
 /**
  * An programmable pipeline OpenGL surface renderer
  */
diff --git a/engines/stark/gfx/tinyglactor.h b/engines/stark/gfx/tinyglactor.h
index 4092ba767c..1967a8c1fa 100644
--- a/engines/stark/gfx/tinyglactor.h
+++ b/engines/stark/gfx/tinyglactor.h
@@ -37,8 +37,6 @@ namespace Gfx {
 
 class TinyGLDriver;
 
-#include "common/pack-start.h"
-
 struct _ActorVertex {
 	float pos1x;
 	float pos1y;
@@ -66,11 +64,9 @@ struct _ActorVertex {
 	float r;
 	float g;
 	float b;
-} PACKED_STRUCT;
+};
 typedef _ActorVertex ActorVertex;
 
-#include "common/pack-end.h"
-
 class TinyGLActorRenderer : public VisualActor {
 public:
 	TinyGLActorRenderer(TinyGLDriver *gfx);
diff --git a/engines/stark/gfx/tinyglprop.h b/engines/stark/gfx/tinyglprop.h
index 2c1324a8d2..2c3a973c4e 100644
--- a/engines/stark/gfx/tinyglprop.h
+++ b/engines/stark/gfx/tinyglprop.h
@@ -38,8 +38,6 @@ namespace Gfx {
 
 class Driver;
 
-#include "common/pack-start.h"
-
 struct _PropVertex {
 	float x;
 	float y;
@@ -54,11 +52,9 @@ struct _PropVertex {
 	float r;
 	float g;
 	float b;
-} PACKED_STRUCT;
+};
 typedef _PropVertex PropVertex;
 
-#include "common/pack-end.h"
-
 class TinyGLPropRenderer : public VisualProp {
 public:
 	explicit TinyGLPropRenderer(TinyGLDriver *gfx);