diff options
| author | Robert Bragg <robert@linux.intel.com> | 2012-10-25 17:09:09 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-10-25 17:14:59 +0100 |
| commit | e37182800fe69564ea99a21e231995038af3d6c3 (patch) | |
| tree | 161b7cbed1731384fbd191bc62f30b522a5ee1b0 | |
| parent | 33ca550da3699e0a1825e5c897dbd2d9203ad007 (diff) | |
| download | cogl-wip/out-of-memory-checks.tar.gz | |
stash: check for texture-3d out-of-memory errorswip/out-of-memory-checks
TODO: allow texture_driver->upload_to_gl_3d() to report out-of-memory
errors
| -rw-r--r-- | cogl/cogl-texture-3d.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/cogl/cogl-texture-3d.c b/cogl/cogl-texture-3d.c index 6000b370..1a535320 100644 --- a/cogl/cogl-texture-3d.c +++ b/cogl/cogl-texture-3d.c @@ -38,6 +38,7 @@ #include "cogl-pipeline-private.h" #include "cogl-pipeline-opengl-private.h" #include "cogl-error-private.h" +#include "cogl-util-gl-private.h" #include <string.h> #include <math.h> @@ -137,7 +138,7 @@ _cogl_texture_3d_create_base (CoglContext *ctx, tex_3d->format = internal_format; - return tex_3d; + return _cogl_texture_3d_object_new (tex_3d); } static CoglBool @@ -209,10 +210,11 @@ cogl_texture_3d_new_with_size (CoglContext *ctx, CoglPixelFormat internal_format, CoglError **error) { - CoglTexture3D *tex_3d; - GLenum gl_intformat; - GLenum gl_format; - GLenum gl_type; + CoglTexture3D *tex_3d; + GLenum gl_intformat; + GLenum gl_format; + GLenum gl_type; + GLenum gl_error; /* Since no data, we need some internal format */ if (internal_format == COGL_PIXEL_FORMAT_ANY) @@ -238,10 +240,20 @@ cogl_texture_3d_new_with_size (CoglContext *ctx, _cogl_bind_gl_texture_transient (GL_TEXTURE_3D, tex_3d->gl_texture, FALSE); + /* Clear any GL errors */ + while ((gl_error = ctx->glGetError ()) != GL_NO_ERROR) + ; + GE( ctx, glTexImage3D (GL_TEXTURE_3D, 0, gl_intformat, width, height, depth, 0, gl_format, gl_type, NULL) ); - return _cogl_texture_3d_object_new (tex_3d); + if (_cogl_gl_util_catch_out_of_memory (ctx, error)) + { + cogl_object_unref (tex_3d); + return NULL; + } + + return tex_3d; } CoglTexture3D * @@ -325,7 +337,7 @@ cogl_texture_3d_new_from_bitmap (CoglBitmap *bmp, cogl_object_unref (dst_bmp); - return _cogl_texture_3d_object_new (tex_3d); + return tex_3d; } CoglTexture3D * |