1 files changed, 18 insertions, 15 deletions

diff --git a/cogl/cogl-texture-3d-private.h b/cogl/cogl-texture-3d-private.h
index d7fda509..7df5b9f5 100644
--- a/cogl/cogl-texture-3d-private.h
+++ b/cogl/cogl-texture-3d-private.h
@@ -32,26 +32,29 @@
 
 struct _CoglTexture3D
 {
-  CoglTexture     _parent;
+  CoglTexture _parent;
 
-  /* The internal format of the GL texture represented as a
+  /* The internal format of the texture represented as a
      CoglPixelFormat */
   CoglPixelFormat format;
+  int width;
+  int height;
+  int depth;
+  CoglBool auto_mipmap;
+  CoglBool mipmaps_dirty;
+
+  /* TODO: factor out these OpenGL specific members into some form
+   * of driver private state. */
+
   /* The internal format of the GL texture represented as a GL enum */
-  GLenum          gl_format;
+  GLenum gl_format;
   /* The texture object number */
-  GLuint          gl_texture;
-  int             width;
-  int             height;
-  int             depth;
-  GLenum          min_filter;
-  GLenum          mag_filter;
-  GLint           wrap_mode_s;
-  GLint           wrap_mode_t;
-  GLint           wrap_mode_p;
-  CoglBool        auto_mipmap;
-  CoglBool        mipmaps_dirty;
-
+  GLuint gl_texture;
+  GLenum gl_legacy_texobj_min_filter;
+  GLenum gl_legacy_texobj_mag_filter;
+  GLint gl_legacy_texobj_wrap_mode_s;
+  GLint gl_legacy_texobj_wrap_mode_t;
+  GLint gl_legacy_texobj_wrap_mode_p;
   CoglTexturePixel first_pixel;
 };