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

Replace some #if HAVE_COGL_GL lines with #ifdef

Browse Source 
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
This commit is contained in:
Neil Roberts 2013-01-24 11:40:19 +00:00
parent 795c3fd020
commit 5d6160c751
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-auto-texture.c
View File

@ -300,7 +300,7 @@ cogl_texture_new_from_foreign (GLuint gl_handle,
{ {
_COGL_GET_CONTEXT (ctx, NULL); _COGL_GET_CONTEXT (ctx, NULL);
#if HAVE_COGL_GL #ifdef HAVE_COGL_GL
if (gl_target == GL_TEXTURE_RECTANGLE_ARB) if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
{ {
CoglTextureRectangle *texture_rectangle; CoglTextureRectangle *texture_rectangle;

2
cogl/cogl-texture-rectangle.c
View File

@ -388,7 +388,7 @@ cogl_texture_rectangle_new_from_foreign (CoglContext *ctx,
/* Obtain texture parameters */ /* Obtain texture parameters */
#if HAVE_COGL_GL #ifdef HAVE_COGL_GL
if (ctx->driver == COGL_DRIVER_GL) if (ctx->driver == COGL_DRIVER_GL)
{ {
GLint val; GLint val;

2
cogl/driver/gl/cogl-texture-2d-gl.c
View File

@ -375,7 +375,7 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
/* Obtain texture parameters /* Obtain texture parameters
(only level 0 we are interested in) */ (only level 0 we are interested in) */
#if HAVE_COGL_GL #ifdef HAVE_COGL_GL
if ((ctx->private_feature_flags & if ((ctx->private_feature_flags &
COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS)) COGL_PRIVATE_FEATURE_QUERY_TEXTURE_PARAMETERS))
{ {