summaryrefslogtreecommitdiff
path: root/cogl/cogl-texture-rectangle-private.h
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2012-09-10 20:35:39 +0100
committerRobert Bragg <robert@linux.intel.com>2013-01-22 17:47:58 +0000
commit8326c71b6b1d4c00b51601651406bdd509c8e79e (patch)
treec6fc503f9a31455b04da7869f23c21aca4dac18d /cogl/cogl-texture-rectangle-private.h
parentab72a2275fd3dcee2f93be83d3d8cf6aa8358f9c (diff)
downloadcogl-8326c71b6b1d4c00b51601651406bdd509c8e79e.tar.gz
texture: rename texobj flush code as gl specific
This renames the set_filters and set_wrap_mode_parameters texture virtual functions to gl_flush_legacy_texobj_filters and gl_flush_legacy_texobj_wrap_modes respectively to clarify that they are opengl driver specific and that they are only used to support the legacy opengl apis for setting filters and wrap modes where the state is associated with texture objects instead of being associated with sampler objects. This part of an effort to clearly delimit our abstraction over opengl so that we can start to consider non-opengl backends for Cogl. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 6f78b8a613340d7c6b736e51a16c625f52154430)
Diffstat (limited to 'cogl/cogl-texture-rectangle-private.h')
-rw-r--r--cogl/cogl-texture-rectangle-private.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/cogl/cogl-texture-rectangle-private.h b/cogl/cogl-texture-rectangle-private.h
index b00f0d2c..366d58c4 100644
--- a/cogl/cogl-texture-rectangle-private.h
+++ b/cogl/cogl-texture-rectangle-private.h
@@ -30,22 +30,26 @@
struct _CoglTextureRectangle
{
- 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;
+
+ /* 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;
- GLenum min_filter;
- GLenum mag_filter;
- GLint wrap_mode_s;
- GLint wrap_mode_t;
- CoglBool is_foreign;
+ 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;
+ CoglBool is_foreign;
};
CoglTextureRectangle *