glapi: split the no-op dispatch code into new glapi_nop.c file
This unclutters the glapi.c file a bit.
This commit is contained in:
Brian Paul
parent
ea5918be0e
commit
126aff18aa
|
|
@ -251,6 +251,7 @@ if env['platform'] != 'winddk':
|
|||
'main/dispatch.c',
|
||||
'glapi/glapi.c',
|
||||
'glapi/glapi_getproc.c',
|
||||
'glapi/glapi_nop.c',
|
||||
'glapi/glthread.c',
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ GLX_DIR = $(XORG_BASE)/glx
|
|||
SERVER_GLAPI_FILES = \
|
||||
$(GLX_DIR)/glapi.h \
|
||||
$(GLX_DIR)/glapi.c \
|
||||
$(GLX_DIR)/glapi_nop.c \
|
||||
$(GLX_DIR)/glthread.c \
|
||||
$(GLX_DIR)/glthread.h
|
||||
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ class PrintGlOffsets(gl_XML.gl_print_base):
|
|||
#error _GLAPI_SKIP_NORMAL_ENTRY_POINTS must not be defined
|
||||
#endif
|
||||
|
||||
static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
|
||||
_glapi_proc DISPATCH_TABLE_NAME[] = {"""
|
||||
for f in api.functionIterateByOffset():
|
||||
print ' TABLE_ENTRY(%s),' % (f.dispatch_name())
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
|
|||
* We list the functions which are not otherwise used.
|
||||
*/
|
||||
#ifdef UNUSED_TABLE_NAME
|
||||
static _glapi_proc UNUSED_TABLE_NAME[] = {"""
|
||||
_glapi_proc UNUSED_TABLE_NAME[] = {"""
|
||||
|
||||
normal_entries = []
|
||||
proto_entries = []
|
||||
|
|
|
|||
|
|
@ -73,85 +73,7 @@
|
|||
#include "glapi/glapioffsets.h"
|
||||
#include "glapi/glapitable.h"
|
||||
|
||||
/***** BEGIN NO-OP DISPATCH *****/
|
||||
|
||||
static GLboolean WarnFlag = GL_FALSE;
|
||||
static _glapi_warning_func warning_func;
|
||||
|
||||
/*
|
||||
* Enable/disable printing of warning messages.
|
||||
*/
|
||||
PUBLIC void
|
||||
_glapi_noop_enable_warnings(GLboolean enable)
|
||||
{
|
||||
WarnFlag = enable;
|
||||
}
|
||||
|
||||
/*
|
||||
* Register a callback function for reporting errors.
|
||||
*/
|
||||
PUBLIC void
|
||||
_glapi_set_warning_func( _glapi_warning_func func )
|
||||
{
|
||||
warning_func = func;
|
||||
}
|
||||
|
||||
static int
|
||||
warn(const char *func)
|
||||
{
|
||||
#if !defined(_WIN32_WCE)
|
||||
if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
|
||||
&& warning_func) {
|
||||
warning_func(NULL, "GL User Error: called without context: %s", func);
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
|
||||
#define KEYWORD1 static
|
||||
#define KEYWORD1_ALT static
|
||||
#define KEYWORD2 GLAPIENTRY
|
||||
#define NAME(func) NoOp##func
|
||||
|
||||
#define F NULL
|
||||
|
||||
#define DISPATCH(func, args, msg) \
|
||||
warn(#func);
|
||||
|
||||
#define RETURN_DISPATCH(func, args, msg) \
|
||||
warn(#func); return 0
|
||||
|
||||
#define TABLE_ENTRY(name) (_glapi_proc) NoOp##name
|
||||
|
||||
#else
|
||||
|
||||
static void
|
||||
NoOpGeneric(void)
|
||||
{
|
||||
if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
|
||||
&& warning_func) {
|
||||
warning_func(NULL, "GL User Error: calling GL function");
|
||||
}
|
||||
}
|
||||
|
||||
#define TABLE_ENTRY(name) (_glapi_proc) NoOpGeneric
|
||||
|
||||
#endif
|
||||
|
||||
#define DISPATCH_TABLE_NAME __glapi_noop_table
|
||||
#define UNUSED_TABLE_NAME __unused_noop_functions
|
||||
|
||||
static GLint NoOpUnused(void)
|
||||
{
|
||||
return warn("extension function");
|
||||
}
|
||||
|
||||
#include "glapi/glapitemp.h"
|
||||
|
||||
/***** END NO-OP DISPATCH *****/
|
||||
|
||||
extern _glapi_proc __glapi_noop_table[];
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -278,7 +200,6 @@ _glapi_check_multithread(void)
|
|||
PUBLIC void
|
||||
_glapi_set_context(void *context)
|
||||
{
|
||||
(void) __unused_noop_functions; /* silence a warning */
|
||||
#if defined(GLX_USE_TLS)
|
||||
_glapi_tls_Context = context;
|
||||
#elif defined(THREADS)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,119 @@
|
|||
/*
|
||||
* Mesa 3-D graphics library
|
||||
* Version: 7.8
|
||||
*
|
||||
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
||||
* Copyright (C) 2010 VMWare, Inc. 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
|
||||
* THE AUTHORS 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.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* No-op dispatch table.
|
||||
*
|
||||
* This file defines a special dispatch table which is loaded with no-op
|
||||
* functions.
|
||||
*
|
||||
* When there's no current rendering context, calling a GL function like
|
||||
* glBegin() is a no-op. Apps should never normally do this. So as a
|
||||
* debugging aid, each of the no-op functions will emit a warning to
|
||||
* stderr if the MESA_DEBUG or LIBGL_DEBUG env var is set.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "main/compiler.h"
|
||||
#include "glapi/glapi.h"
|
||||
|
||||
|
||||
static GLboolean WarnFlag = GL_FALSE;
|
||||
static _glapi_warning_func warning_func;
|
||||
|
||||
/*
|
||||
* Enable/disable printing of warning messages.
|
||||
*/
|
||||
PUBLIC void
|
||||
_glapi_noop_enable_warnings(GLboolean enable)
|
||||
{
|
||||
WarnFlag = enable;
|
||||
}
|
||||
|
||||
/*
|
||||
* Register a callback function for reporting errors.
|
||||
*/
|
||||
PUBLIC void
|
||||
_glapi_set_warning_func( _glapi_warning_func func )
|
||||
{
|
||||
warning_func = func;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
warn(const char *func)
|
||||
{
|
||||
#if !defined(_WIN32_WCE)
|
||||
if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
|
||||
&& warning_func) {
|
||||
warning_func(NULL, "GL User Error: called without context: %s", func);
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
|
||||
#define KEYWORD1 static
|
||||
#define KEYWORD1_ALT static
|
||||
#define KEYWORD2 GLAPIENTRY
|
||||
#define NAME(func) NoOp##func
|
||||
#define F NULL
|
||||
|
||||
#define DISPATCH(func, args, msg) \
|
||||
warn(#func);
|
||||
|
||||
#define RETURN_DISPATCH(func, args, msg) \
|
||||
warn(#func); return 0
|
||||
|
||||
#define TABLE_ENTRY(name) (_glapi_proc) NoOp##name
|
||||
|
||||
#else
|
||||
|
||||
static void
|
||||
NoOpGeneric(void)
|
||||
{
|
||||
if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
|
||||
&& warning_func) {
|
||||
warning_func(NULL, "GL User Error: calling GL function");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#define TABLE_ENTRY(name) (_glapi_proc) NoOpGeneric
|
||||
|
||||
#endif
|
||||
|
||||
#define DISPATCH_TABLE_NAME __glapi_noop_table
|
||||
#define UNUSED_TABLE_NAME __unused_noop_functions
|
||||
|
||||
static int NoOpUnused(void)
|
||||
{
|
||||
return warn("extension function");
|
||||
}
|
||||
|
||||
#include "glapi/glapitemp.h"
|
||||
|
|
@ -5764,7 +5764,7 @@ KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_366)(GLenum target, GLenum pname,
|
|||
#error _GLAPI_SKIP_NORMAL_ENTRY_POINTS must not be defined
|
||||
#endif
|
||||
|
||||
static _glapi_proc DISPATCH_TABLE_NAME[] = {
|
||||
_glapi_proc DISPATCH_TABLE_NAME[] = {
|
||||
TABLE_ENTRY(NewList),
|
||||
TABLE_ENTRY(EndList),
|
||||
TABLE_ENTRY(CallList),
|
||||
|
|
@ -6680,7 +6680,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
|
|||
* We list the functions which are not otherwise used.
|
||||
*/
|
||||
#ifdef UNUSED_TABLE_NAME
|
||||
static _glapi_proc UNUSED_TABLE_NAME[] = {
|
||||
_glapi_proc UNUSED_TABLE_NAME[] = {
|
||||
#ifndef _GLAPI_SKIP_NORMAL_ENTRY_POINTS
|
||||
TABLE_ENTRY(ArrayElementEXT),
|
||||
TABLE_ENTRY(BindTextureEXT),
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ GLAPI_SOURCES = \
|
|||
main/dispatch.c \
|
||||
glapi/glapi.c \
|
||||
glapi/glapi_getproc.c \
|
||||
glapi/glapi_nop.c \
|
||||
glapi/glthread.c
|
||||
|
||||
MATH_SOURCES = \
|
||||
|
|
|
|||
Loading…
Reference in New Issue