From c76efafc0d14aabe655b204d62b98ef323cd9c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Tue, 30 Jan 2024 15:46:43 -0500
Subject: [PATCH] mesa: move struct gl_pixelstore_attrib into glthread.h

it will be used there

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27490>
---
 src/mesa/main/glthread.h | 21 +++++++++++++++++++++
 src/mesa/main/mtypes.h   | 22 ----------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 9db93f74faf..fd23b3f0e7a 100644
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -67,6 +67,27 @@ struct gl_context;
 struct gl_buffer_object;
 struct _glapi_table;
 
+/**
+ * Client pixel packing/unpacking attributes
+ */
+struct gl_pixelstore_attrib
+{
+   GLint Alignment;
+   GLint RowLength;
+   GLint SkipPixels;
+   GLint SkipRows;
+   GLint ImageHeight;
+   GLint SkipImages;
+   GLboolean SwapBytes;
+   GLboolean LsbFirst;
+   GLboolean Invert;        /**< GL_MESA_pack_invert */
+   GLint CompressedBlockWidth;   /**< GL_ARB_compressed_texture_pixel_storage */
+   GLint CompressedBlockHeight;
+   GLint CompressedBlockDepth;
+   GLint CompressedBlockSize;
+   struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */
+};
+
 /* Used by both glthread and gl_context. */
 union gl_vertex_format_user {
    struct {
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index aed3440470f..c023e443c9d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1477,28 +1477,6 @@ struct gl_buffer_object
 };
 
 
-/**
- * Client pixel packing/unpacking attributes
- */
-struct gl_pixelstore_attrib
-{
-   GLint Alignment;
-   GLint RowLength;
-   GLint SkipPixels;
-   GLint SkipRows;
-   GLint ImageHeight;
-   GLint SkipImages;
-   GLboolean SwapBytes;
-   GLboolean LsbFirst;
-   GLboolean Invert;        /**< GL_MESA_pack_invert */
-   GLint CompressedBlockWidth;   /**< GL_ARB_compressed_texture_pixel_storage */
-   GLint CompressedBlockHeight;
-   GLint CompressedBlockDepth;
-   GLint CompressedBlockSize;
-   struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */
-};
-
-
 /**
  * Enum for defining the mapping for the position/generic0 attribute.
  *