[cogl/wip/cogl-1.14: 32/50] fix: texture-2d: factor out all GL specific code
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 32/50] fix: texture-2d: factor out all GL specific code
- Date: Fri, 18 Jan 2013 11:58:27 +0000 (UTC)
commit 92872111253cb4385a4a13cd052fefe153b2905a
Author: Robert Bragg <robert linux intel com>
Date: Fri Jan 4 13:32:15 2013 +0000
fix: texture-2d: factor out all GL specific code
cogl/cogl-texture-2d-gl.h | 14 +++++++-------
cogl/driver/gl/cogl-texture-2d-gl.c | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/cogl/cogl-texture-2d-gl.h b/cogl/cogl-texture-2d-gl.h
index 5136a35..c70f4c3 100644
--- a/cogl/cogl-texture-2d-gl.h
+++ b/cogl/cogl-texture-2d-gl.h
@@ -39,7 +39,7 @@
G_BEGIN_DECLS
/**
- * cogl_texture_2d_gl_new_from_foreign:
+ * cogl_texture_2d_new_from_foreign:
* @ctx: A #CoglContext
* @gl_handle: A GL handle for a GL_TEXTURE_2D texture object
* @width: Width of the foreign GL texture
@@ -63,12 +63,12 @@ G_BEGIN_DECLS
* Since: 2.0
*/
CoglTexture2D *
-cogl_texture_2d_gl_new_from_foreign (CoglContext *ctx,
- unsigned int gl_handle,
- int width,
- int height,
- CoglPixelFormat format,
- CoglError **error);
+cogl_texture_2d_new_from_foreign (CoglContext *ctx,
+ unsigned int gl_handle,
+ int width,
+ int height,
+ CoglPixelFormat format,
+ CoglError **error);
G_END_DECLS
diff --git a/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/driver/gl/cogl-texture-2d-gl.c
index 653405c..889ae12 100644
--- a/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -275,12 +275,12 @@ _cogl_texture_2d_gl_flush_legacy_texobj_wrap_modes (CoglTexture *tex,
}
CoglTexture2D *
-cogl_texture_2d_gl_new_from_foreign (CoglContext *ctx,
- unsigned int gl_handle,
- int width,
- int height,
- CoglPixelFormat format,
- CoglError **error)
+cogl_texture_2d_new_from_foreign (CoglContext *ctx,
+ unsigned int gl_handle,
+ int width,
+ int height,
+ CoglPixelFormat format,
+ CoglError **error)
{
/* NOTE: width, height and internal format are not queriable
* in GLES, hence such a function prototype.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]