mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 08:30:42 -05:00
185630085c
This option to GCC makes it give a warning whenever a global function is defined without a declaration. This should catch cases were we've defined a function but forgot to put it in a header. In that case it is either only used within one file so we should make it static or we should declare it in a header. The following changes where made to fix problems: • Some functions were made static • cogl-path.h (the one containing the 1.0 API) was split into two files, one defining the functions and one defining the enums so that cogl-path.c can include the enum and function declarations from the 2.0 API as well as the function declarations from the 1.0 API. • cogl2-clip-state has been removed. This only had one experimental function called cogl_clip_push_from_path but as this is unstable we might as well remove it favour of the equivalent cogl_framebuffer_* API. • The GLX, SDL and WGL winsys's now have a private header to define their get_vtable function instead of directly declaring in the C file where it is called. • All places that were calling COGL_OBJECT_DEFINE need to have the cogl_is_whatever function declared so these have been added either as a public function or in a private header. • Some files that were not including the header containing their function declarations have been fixed to do so. • Any unused error quark functions have been removed. If we later want them we should add them back one by one and add a declaration for them in a header. • _cogl_is_framebuffer has been renamed to cogl_is_framebuffer and made a public function with a declaration in cogl-framebuffer.h • Similarly for CoglOnscreen. • cogl_vdraw_indexed_attributes is called cogl_framebuffer_vdraw_indexed_attributes in the header. The definition has been changed to match the header. • cogl_index_buffer_allocate has been removed. This had no declaration and I'm not sure what it's supposed to do. • CoglJournal has been changed to use the internal CoglObject macro so that it won't define an exported cogl_is_journal symbol. • The _cogl_blah_pointer_from_handle functions have been removed. CoglHandle isn't used much anymore anyway and in the few places where it is used I think it's safe to just use the implicit cast from void* to the right type. • The test-utils.h header for the conformance tests explicitly disables the -Wmissing-declaration option using a pragma because all of the tests declare their main function without a header. Any mistakes relating to missing declarations aren't really important for the tests. • cogl_quaternion_init_from_quaternion and init_from_matrix have been given declarations in cogl-quaternion.h Reviewed-by: Robert Bragg <robert@linux.intel.com>
175 lines
6.0 KiB
C
175 lines
6.0 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include "cogl-internal.h"
|
|
#include "cogl-context-private.h"
|
|
#include "cogl-feature-private.h"
|
|
#include "cogl-renderer-private.h"
|
|
#include "cogl-private.h"
|
|
|
|
gboolean
|
|
_cogl_gles_update_features (CoglContext *context,
|
|
GError **error)
|
|
{
|
|
CoglPrivateFeatureFlags private_flags = 0;
|
|
CoglFeatureFlags flags = 0;
|
|
const char *gl_extensions;
|
|
int num_stencil_bits = 0;
|
|
|
|
/* We have to special case getting the pointer to the glGetString
|
|
function because we need to use it to determine what functions we
|
|
can expect */
|
|
context->glGetString =
|
|
(void *) _cogl_renderer_get_proc_address (context->display->renderer,
|
|
"glGetString");
|
|
|
|
COGL_NOTE (WINSYS,
|
|
"Checking features\n"
|
|
" GL_VENDOR: %s\n"
|
|
" GL_RENDERER: %s\n"
|
|
" GL_VERSION: %s\n"
|
|
" GL_EXTENSIONS: %s",
|
|
context->glGetString (GL_VENDOR),
|
|
context->glGetString (GL_RENDERER),
|
|
context->glGetString (GL_VERSION),
|
|
context->glGetString (GL_EXTENSIONS));
|
|
|
|
gl_extensions = (const char*) context->glGetString (GL_EXTENSIONS);
|
|
|
|
_cogl_feature_check_ext_functions (context,
|
|
-1 /* GL major version */,
|
|
-1 /* GL minor version */,
|
|
gl_extensions);
|
|
|
|
GE( context, glGetIntegerv (GL_STENCIL_BITS, &num_stencil_bits) );
|
|
/* We need at least three stencil bits to combine clips */
|
|
if (num_stencil_bits > 2)
|
|
private_flags |= COGL_PRIVATE_FEATURE_STENCIL_BUFFER;
|
|
|
|
#ifdef HAVE_COGL_GLES
|
|
if (context->driver == COGL_DRIVER_GLES1)
|
|
{
|
|
int max_clip_planes;
|
|
GE( context, glGetIntegerv (GL_MAX_CLIP_PLANES, &max_clip_planes) );
|
|
if (max_clip_planes >= 4)
|
|
private_flags |= COGL_PRIVATE_FEATURE_FOUR_CLIP_PLANES;
|
|
}
|
|
#endif
|
|
|
|
if (context->driver == COGL_DRIVER_GLES2)
|
|
{
|
|
flags |= COGL_FEATURE_SHADERS_GLSL | COGL_FEATURE_OFFSCREEN;
|
|
/* Note GLES 2 core doesn't support mipmaps for npot textures or
|
|
* repeat modes other than CLAMP_TO_EDGE. */
|
|
flags |= COGL_FEATURE_TEXTURE_NPOT_BASIC;
|
|
flags |= COGL_FEATURE_DEPTH_RANGE;
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_GLSL, TRUE);
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_OFFSCREEN, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_BASIC, TRUE);
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_DEPTH_RANGE, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_MIRRORED_REPEAT, TRUE);
|
|
}
|
|
|
|
private_flags |= COGL_PRIVATE_FEATURE_VBOS;
|
|
|
|
/* Both GLES 1.1 and GLES 2.0 support point sprites in core */
|
|
flags |= COGL_FEATURE_POINT_SPRITE;
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_POINT_SPRITE, TRUE);
|
|
|
|
if (context->glGenRenderbuffers)
|
|
{
|
|
flags |= COGL_FEATURE_OFFSCREEN;
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_OFFSCREEN, TRUE);
|
|
}
|
|
|
|
if (context->glBlitFramebuffer)
|
|
private_flags |= COGL_PRIVATE_FEATURE_OFFSCREEN_BLIT;
|
|
|
|
if (_cogl_check_extension ("GL_OES_element_index_uint", gl_extensions))
|
|
{
|
|
flags |= COGL_FEATURE_UNSIGNED_INT_INDICES;
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_UNSIGNED_INT_INDICES, TRUE);
|
|
}
|
|
|
|
if (_cogl_check_extension ("GL_OES_texture_npot", gl_extensions))
|
|
{
|
|
flags |= (COGL_FEATURE_TEXTURE_NPOT |
|
|
COGL_FEATURE_TEXTURE_NPOT_BASIC |
|
|
COGL_FEATURE_TEXTURE_NPOT_MIPMAP |
|
|
COGL_FEATURE_TEXTURE_NPOT_REPEAT);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_BASIC, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT, TRUE);
|
|
}
|
|
else if (_cogl_check_extension ("GL_IMG_texture_npot", gl_extensions))
|
|
{
|
|
flags |= (COGL_FEATURE_TEXTURE_NPOT_BASIC |
|
|
COGL_FEATURE_TEXTURE_NPOT_MIPMAP);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_BASIC, TRUE);
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP, TRUE);
|
|
}
|
|
|
|
if (context->glTexImage3D)
|
|
{
|
|
flags |= COGL_FEATURE_TEXTURE_3D;
|
|
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_TEXTURE_3D, TRUE);
|
|
}
|
|
|
|
if (context->glMapBuffer)
|
|
{
|
|
/* The GL_OES_mapbuffer extension doesn't support mapping for
|
|
read */
|
|
flags |= COGL_FEATURE_MAP_BUFFER_FOR_WRITE;
|
|
COGL_FLAGS_SET (context->features,
|
|
COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE);
|
|
}
|
|
|
|
if (context->glEGLImageTargetTexture2D)
|
|
private_flags |= COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE;
|
|
|
|
if (_cogl_check_extension ("GL_OES_packed_depth_stencil", gl_extensions))
|
|
private_flags |= COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL;
|
|
|
|
/* Cache features */
|
|
context->private_feature_flags |= private_flags;
|
|
context->feature_flags |= flags;
|
|
|
|
return TRUE;
|
|
}
|