From b762db62c2972506fa78a5ed72f796113fc9b0d1 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 26 Oct 2010 04:25:45 +0800
Subject: [PATCH] mesa: Remove unnecessary glapitable.h includes.

With 07b85457d95bcc70588584e9380c51cd63aa3a2b, glapitable.h is included
by core mesa only to know the size of _glapi_table.  It is not necessary
as the same info is given by _gloffset_COUNT.

This change makes _glapi_table opaque to core mesa.  All operations on
it are supposed to go through one of the SET/GET/CALL macros.
---
 src/mesa/main/api_exec.c      | 2 +-
 src/mesa/main/api_loopback.c  | 1 -
 src/mesa/main/context.c       | 3 +--
 src/mesa/main/dispatch.h      | 1 -
 src/mesa/main/dlist.c         | 2 +-
 src/mesa/main/es_generator.py | 5 ++---
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index cd002f6bc27..fc38e19a539 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -160,7 +160,7 @@ _mesa_create_exec_table(void)
 {
    struct _glapi_table *exec;
 
-   exec = _mesa_alloc_dispatch_table(sizeof *exec);
+   exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);
    if (exec == NULL)
       return NULL;
 
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index d1789069cc1..e8da8bfec8c 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -34,7 +34,6 @@
 #include "api_loopback.h"
 #include "mtypes.h"
 #include "glapi/glapi.h"
-#include "glapi/glapitable.h"
 #include "glapi/glthread.h"
 #include "main/dispatch.h"
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 3e265fb3087..957dcfc3cf9 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -807,8 +807,7 @@ _mesa_alloc_dispatch_table(int size)
     * Mesa we do this to accomodate different versions of libGL and various
     * DRI drivers.
     */
-   GLint numEntries = MAX2(_glapi_get_dispatch_table_size(),
-                           size / sizeof(_glapi_proc));
+   GLint numEntries = MAX2(_glapi_get_dispatch_table_size(), size);
    struct _glapi_table *table =
       (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc));
    if (table) {
diff --git a/src/mesa/main/dispatch.h b/src/mesa/main/dispatch.h
index bf97b1a8744..552384c500c 100644
--- a/src/mesa/main/dispatch.h
+++ b/src/mesa/main/dispatch.h
@@ -30,7 +30,6 @@
 #define _GLAPI_USE_REMAP_TABLE
 #endif
 
-#include "glapi/glapitable.h"
 #include "main/glapidispatch.h"
 
 #endif /* _DISPATCH_H */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 46b7721c324..bf2e8a92d80 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -9076,7 +9076,7 @@ _mesa_create_save_table(void)
 {
    struct _glapi_table *table;
 
-   table = _mesa_alloc_dispatch_table(sizeof *table);
+   table = _mesa_alloc_dispatch_table(_gloffset_COUNT);
    if (table == NULL)
       return NULL;
 
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py
index 4e5d6e5577d..8f28da16df8 100644
--- a/src/mesa/main/es_generator.py
+++ b/src/mesa/main/es_generator.py
@@ -219,7 +219,6 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
 #ifndef GLAPIENTRY
 #define GLAPIENTRY GL_APIENTRY
 #endif
-#include "%sapi/glapi/glapitable.h"
 #include "%sapi/main/glapidispatch.h"
 
 #if FEATURE_remap_table
@@ -248,7 +247,7 @@ _mesa_map_static_functions_%s(void)
 #endif
 
 typedef void (*_glapi_proc)(void); /* generic function pointer */
-""" % (shortname, shortname, shortname, shortname, shortname);
+""" % (shortname, shortname, shortname, shortname);
 
 # Finally we get to the all-important functions
 print """/*************************************************************
@@ -716,7 +715,7 @@ struct _glapi_table *
 _mesa_create_exec_table_%s(void)
 {
    struct _glapi_table *exec;
-   exec = _mesa_alloc_dispatch_table(sizeof *exec);
+   exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);
    if (exec == NULL)
       return NULL;
 
-- 
2.30.2