summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2013-01-24 11:40:19 +0000
committerNeil Roberts <neil@linux.intel.com>2013-01-25 17:25:51 +0000
commitf26682dcc04642fed9db959c63d6c6e4261d2148 (patch)
treea8df5caf3bd9980b3546d860fd3984e48ef71322
parent2ab8c086f8f7951a795f558f0b84c838b74c233e (diff)
downloadcogl-f26682dcc04642fed9db959c63d6c6e4261d2148.tar.gz
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>
-rw-r--r--cogl/cogl-auto-texture.c2
-rw-r--r--cogl/cogl-texture-rectangle.c2
-rw-r--r--cogl/driver/gl/cogl-texture-2d-gl.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c
index c67c7278..6df3fc25 100644
--- a/cogl/cogl-auto-texture.c
+++ b/cogl/cogl-auto-texture.c
@@ -258,7 +258,7 @@ cogl_texture_gl_new_from_foreign (CoglContext *ctx,
CoglPixelFormat format,
CoglError **error)
{
-#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 aeb905a7..2c3c2a92 100644
--- a/cogl/cogl-texture-rectangle.c
+++ b/cogl/cogl-texture-rectangle.c
@@ -373,7 +373,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 f1c543fa..a8a51a4a 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_gl_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))
{