brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texture-2d: improve new_from_foreign error handling

Browse Source 
There were lots of places where cogl_texture_2d_new_from_foreign would
simply return NULL without returning a corresponding error. We now
return an error wherever we are returning NULL except in cases where the
user provided invalid data.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit a1efc9405a13ac8aaf692c5f631a3b8f95d2f259)
This commit is contained in:
Robert Bragg 2012-09-01 02:13:32 +01:00
parent a676f700a3
commit 66169276f4
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cogl/cogl-texture-2d.c
View File

@ -343,7 +343,7 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
CoglTexture2D * CoglTexture2D *
cogl_texture_2d_new_from_foreign (CoglContext *ctx, cogl_texture_2d_new_from_foreign (CoglContext *ctx,
GLuint gl_handle, unsigned int gl_handle,
int width, int width,
int height, int height,
CoglPixelFormat format, CoglPixelFormat format,
@ -353,17 +353,24 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
* in GLES, hence such a function prototype. * in GLES, hence such a function prototype.
*/ */
GLenum gl_error = 0; GLenum gl_error = 0;
GLint gl_compressed = GL_FALSE; GLint gl_compressed = GL_FALSE;
GLenum gl_int_format = 0; GLenum gl_int_format = 0;
CoglTexture2D *tex_2d; CoglTexture2D *tex_2d;
if (!ctx->texture_driver->allows_foreign_gl_target (ctx, GL_TEXTURE_2D)) /* Assert it is a valid GL texture object */
return NULL; g_return_val_if_fail (ctx->glIsTexture (gl_handle), NULL);
if (!ctx->texture_driver->allows_foreign_gl_target (ctx, GL_TEXTURE_2D))
{
g_set_error (error,
COGL_ERROR,
COGL_ERROR_UNSUPPORTED,
"Foreign GL_TEXTURE_2D textures are not "
"supported by your system");
return NULL;
}
/* Make sure it is a valid GL texture object */
if (!ctx->glIsTexture (gl_handle))
return NULL;
/* Make sure binding succeeds */ /* Make sure binding succeeds */
while ((gl_error = ctx->glGetError ()) != GL_NO_ERROR) while ((gl_error = ctx->glGetError ()) != GL_NO_ERROR)
@ -371,7 +378,13 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
_cogl_bind_gl_texture_transient (GL_TEXTURE_2D, gl_handle, TRUE); _cogl_bind_gl_texture_transient (GL_TEXTURE_2D, gl_handle, TRUE);
if (ctx->glGetError () != GL_NO_ERROR) if (ctx->glGetError () != GL_NO_ERROR)
return NULL; {
g_set_error (error,
COGL_ERROR,
COGL_ERROR_UNSUPPORTED,
"Failed to bind foreign GL_TEXTURE_2D texture");
return NULL;
}
/* Obtain texture parameters /* Obtain texture parameters
(only level 0 we are interested in) */ (only level 0 we are interested in) */
@ -398,7 +411,13 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
if (!ctx->driver_vtable->pixel_format_from_gl_internal (ctx, if (!ctx->driver_vtable->pixel_format_from_gl_internal (ctx,
gl_int_format, gl_int_format,
&format)) &format))
return NULL; {
g_set_error (error,
COGL_ERROR,
COGL_ERROR_UNSUPPORTED,
"Unsupported internal format for foreign texture");
return NULL;
}
} }
else else
#endif #endif
@ -420,18 +439,23 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
*/ */
/* Validate width and height */ /* Validate width and height */
if (width <= 0 || height <= 0) g_return_val_if_fail (width > 0 && height > 0, NULL);
return NULL;
/* Compressed texture images not supported */ /* Compressed texture images not supported */
if (gl_compressed == GL_TRUE) if (gl_compressed == GL_TRUE)
return NULL; {
g_set_error (error,
COGL_ERROR,
COGL_ERROR_UNSUPPORTED,
"Compressed foreign textures aren't currently supported");
return NULL;
}
/* Note: previously this code would query the texture object for /* Note: previously this code would query the texture object for
whether it has GL_GENERATE_MIPMAP enabled to determine whether to whether it has GL_GENERATE_MIPMAP enabled to determine whether to
auto-generate the mipmap. This doesn't make much sense any more auto-generate the mipmap. This doesn't make much sense any more
since Cogl switch to using glGenerateMipmap. Ideally I think since Cogl switch to using glGenerateMipmap. Ideally I think
cogl_texture_new_from_foreign should take a flags parameter so cogl_texture_2d_new_from_foreign should take a flags parameter so
that the application can decide whether it wants that the application can decide whether it wants
auto-mipmapping. To be compatible with existing code, Cogl now auto-mipmapping. To be compatible with existing code, Cogl now
disables its own auto-mipmapping but leaves the value of disables its own auto-mipmapping but leaves the value of