2010-07-28 21:40:43 +01:00
|
|
|
/*
|
|
|
|
* Copyright © 2010 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Soft-
|
|
|
|
* ware"), to deal in the Software without restriction, including without
|
|
|
|
* limitation the rights to use, copy, modify, merge, publish, distribute,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, provided that the above copyright
|
|
|
|
* notice(s) and this permission notice appear in all copies of the Soft-
|
|
|
|
* ware and that both the above copyright notice(s) and this permission
|
|
|
|
* notice appear in supporting documentation.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
|
|
|
|
* ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
|
|
|
|
* RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
|
|
|
|
* THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
|
|
|
|
* QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
|
|
|
|
* MANCE OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
* Except as contained in this notice, the name of a copyright holder shall
|
|
|
|
* not be used in advertising or otherwise to promote the sale, use or
|
|
|
|
* other dealings in this Software without prior written authorization of
|
|
|
|
* the copyright holder.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Kristian Høgsberg (krh@bitplanet.net)
|
|
|
|
*/
|
|
|
|
|
2017-09-08 11:57:26 +01:00
|
|
|
#include <stdbool.h>
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
#include "glapi.h"
|
|
|
|
#include "glxclient.h"
|
2017-11-14 20:13:03 +00:00
|
|
|
#include "indirect.h"
|
2017-09-08 11:57:26 +01:00
|
|
|
#include "util/debug.h"
|
|
|
|
|
Fix build of appleglx
Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to
use the applegl direct renderer
Convert src/glx/apple/Makefile to automake
Since the applegl libGL is now built by linking libappleglx into libGL, rather
than by linking selected files into a special libGL:
- Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes
apple/glxreply.c empty, so remove it
- Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we
need to add those guards to indirect_glx.c, indirect_init.c (via it's
generator), render2.c and vertarr.c so they don't generate anything
Fix and update various includes
glapi_gentable.c (which is only used on darwin), should be included in shared
glapi as well, to provide _glapi_create_table_from_handle()
Note that neither swrast nor indirect is supported in the APPLEGL path at the
moment, which makes things more complex than they need to be. More untangling
is needed to allow that
v2: Correct apple/Makefile.am for srcdir != builddir
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2014-05-12 10:47:07 +01:00
|
|
|
#ifndef GLX_USE_APPLEGL
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
extern struct _glapi_table *__glXNewIndirectAPI(void);
|
|
|
|
|
|
|
|
/*
|
|
|
|
** All indirect rendering contexts will share the same indirect dispatch table.
|
|
|
|
*/
|
|
|
|
static struct _glapi_table *IndirectAPI = NULL;
|
|
|
|
|
2021-05-10 23:56:01 +01:00
|
|
|
static void
|
|
|
|
__glFreeAttributeState(struct glx_context * gc)
|
|
|
|
{
|
|
|
|
__GLXattribute *sp, **spp;
|
|
|
|
|
|
|
|
for (spp = &gc->attributes.stack[0];
|
|
|
|
spp < &gc->attributes.stack[__GL_CLIENT_ATTRIB_STACK_DEPTH]; spp++) {
|
|
|
|
sp = *spp;
|
|
|
|
if (sp) {
|
|
|
|
free((char *) sp);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
static void
|
|
|
|
indirect_destroy_context(struct glx_context *gc)
|
|
|
|
{
|
|
|
|
__glXFreeVertexArrayState(gc);
|
|
|
|
|
2012-09-04 04:24:35 +01:00
|
|
|
free((char *) gc->vendor);
|
|
|
|
free((char *) gc->renderer);
|
|
|
|
free((char *) gc->version);
|
|
|
|
free((char *) gc->extensions);
|
2010-07-28 21:40:43 +01:00
|
|
|
__glFreeAttributeState(gc);
|
2012-09-05 06:52:36 +01:00
|
|
|
free((char *) gc->buf);
|
|
|
|
free((char *) gc->client_state_private);
|
|
|
|
free((char *) gc);
|
2010-07-28 21:40:43 +01:00
|
|
|
}
|
|
|
|
|
2021-04-15 19:25:09 +01:00
|
|
|
static Bool
|
|
|
|
SendMakeCurrentRequest(Display * dpy, GLXContextID gc_id,
|
|
|
|
GLXContextTag gc_tag, GLXDrawable draw,
|
|
|
|
GLXDrawable read, GLXContextTag *out_tag)
|
|
|
|
{
|
|
|
|
xGLXMakeCurrentReply reply;
|
|
|
|
Bool ret;
|
|
|
|
int opcode = __glXSetupForCommand(dpy);
|
|
|
|
|
|
|
|
LockDisplay(dpy);
|
|
|
|
|
|
|
|
if (draw == read) {
|
|
|
|
xGLXMakeCurrentReq *req;
|
|
|
|
|
|
|
|
GetReq(GLXMakeCurrent, req);
|
|
|
|
req->reqType = opcode;
|
|
|
|
req->glxCode = X_GLXMakeCurrent;
|
|
|
|
req->drawable = draw;
|
|
|
|
req->context = gc_id;
|
|
|
|
req->oldContextTag = gc_tag;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
struct glx_display *priv = __glXInitialize(dpy);
|
|
|
|
|
|
|
|
/* If the server can support the GLX 1.3 version, we should
|
|
|
|
* perfer that. Not only that, some servers support GLX 1.3 but
|
|
|
|
* not the SGI extension.
|
|
|
|
*/
|
|
|
|
|
2021-04-22 18:10:44 +01:00
|
|
|
if (priv->minorVersion >= 3) {
|
2021-04-15 19:25:09 +01:00
|
|
|
xGLXMakeContextCurrentReq *req;
|
|
|
|
|
|
|
|
GetReq(GLXMakeContextCurrent, req);
|
|
|
|
req->reqType = opcode;
|
|
|
|
req->glxCode = X_GLXMakeContextCurrent;
|
|
|
|
req->drawable = draw;
|
|
|
|
req->readdrawable = read;
|
|
|
|
req->context = gc_id;
|
|
|
|
req->oldContextTag = gc_tag;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
xGLXVendorPrivateWithReplyReq *vpreq;
|
|
|
|
xGLXMakeCurrentReadSGIReq *req;
|
|
|
|
|
|
|
|
GetReqExtra(GLXVendorPrivateWithReply,
|
|
|
|
sz_xGLXMakeCurrentReadSGIReq -
|
|
|
|
sz_xGLXVendorPrivateWithReplyReq, vpreq);
|
|
|
|
req = (xGLXMakeCurrentReadSGIReq *) vpreq;
|
|
|
|
req->reqType = opcode;
|
|
|
|
req->glxCode = X_GLXVendorPrivateWithReply;
|
|
|
|
req->vendorCode = X_GLXvop_MakeCurrentReadSGI;
|
|
|
|
req->drawable = draw;
|
|
|
|
req->readable = read;
|
|
|
|
req->context = gc_id;
|
|
|
|
req->oldContextTag = gc_tag;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = _XReply(dpy, (xReply *) &reply, 0, False);
|
|
|
|
|
|
|
|
if (out_tag)
|
|
|
|
*out_tag = reply.contextTag;
|
|
|
|
|
|
|
|
UnlockDisplay(dpy);
|
|
|
|
SyncHandle();
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
static int
|
|
|
|
indirect_bind_context(struct glx_context *gc, struct glx_context *old,
|
|
|
|
GLXDrawable draw, GLXDrawable read)
|
|
|
|
{
|
2021-04-15 19:25:09 +01:00
|
|
|
GLXContextTag tag;
|
|
|
|
Display *dpy = gc->psc->dpy;
|
|
|
|
Bool sent;
|
|
|
|
|
|
|
|
if (old != &dummyContext && !old->isDirect && old->psc->dpy == dpy) {
|
|
|
|
tag = old->currentContextTag;
|
|
|
|
old->currentContextTag = 0;
|
|
|
|
} else {
|
|
|
|
tag = 0;
|
2010-09-07 11:36:07 +01:00
|
|
|
}
|
2010-07-28 21:40:43 +01:00
|
|
|
|
2021-04-15 19:25:09 +01:00
|
|
|
sent = SendMakeCurrentRequest(dpy, gc->xid, tag, draw, read,
|
|
|
|
&gc->currentContextTag);
|
|
|
|
|
|
|
|
if (sent) {
|
|
|
|
if (!IndirectAPI)
|
|
|
|
IndirectAPI = __glXNewIndirectAPI();
|
|
|
|
_glapi_set_dispatch(IndirectAPI);
|
|
|
|
|
|
|
|
/* The indirect vertex array state must to be initialised after we
|
|
|
|
* have setup the context, as it needs to query server attributes.
|
|
|
|
*
|
|
|
|
* At the point this is called gc->currentDpy is not initialized
|
|
|
|
* nor is the thread's current context actually set. Hence the
|
|
|
|
* cleverness before the GetString calls.
|
|
|
|
*/
|
|
|
|
__GLXattribute *state = gc->client_state_private;
|
|
|
|
if (state && state->array_state == NULL) {
|
|
|
|
gc->currentDpy = gc->psc->dpy;
|
|
|
|
__glXSetCurrentContext(gc);
|
|
|
|
__indirect_glGetString(GL_EXTENSIONS);
|
|
|
|
__indirect_glGetString(GL_VERSION);
|
|
|
|
__glXInitVertexArrayState(gc);
|
|
|
|
}
|
|
|
|
}
|
2010-07-28 21:40:43 +01:00
|
|
|
|
2021-04-15 19:25:09 +01:00
|
|
|
return !sent;
|
2010-07-28 21:40:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
indirect_unbind_context(struct glx_context *gc, struct glx_context *new)
|
|
|
|
{
|
2021-04-15 19:25:09 +01:00
|
|
|
Display *dpy = gc->psc->dpy;
|
|
|
|
|
|
|
|
if (gc == new)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* We are either switching to no context, away from an indirect
|
|
|
|
* context to a direct context or from one dpy to another and have
|
|
|
|
* to send a request to the dpy to unbind the previous context.
|
|
|
|
*/
|
|
|
|
if (!new || new->isDirect || new->psc->dpy != dpy) {
|
|
|
|
SendMakeCurrentRequest(dpy, None, gc->currentContextTag, None, None,
|
|
|
|
NULL);
|
|
|
|
gc->currentContextTag = 0;
|
|
|
|
}
|
2010-07-28 21:40:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
indirect_wait_gl(struct glx_context *gc)
|
|
|
|
{
|
|
|
|
xGLXWaitGLReq *req;
|
|
|
|
Display *dpy = gc->currentDpy;
|
|
|
|
|
|
|
|
/* Flush any pending commands out */
|
|
|
|
__glXFlushRenderBuffer(gc, gc->pc);
|
|
|
|
|
|
|
|
/* Send the glXWaitGL request */
|
|
|
|
LockDisplay(dpy);
|
|
|
|
GetReq(GLXWaitGL, req);
|
|
|
|
req->reqType = gc->majorOpcode;
|
|
|
|
req->glxCode = X_GLXWaitGL;
|
|
|
|
req->contextTag = gc->currentContextTag;
|
|
|
|
UnlockDisplay(dpy);
|
|
|
|
SyncHandle();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
indirect_wait_x(struct glx_context *gc)
|
|
|
|
{
|
|
|
|
xGLXWaitXReq *req;
|
|
|
|
Display *dpy = gc->currentDpy;
|
|
|
|
|
|
|
|
/* Flush any pending commands out */
|
|
|
|
__glXFlushRenderBuffer(gc, gc->pc);
|
|
|
|
|
|
|
|
LockDisplay(dpy);
|
|
|
|
GetReq(GLXWaitX, req);
|
|
|
|
req->reqType = gc->majorOpcode;
|
|
|
|
req->glxCode = X_GLXWaitX;
|
|
|
|
req->contextTag = gc->currentContextTag;
|
|
|
|
UnlockDisplay(dpy);
|
|
|
|
SyncHandle();
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct glx_context_vtable indirect_context_vtable = {
|
2014-02-18 15:51:14 +00:00
|
|
|
.destroy = indirect_destroy_context,
|
|
|
|
.bind = indirect_bind_context,
|
|
|
|
.unbind = indirect_unbind_context,
|
|
|
|
.wait_gl = indirect_wait_gl,
|
|
|
|
.wait_x = indirect_wait_x,
|
2010-07-28 21:40:43 +01:00
|
|
|
};
|
|
|
|
|
2020-11-10 21:06:47 +00:00
|
|
|
_X_HIDDEN struct glx_context *
|
|
|
|
indirect_create_context(struct glx_screen *psc,
|
|
|
|
struct glx_config *mode,
|
|
|
|
struct glx_context *shareList, int renderType)
|
|
|
|
{
|
|
|
|
unsigned error = 0;
|
|
|
|
const uint32_t attribs[] = { GLX_RENDER_TYPE, renderType };
|
|
|
|
|
|
|
|
return indirect_create_context_attribs(psc, mode, shareList,
|
|
|
|
1, attribs, &error);
|
|
|
|
}
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
/**
|
|
|
|
* \todo Eliminate \c __glXInitVertexArrayState. Replace it with a new
|
|
|
|
* function called \c __glXAllocateClientState that allocates the memory and
|
|
|
|
* does all the initialization (including the pixel pack / unpack).
|
|
|
|
*/
|
|
|
|
_X_HIDDEN struct glx_context *
|
2020-11-10 21:06:47 +00:00
|
|
|
indirect_create_context_attribs(struct glx_screen *psc,
|
|
|
|
struct glx_config *mode,
|
|
|
|
struct glx_context *shareList,
|
|
|
|
unsigned num_attribs,
|
|
|
|
const uint32_t *attribs,
|
|
|
|
unsigned *error)
|
2010-07-28 21:40:43 +01:00
|
|
|
{
|
|
|
|
struct glx_context *gc;
|
|
|
|
int bufSize;
|
|
|
|
CARD8 opcode;
|
|
|
|
__GLXattribute *state;
|
2020-11-10 21:06:47 +00:00
|
|
|
int i, renderType = GLX_RGBA_TYPE;
|
2020-11-10 21:23:23 +00:00
|
|
|
uint32_t mask = GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
|
|
|
|
uint32_t major = 1;
|
|
|
|
uint32_t minor = 0;
|
2010-07-28 21:40:43 +01:00
|
|
|
|
|
|
|
opcode = __glXSetupForCommand(psc->dpy);
|
|
|
|
if (!opcode) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-11-10 21:06:47 +00:00
|
|
|
for (i = 0; i < num_attribs; i++) {
|
|
|
|
uint32_t attr = attribs[i*2], val = attribs[i*2 + 1];
|
|
|
|
|
|
|
|
if (attr == GLX_RENDER_TYPE)
|
|
|
|
renderType = val;
|
2020-11-10 21:23:23 +00:00
|
|
|
if (attr == GLX_CONTEXT_PROFILE_MASK_ARB)
|
|
|
|
mask = val;
|
|
|
|
if (attr == GLX_CONTEXT_MAJOR_VERSION_ARB)
|
|
|
|
major = val;
|
|
|
|
if (attr == GLX_CONTEXT_MINOR_VERSION_ARB)
|
|
|
|
minor = val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We have no indirect support for core or ES contexts, and our compat
|
|
|
|
* context support is limited to GL 1.4.
|
|
|
|
*/
|
|
|
|
if (mask != GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB ||
|
|
|
|
major != 1 ||
|
|
|
|
minor > 4) {
|
|
|
|
return NULL;
|
2020-11-10 21:06:47 +00:00
|
|
|
}
|
|
|
|
|
2021-08-06 22:10:45 +01:00
|
|
|
/* We can't share with a direct context */
|
|
|
|
if (shareList && shareList->isDirect)
|
|
|
|
return NULL;
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
/* Allocate our context record */
|
2012-09-05 07:09:22 +01:00
|
|
|
gc = calloc(1, sizeof *gc);
|
2010-07-28 21:40:43 +01:00
|
|
|
if (!gc) {
|
|
|
|
/* Out of memory */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
glx_context_init(gc, psc, mode);
|
|
|
|
gc->isDirect = GL_FALSE;
|
|
|
|
gc->vtable = &indirect_context_vtable;
|
2012-09-05 07:12:46 +01:00
|
|
|
state = calloc(1, sizeof(struct __GLXattributeRec));
|
2013-07-17 12:49:18 +01:00
|
|
|
gc->renderType = renderType;
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
if (state == NULL) {
|
|
|
|
/* Out of memory */
|
2012-09-05 06:52:36 +01:00
|
|
|
free(gc);
|
2010-07-28 21:40:43 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
gc->client_state_private = state;
|
2017-09-08 11:57:26 +01:00
|
|
|
state->NoDrawArraysProtocol = env_var_as_boolean("LIBGL_NO_DRAWARRAYS", false);
|
2010-07-28 21:40:43 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
** Create a temporary buffer to hold GLX rendering commands. The size
|
|
|
|
** of the buffer is selected so that the maximum number of GLX rendering
|
|
|
|
** commands can fit in a single X packet and still have room in the X
|
|
|
|
** packet for the GLXRenderReq header.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bufSize = (XMaxRequestSize(psc->dpy) * 4) - sz_xGLXRenderReq;
|
2012-09-04 03:44:00 +01:00
|
|
|
gc->buf = malloc(bufSize);
|
2010-07-28 21:40:43 +01:00
|
|
|
if (!gc->buf) {
|
2012-09-05 06:52:36 +01:00
|
|
|
free(gc->client_state_private);
|
|
|
|
free(gc);
|
2010-07-28 21:40:43 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
gc->bufSize = bufSize;
|
|
|
|
|
|
|
|
/* Fill in the new context */
|
|
|
|
gc->renderMode = GL_RENDER;
|
|
|
|
|
|
|
|
state->storePack.alignment = 4;
|
|
|
|
state->storeUnpack.alignment = 4;
|
|
|
|
|
|
|
|
gc->attributes.stackPointer = &gc->attributes.stack[0];
|
|
|
|
|
|
|
|
gc->pc = gc->buf;
|
|
|
|
gc->bufEnd = gc->buf + bufSize;
|
|
|
|
gc->isDirect = GL_FALSE;
|
|
|
|
if (__glXDebug) {
|
|
|
|
/*
|
|
|
|
** Set limit register so that there will be one command per packet
|
|
|
|
*/
|
|
|
|
gc->limit = gc->buf;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gc->limit = gc->buf + bufSize - __GLX_BUFFER_LIMIT_SIZE;
|
|
|
|
}
|
|
|
|
gc->majorOpcode = opcode;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Constrain the maximum drawing command size allowed to be
|
2020-12-07 11:03:09 +00:00
|
|
|
** transferred using the X_GLXRender protocol request. First
|
|
|
|
** constrain by a software limit, then constrain by the protocol
|
2010-07-28 21:40:43 +01:00
|
|
|
** limit.
|
|
|
|
*/
|
2020-12-07 10:50:28 +00:00
|
|
|
gc->maxSmallRenderCommandSize = MIN3(bufSize, __GLX_RENDER_CMD_SIZE_LIMIT,
|
|
|
|
__GLX_MAX_RENDER_CMD_SIZE);
|
|
|
|
|
2010-07-28 21:40:43 +01:00
|
|
|
|
|
|
|
return gc;
|
|
|
|
}
|
|
|
|
|
2014-02-18 15:51:14 +00:00
|
|
|
static const struct glx_screen_vtable indirect_screen_vtable = {
|
|
|
|
.create_context = indirect_create_context,
|
|
|
|
.create_context_attribs = indirect_create_context_attribs,
|
|
|
|
.query_renderer_integer = NULL,
|
|
|
|
.query_renderer_string = NULL,
|
2010-07-28 21:40:43 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
_X_HIDDEN struct glx_screen *
|
|
|
|
indirect_create_screen(int screen, struct glx_display * priv)
|
|
|
|
{
|
|
|
|
struct glx_screen *psc;
|
|
|
|
|
2012-09-05 07:09:22 +01:00
|
|
|
psc = calloc(1, sizeof *psc);
|
2010-07-28 21:40:43 +01:00
|
|
|
if (psc == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
glx_screen_init(psc, screen, priv);
|
|
|
|
psc->vtable = &indirect_screen_vtable;
|
|
|
|
|
|
|
|
return psc;
|
|
|
|
}
|
Fix build of appleglx
Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to
use the applegl direct renderer
Convert src/glx/apple/Makefile to automake
Since the applegl libGL is now built by linking libappleglx into libGL, rather
than by linking selected files into a special libGL:
- Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes
apple/glxreply.c empty, so remove it
- Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we
need to add those guards to indirect_glx.c, indirect_init.c (via it's
generator), render2.c and vertarr.c so they don't generate anything
Fix and update various includes
glapi_gentable.c (which is only used on darwin), should be included in shared
glapi as well, to provide _glapi_create_table_from_handle()
Note that neither swrast nor indirect is supported in the APPLEGL path at the
moment, which makes things more complex than they need to be. More untangling
is needed to allow that
v2: Correct apple/Makefile.am for srcdir != builddir
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2014-05-12 10:47:07 +01:00
|
|
|
|
|
|
|
#endif
|