KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerate files from previous commits 

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Ian Romanick 2011-12-08 12:27:38 -08:00
parent 0c6b930322
commit 7e9cb2ac6d
6 changed files with 2771 additions and 2757 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1293
src/glx/indirect.h
View File

File diff suppressed because it is too large Load Diff

38
src/glx/indirect_size.c
View File

@ -26,6 +26,7 @@
*/
#include <X11/Xfuncproto.h>
#include <GL/gl.h>
#include "indirect_size.h"
@ -41,29 +42,23 @@
#define FASTCALL
#endif
#if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
#define INTERNAL __attribute__((visibility("internal")))
#else
#define INTERNAL
#endif
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
#undef HAVE_ALIAS
#endif
#ifdef HAVE_ALIAS
#define ALIAS2(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
_X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
__attribute__ ((alias( # to )));
#define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
#else
#define ALIAS(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
_X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
{ return __gl ## to ## _size( e ); }
#endif
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glCallLists_size(GLenum e)
{
switch (e) {
@ -87,7 +82,7 @@ __glCallLists_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glFogfv_size(GLenum e)
{
switch (e) {
@ -106,7 +101,7 @@ __glFogfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glLightfv_size(GLenum e)
{
switch (e) {
@ -128,7 +123,7 @@ __glLightfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glLightModelfv_size(GLenum e)
{
switch (e) {
@ -144,7 +139,7 @@ __glLightModelfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glMaterialfv_size(GLenum e)
{
switch (e) {
@ -163,7 +158,7 @@ __glMaterialfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glTexParameterfv_size(GLenum e)
{
switch (e) {
@ -219,7 +214,7 @@ __glTexParameterfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glTexEnvfv_size(GLenum e)
{
switch (e) {
@ -256,7 +251,7 @@ __glTexEnvfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glTexGendv_size(GLenum e)
{
switch (e) {
@ -270,7 +265,7 @@ __glTexGendv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glMap1d_size(GLenum e)
{
switch (e) {
@ -292,7 +287,7 @@ __glMap1d_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glMap2d_size(GLenum e)
{
switch (e) {
@ -314,7 +309,7 @@ __glMap2d_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glColorTableParameterfv_size(GLenum e)
{
switch (e) {
@ -326,7 +321,7 @@ __glColorTableParameterfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glConvolutionParameterfv_size(GLenum e)
{
switch (e) {
@ -345,7 +340,7 @@ __glConvolutionParameterfv_size(GLenum e)
}
}
INTERNAL PURE FASTCALL GLint
_X_INTERNAL PURE FASTCALL GLint
__glPointParameterfvEXT_size(GLenum e)
{
switch (e) {
@ -385,4 +380,3 @@ ALIAS(Fogiv, Fogfv)
ALIAS(PointParameterivNV, PointParameterfvEXT)
#undef PURE
#undef FASTCALL
#undef INTERNAL

63
src/glx/indirect_size.h
View File

@ -36,6 +36,8 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
#include <X11/Xfuncproto.h>
#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
#define PURE __attribute__((pure))
#else
@ -48,41 +50,36 @@
#define FASTCALL
#endif
#if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
#define INTERNAL __attribute__((visibility("internal")))
#else
#define INTERNAL
#endif
extern INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint
__glConvolutionParameterfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint
__glConvolutionParameteriv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
#undef PURE
#undef FASTCALL
#undef INTERNAL
#endif /* !defined( _INDIRECT_SIZE_H_ ) */

36
src/mapi/glapi/glapi_gentable.c
View File

@ -27,8 +27,20 @@
* SOFTWARE.
*/
/* GLXEXT is the define used in the xserver when the GLX extension is being
* built. Hijack this to determine whether this file is being built for the
* server or the client.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#if defined(DEBUG) && !defined(_WIN32_WCE)
#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \
|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE))
#define USE_BACKTRACE
#endif
#ifdef USE_BACKTRACE
#include <execinfo.h>
#endif
@ -41,11 +53,22 @@
#include "glapi.h"
#include "glapitable.h"
#ifdef GLXEXT
#include "os.h"
#endif
static void
__glapi_gentable_NoOp(void) {
#if defined(DEBUG) && !defined(_WIN32_WCE)
if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
const char *fstr = "Unknown";
const char *fstr = "Unknown";
/* Silence potential GCC warning for some #ifdef paths.
*/
(void) fstr;
#if defined(USE_BACKTRACE)
#if !defined(GLXEXT)
if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
#endif
{
void *frames[2];
if(backtrace(frames, 2) == 2) {
@ -55,9 +78,14 @@ __glapi_gentable_NoOp(void) {
fstr = info.dli_sname;
}
#if !defined(GLXEXT)
fprintf(stderr, "Call to unimplemented API: %s\n", fstr);
#endif
}
#endif
#if defined(GLXEXT)
LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\n", fstr);
#endif
}
static void

4
src/mesa/main/dispatch.h
View File

@ -40,7 +40,11 @@
* named function in the specified dispatch table.
*/
/* GLXEXT is defined when building the GLX extension in the xserver.
*/
#if !defined(GLXEXT)
#include "main/mfeatures.h"
#endif
#define CALL_by_offset(disp, cast, offset, parameters) \
(*(cast (GET_by_offset(disp, offset)))) parameters

4094
src/mesa/main/enums.c
View File

File diff suppressed because it is too large Load Diff