Use the same dispatch.c source file for "normal" Mesa builds and DRI
libGL builds.
This commit is contained in:
parent
d9c389dff6
commit
a657c1aee8
|
@ -86,6 +86,9 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
|
|||
glcontextmodes.c:
|
||||
ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c .
|
||||
|
||||
dispatch.c:
|
||||
ln -s $(TOP)/src/mesa/main/dispatch.c .
|
||||
|
||||
# Make libGL
|
||||
$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
|
||||
CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
|
||||
|
|
|
@ -1,74 +0,0 @@
|
|||
/* $XFree86: xc/lib/GL/glx/dispatch.c,v 1.5 2003/06/30 01:45:10 torrey Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
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, sub license, 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 (including the
|
||||
next paragraph) 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 NON-INFRINGEMENT.
|
||||
IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
|
||||
|
||||
**************************************************************************/
|
||||
|
||||
/*
|
||||
* Authors:
|
||||
* Brian Paul <brian@precisioninsight.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef GLX_USE_APPLEGL
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include "glheader.h"
|
||||
#include "glapi.h"
|
||||
#include "glapitable.h"
|
||||
|
||||
|
||||
/*
|
||||
* NOTE: this file implements C-based dispatch of the OpenGL entrypoints
|
||||
* (glAccum, glBegin, etc).
|
||||
* This code IS NOT USED if we're compiling on an x86 system and using
|
||||
* the glapi_x86.S assembly code.
|
||||
*/
|
||||
|
||||
|
||||
#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
|
||||
|
||||
#define KEYWORD1 PUBLIC
|
||||
|
||||
#define KEYWORD2
|
||||
|
||||
#define NAME(func) gl##func
|
||||
|
||||
#define DISPATCH(func, args, msg) \
|
||||
const struct _glapi_table *dispatch; \
|
||||
dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
|
||||
(dispatch->func) args
|
||||
|
||||
#define RETURN_DISPATCH(func, args, msg) \
|
||||
const struct _glapi_table *dispatch; \
|
||||
dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
|
||||
return (dispatch->func) args
|
||||
|
||||
|
||||
#include "glapitemp.h"
|
||||
|
||||
#endif /* USE_X86_ASM */
|
||||
|
||||
#endif /* !GLX_USE_APPLEGL */
|
|
@ -23,16 +23,21 @@
|
|||
*/
|
||||
|
||||
|
||||
/*
|
||||
* This file generates all the gl* function entrypoints.
|
||||
* But if we're using X86-optimized dispatch (X86/glapi_x86.S) then
|
||||
* we don't use this code.
|
||||
/**
|
||||
* \file dispatch.c
|
||||
*
|
||||
* NOTE: This file should _not_ be used when compiling Mesa for a DRI-
|
||||
* based device driver.
|
||||
* This file generates all the gl* function entrypoints. This code is not
|
||||
* used if optimized assembly stubs are available (e.g., using x86/glapi_x86.S
|
||||
* on IA32 or sparc/glapi_sparc.S on SPARC).
|
||||
*
|
||||
* \note
|
||||
* This file is also used to build the client-side libGL that loads DRI-based
|
||||
* device drivers. At build-time it is symlinked to src/glx/x11.
|
||||
*
|
||||
* \author Brian Paul <brian@precisioninsight.com>
|
||||
*/
|
||||
|
||||
#ifndef GLX_USE_APPLEGL
|
||||
|
||||
#include "glheader.h"
|
||||
#include "glapi.h"
|
||||
|
@ -84,5 +89,6 @@
|
|||
|
||||
#include "glapitemp.h"
|
||||
|
||||
|
||||
#endif /* USE_X86_ASM */
|
||||
|
||||
#endif /* !GLX_USE_APPLEGL */
|
||||
|
|
Loading…
Reference in New Issue