mirror of
https://github.com/brl/mutter.git
synced 2024-09-20 06:25:51 -04:00
d259a87602
Previously, _cogl_get_proc_address had a fallback to resolve the symbol using g_module_open(NULL) to get the symbol from anywhere in the address space. The EGL backend ends up using this on some drivers because eglGetProcAddress isn't meant to return a pointer for core functions. This causes problems if something in the process is linking against a different GL library, for example Cairo may be linking against libGL itself. In this case it may end up resolving symbols from the GL library even if GLES is being used. This patch removes the fallback. The EGL version now has its own fallback instead which passes the existing libgl_module from the renderer to g_module_symbol so that it should only get symbols from that library or its dependency chain. The GLX and WGL winsys only call glXGetProcAddress and wglGetProcAddress. The stub winsys does however continue using the global symbol lookup. The internal _cogl_get_proc_address function has been renamed to _cogl_renderer_get_proc_address because it needs a connected renderer to work so it could be considered to be a renderer method. The pointer to the renderer is passed down to the winsys backends so that it can use the data attached to the renderer to get the module pointers. https://bugzilla.gnome.org/show_bug.cgi?id=655412 Reviewed-by: Robert Bragg <robert@linux.intel.com>
116 lines
3.6 KiB
C
116 lines
3.6 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2011 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_RENDERER_GLX_PRIVATE_H
|
|
#define __COGL_RENDERER_GLX_PRIVATE_H
|
|
|
|
#include <gmodule.h>
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-xlib-renderer-private.h"
|
|
|
|
typedef struct _CoglGLXRenderer
|
|
{
|
|
CoglXlibRenderer _parent;
|
|
|
|
int glx_major;
|
|
int glx_minor;
|
|
|
|
int glx_error_base;
|
|
int glx_event_base;
|
|
|
|
gboolean is_direct;
|
|
|
|
/* Vblank stuff */
|
|
int dri_fd;
|
|
|
|
/* GModule pointing to libGL which we use to get glX functions out of */
|
|
GModule *libgl_module;
|
|
|
|
/* Function pointers for core GLX functionality. We can't just link
|
|
against these directly because we need to conditionally load
|
|
libGL when we are using GLX so that it won't conflict with a GLES
|
|
library if we are using EGL + GLES */
|
|
void
|
|
(* glXDestroyContext) (Display *dpy, GLXContext ctx);
|
|
void
|
|
(* glXSwapBuffers) (Display *dpy, GLXDrawable drawable);
|
|
Bool
|
|
(* glXQueryExtension) (Display *dpy, int *errorb, int *event);
|
|
const char *
|
|
(* glXQueryExtensionsString) (Display *dpy, int screen);
|
|
Bool
|
|
(* glXQueryVersion) (Display *dpy, int *maj, int *min);
|
|
Bool
|
|
(* glXIsDirect) (Display *dpy, GLXContext ctx);
|
|
int
|
|
(* glXGetFBConfigAttrib) (Display *dpy, GLXFBConfig config,
|
|
int attribute, int *value);
|
|
GLXWindow
|
|
(* glXCreateWindow) (Display *dpy, GLXFBConfig config,
|
|
Window win, const int *attribList);
|
|
void
|
|
(* glXDestroyWindow) (Display *dpy, GLXWindow window);
|
|
GLXPixmap
|
|
(* glXCreatePixmap) (Display *dpy, GLXFBConfig config,
|
|
Pixmap pixmap, const int *attribList);
|
|
void
|
|
(* glXDestroyPixmap) (Display *dpy, GLXPixmap pixmap);
|
|
GLXContext
|
|
(* glXCreateNewContext) (Display *dpy, GLXFBConfig config,
|
|
int renderType, GLXContext shareList,
|
|
Bool direct);
|
|
Bool
|
|
(* glXMakeContextCurrent) (Display *dpy, GLXDrawable draw,
|
|
GLXDrawable read, GLXContext ctx);
|
|
void
|
|
(* glXSelectEvent) (Display *dpy, GLXDrawable drawable,
|
|
unsigned long mask);
|
|
GLXFBConfig *
|
|
(* glXGetFBConfigs) (Display *dpy, int screen, int *nelements);
|
|
GLXFBConfig *
|
|
(* glXChooseFBConfig) (Display *dpy, int screen,
|
|
const int *attrib_list, int *nelements);
|
|
XVisualInfo *
|
|
(* glXGetVisualFromFBConfig) (Display *dpy, GLXFBConfig config);
|
|
|
|
void *
|
|
(* glXGetProcAddress) (const GLubyte *procName);
|
|
|
|
/* Function pointers for GLX specific extensions */
|
|
#define COGL_WINSYS_FEATURE_BEGIN(a, b, c, d, e, f)
|
|
|
|
#define COGL_WINSYS_FEATURE_FUNCTION(ret, name, args) \
|
|
ret (APIENTRY * pf_ ## name) args;
|
|
|
|
#define COGL_WINSYS_FEATURE_END()
|
|
|
|
#include "cogl-winsys-glx-feature-functions.h"
|
|
|
|
#undef COGL_WINSYS_FEATURE_BEGIN
|
|
#undef COGL_WINSYS_FEATURE_FUNCTION
|
|
#undef COGL_WINSYS_FEATURE_END
|
|
} CoglGLXRenderer;
|
|
|
|
#endif /* __COGL_RENDERER_GLX_PRIVATE_H */
|