diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-06-26 22:50:11 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2014-01-01 17:43:05 +0000 |
| commit | 59f6fefc37524f492512a71b831760a218d9bb95 (patch) | |
| tree | a59f61a9d1a16de85f88375e777dfb33c33c0e7b | |
| parent | 9688e7dc1eeae3144729dfd4a4bf409620346bf4 (diff) | |
| download | cogl-59f6fefc37524f492512a71b831760a218d9bb95.tar.gz | |
ensure texture allocated in _get_gl_texture() in preparation
The plan is to defer a lot more work in creating a texture until
allocation time. This means we wont be able to assume that all textures
being used to render must have already been allocated when data was
specified.
The latest point at which we will generally require a texture to be
allocated will be when we need to know the underlying GL handle for a
texture and so this updates cogl_texture_get_gl_texture() to ensure the
texture is allocated.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | cogl/cogl-texture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c index ad063f66..ec6b7100 100644 --- a/cogl/cogl-texture.c +++ b/cogl/cogl-texture.c @@ -282,6 +282,9 @@ cogl_texture_get_gl_texture (CoglTexture *texture, GLuint *out_gl_handle, GLenum *out_gl_target) { + if (!texture->allocated) + cogl_texture_allocate (texture, NULL); + return texture->vtable->get_gl_texture (texture, out_gl_handle, out_gl_target); } |