[cogl/cogl-1.14] Replace some #if HAVE_COGL_GL lines with #ifdef
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.14] Replace some #if HAVE_COGL_GL lines with #ifdef
- Date: Fri, 25 Jan 2013 18:21:12 +0000 (UTC)
commit 5d6160c7510333f296ccd5202a6d335b8c948377
Author: Neil Roberts <neil linux intel com>
Date: Thu Jan 24 11:40:19 2013 +0000
Replace some #if HAVE_COGL_GL lines with #ifdef
This was generating warnings when the GL driver is disabled.
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit f26682dcc04642fed9db959c63d6c6e4261d2148)
Conflicts:
cogl/cogl-auto-texture.c
cogl/cogl-auto-texture.c | 2 +-
cogl/cogl-texture-rectangle.c | 2 +-
cogl/driver/gl/cogl-texture-2d-gl.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c
index ff7673b..6de2e32 100644
--- a/cogl/cogl-auto-texture.c
+++ b/cogl/cogl-auto-texture.c
@@ -300,7 +300,7 @@ cogl_texture_new_from_foreign (GLuint gl_handle,
{
_COGL_GET_CONTEXT (ctx, NULL);
-#if HAVE_COGL_GL
+#ifdef HAVE_COGL_GL
if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
{
CoglTextureRectangle *texture_rectangle;
diff --git a/cogl/cogl-texture-rectangle.c b/cogl/cogl-texture-rectangle.c
index f8d0811..e276c58 100644
--- a/cogl/cogl-texture-rectangle.c
+++ b/cogl/cogl-texture-rectangle.c
@@ -388,7 +388,7 @@ cogl_texture_rectangle_new_from_foreign (CoglContext *ctx,
/* Obtain texture parameters */
-#if HAVE_COGL_GL
+#ifdef HAVE_COGL_GL
if (ctx->driver == COGL_DRIVER_GL)
{
GLint val;
diff --git a/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/driver/gl/cogl-texture-2d-gl.c
index 8bcfb93..98c1553 100644
--- a/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -375,7 +375,7 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
/* Obtain texture parameters
(only level 0 we are interested in) */
-#if HAVE_COGL_GL
+#ifdef HAVE_COGL_GL
if ((ctx->private_feature_flags &
COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]