[cogl/wip/cogl-1.14: 40/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: 40/50] fix: texture-2d: factor out all GL specific code
- Date: Fri, 18 Jan 2013 11:59:07 +0000 (UTC)
commit 4143d77c4bba5135e7b1c26aee95bfbbfb85e6a5
Author: Robert Bragg <robert linux intel com>
Date: Fri Jan 4 19:58:35 2013 +0000
fix: texture-2d: factor out all GL specific code
cogl/cogl-gles2-context.c | 12 ++++++------
cogl/cogl-texture-2d-sliced.c | 12 ++++++------
cogl/cogl-texture.c | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/cogl/cogl-gles2-context.c b/cogl/cogl-gles2-context.c
index a5188c9..c2b61fd 100644
--- a/cogl/cogl-gles2-context.c
+++ b/cogl/cogl-gles2-context.c
@@ -1934,12 +1934,12 @@ cogl_gles2_texture_2d_new_from_handle (CoglContext *ctx,
CoglPixelFormat internal_format,
CoglError **error)
{
- return cogl_texture_2d_gl_new_from_foreign (ctx,
- handle,
- width,
- height,
- internal_format,
- error);
+ return cogl_texture_2d_new_from_foreign (ctx,
+ handle,
+ width,
+ height,
+ internal_format,
+ error);
}
CoglBool
diff --git a/cogl/cogl-texture-2d-sliced.c b/cogl/cogl-texture-2d-sliced.c
index b03f41f..7b4fee5 100644
--- a/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl-texture-2d-sliced.c
@@ -983,12 +983,12 @@ _cogl_texture_2d_sliced_new_from_foreign (GLuint gl_handle,
y_pot_waste < 0 || y_pot_waste >= height)
return NULL;
- tex_2d = cogl_texture_2d_gl_new_from_foreign (ctx,
- gl_target,
- gl_width,
- gl_height,
- format,
- NULL);
+ tex_2d = cogl_texture_2d_new_from_foreign (ctx,
+ gl_target,
+ gl_width,
+ gl_height,
+ format,
+ NULL);
if (!tex_2d)
return NULL;
diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c
index 0285cff..ebc137f 100644
--- a/cogl/cogl-texture.c
+++ b/cogl/cogl-texture.c
@@ -520,12 +520,12 @@ cogl_texture_new_from_foreign (GLuint gl_handle,
else
{
_COGL_GET_CONTEXT (ctx, NULL);
- return COGL_TEXTURE (cogl_texture_2d_gl_new_from_foreign (ctx,
- gl_handle,
- width,
- height,
- format,
- NULL));
+ return COGL_TEXTURE (cogl_texture_2d_new_from_foreign (ctx,
+ gl_handle,
+ width,
+ height,
+ format,
+ NULL));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]