1 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.h
index 1a9fb1bad7a..ef6be0b2778 100644
--- a/source/blender/gpu/GPU_framebuffer.h
+++ b/source/blender/gpu/GPU_framebuffer.h
@@ -32,7 +32,7 @@ extern "C" {
 
 typedef struct GPUAttachment {
   struct GPUTexture *tex;
-  int mip, layer;
+  int layer, mip;
 } GPUAttachment;
 
 typedef enum eGPUFrameBufferBits {
@@ -120,35 +120,35 @@ void GPU_framebuffer_config_array(GPUFrameBuffer *fb, const GPUAttachment *confi
 
 #define GPU_ATTACHMENT_NONE \
   { \
-    .tex = NULL, .layer = -1, .mip = 0, \
+    NULL, -1, 0, \
   }
 #define GPU_ATTACHMENT_LEAVE \
   { \
-    .tex = NULL, .layer = -1, .mip = -1, \
+    NULL, -1, -1, \
   }
 #define GPU_ATTACHMENT_TEXTURE(_tex) \
   { \
-    .tex = _tex, .layer = -1, .mip = 0, \
+    _tex, -1, 0, \
   }
 #define GPU_ATTACHMENT_TEXTURE_MIP(_tex, _mip) \
   { \
-    .tex = _tex, .layer = -1, .mip = _mip, \
+    _tex, -1, _mip, \
   }
 #define GPU_ATTACHMENT_TEXTURE_LAYER(_tex, _layer) \
   { \
-    .tex = _tex, .layer = _layer, .mip = 0, \
+    _tex, _layer, 0, \
   }
 #define GPU_ATTACHMENT_TEXTURE_LAYER_MIP(_tex, _layer, _mip) \
   { \
-    .tex = _tex, .layer = _layer, .mip = _mip, \
+    _tex, _layer, _mip, \
   }
 #define GPU_ATTACHMENT_TEXTURE_CUBEFACE(_tex, _face) \
   { \
-    .tex = _tex, .layer = _face, .mip = 0, \
+    _tex, _face, 0, \
   }
 #define GPU_ATTACHMENT_TEXTURE_CUBEFACE_MIP(_tex, _face, _mip) \
   { \
-    .tex = _tex, .layer = _face, .mip = _mip, \
+    _tex, _face, _mip, \
   }
 
 /* Framebuffer operations */
@@ -212,7 +212,7 @@ GPUOffScreen *GPU_offscreen_create(
 void GPU_offscreen_free(GPUOffScreen *ofs);
 void GPU_offscreen_bind(GPUOffScreen *ofs, bool save);
 void GPU_offscreen_unbind(GPUOffScreen *ofs, bool restore);
-void GPU_offscreen_read_pixels(GPUOffScreen *ofs, int type, void *pixels);
+void GPU_offscreen_read_pixels(GPUOffScreen *ofs, eGPUDataFormat type, void *pixels);
 void GPU_offscreen_draw_to_screen(GPUOffScreen *ofs, int x, int y);
 int GPU_offscreen_width(const GPUOffScreen *ofs);
 int GPU_offscreen_height(const GPUOffScreen *ofs);