430bc16ca0
If we are using MESA as our GL library, then both xserver's
GLX and glamor are link to the same library. As xserver's
GLX has its own _glapi_get/set_context/dispatch etc, and it
is a simplified version derived from mesa thus is not
sufficient for mesa/egl's dri loader which is used by glamor.
Then if glx module is loaded before glamoregl module, the
initialization of mesa/egl/opengl will not be correct, and
will fail at a very early stage, most likely fail to map
the element buffer.
Two methodis to fix this problem, first is to modify the xserver's
glx's glapi.c to fit mesa's requirement. The second is to put
a glamor.conf as below, to the system's xorg.conf path.
Section "Module"
Load "glamoregl"
EndSection
Then glamor will be loaded firstly, and the mesa's libglapi.so
will be used. As current xserver's dispatch table is the same
as mesa's, then the glx's dri loader can work without problem.
We took the second method as it don't need any change to xorg.:)
Although this is not a graceful implementation as it depends
on the xserver's dispatch table and the mesa's dispatch table
is the same and the context set and get is using the same method.
Anyway it works.
As by default, xserver will enable GLX_USE_TLS. But mesa will not
enable it, you may need to enable that when build mesa.
Three pre-requirements to make this glamor version work:
0. Make sure xserver has commit 66e603, if not please pull the latest
master branch.
1. Rebuild mesa by enable GLX_USE_TLS.
2. Put the glamor.conf to your system's xorg.conf path and make sure
it loaded prior to glx module.
Preliminary testing shows indirect glxgears works fine.
If user want to use GLES2 for glamor by using MESA, GLX will not
work correctly.
If you are not using normal MESA, for example PVR's private GLES
implementation, then it should be ok to use GLES2 glamor and the
GLX should work as expected. In this commit, I use gbm to check
whether we are using MESA or non-mesa. Maybe not the best way.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
122 lines
3.6 KiB
C
122 lines
3.6 KiB
C
/*
|
|
* Mesa 3-D graphics library
|
|
* Version: 7.1
|
|
*
|
|
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included
|
|
* in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
|
|
/**
|
|
* \mainpage Mesa GL API Module
|
|
*
|
|
* \section GLAPIIntroduction Introduction
|
|
*
|
|
* The Mesa GL API module is responsible for dispatching all the
|
|
* gl*() functions. All GL functions are dispatched by jumping through
|
|
* the current dispatch table (basically a struct full of function
|
|
* pointers.)
|
|
*
|
|
* A per-thread current dispatch table and per-thread current context
|
|
* pointer are managed by this module too.
|
|
*
|
|
* This module is intended to be non-Mesa-specific so it can be used
|
|
* with the X/DRI libGL also.
|
|
*/
|
|
|
|
#ifndef _GLAPI_H
|
|
#define _GLAPI_H
|
|
|
|
#define GL_GLEXT_PROTOTYPES
|
|
|
|
#if GLAMOR_GLES2
|
|
#include <GLES2/gl2.h>
|
|
#include <GLES2/gl2ext.h>
|
|
#else
|
|
#include <GL/gl.h>
|
|
#include "GL/glext.h"
|
|
#endif
|
|
|
|
/* Is this needed? It is incomplete anyway. */
|
|
#ifdef USE_MGL_NAMESPACE
|
|
#define _glapi_set_dispatch _mglapi_set_dispatch
|
|
#define _glapi_get_dispatch _mglapi_get_dispatch
|
|
#define _glapi_set_context _mglapi_set_context
|
|
#define _glapi_get_context _mglapi_get_context
|
|
#define _glapi_Dispatch _mglapi_Dispatch
|
|
#define _glapi_Context _mglapi_Context
|
|
#endif
|
|
|
|
typedef void (*_glapi_proc)(void);
|
|
struct _glapi_table;
|
|
|
|
|
|
#if defined (GLX_USE_TLS)
|
|
|
|
extern __thread struct _glapi_table * _glapi_tls_Dispatch
|
|
__attribute__((tls_model("initial-exec")));
|
|
|
|
extern __thread void * _glapi_tls_Context
|
|
__attribute__((tls_model("initial-exec")));
|
|
|
|
extern const struct _glapi_table *_glapi_Dispatch;
|
|
extern const void *_glapi_Context;
|
|
|
|
# define GET_DISPATCH() _glapi_tls_Dispatch
|
|
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_tls_Context
|
|
# define SET_CURRENT_CONTEXT(C) _glapi_tls_Context = (void*)C
|
|
|
|
#else
|
|
|
|
extern struct _glapi_table *_glapi_Dispatch;
|
|
extern void *_glapi_Context;
|
|
|
|
# ifdef THREADS
|
|
|
|
# define GET_DISPATCH() \
|
|
(likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
|
|
|
|
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \
|
|
(likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
|
|
|
|
|
|
# define SET_CURRENT_CONTEXT(C) do { if (likely(_glapi_Context)) \
|
|
_glapi_Context = (void*)C; \
|
|
else \
|
|
_glapi_set_context(C); } while(0)
|
|
|
|
# else
|
|
|
|
# define GET_DISPATCH() _glapi_Dispatch
|
|
# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_Context
|
|
# define SET_CURRENT_CONTEXT(C) _glapi_Context = (void*)C
|
|
|
|
# endif
|
|
|
|
#endif /* defined (GLX_USE_TLS) */
|
|
|
|
|
|
extern void
|
|
_glapi_set_context(void *context);
|
|
|
|
extern void *
|
|
_glapi_get_context(void);
|
|
|
|
#endif
|