[Mesa-dev] [PATCH 1/2] mesa: include dispatch.h less

Marek Olšák maraeo at gmail.com
Wed Apr 11 20:09:41 UTC 2018


From: Marek Olšák <marek.olsak at amd.com>

---
 src/mesa/main/accum.c             | 1 -
 src/mesa/main/arrayobj.c          | 1 -
 src/mesa/main/atifragshader.c     | 1 -
 src/mesa/main/attrib.c            | 1 -
 src/mesa/main/colortab.c          | 1 -
 src/mesa/main/convolve.c          | 1 -
 src/mesa/main/debug_output.c      | 1 -
 src/mesa/main/drawpix.c           | 1 -
 src/mesa/main/feedback.c          | 1 -
 src/mesa/main/histogram.c         | 1 -
 src/mesa/main/pipelineobj.c       | 1 -
 src/mesa/main/pixel.c             | 1 -
 src/mesa/main/queryobj.c          | 1 -
 src/mesa/main/rastpos.c           | 1 -
 src/mesa/main/samplerobj.c        | 1 -
 src/mesa/main/shaderapi.c         | 1 -
 src/mesa/main/syncobj.c           | 1 -
 src/mesa/main/texgen.c            | 1 -
 src/mesa/main/transformfeedback.c | 1 -
 src/mesa/main/uniforms.c          | 1 -
 20 files changed, 20 deletions(-)

diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 5fbee8fbdbd..f5ac8a10270 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -26,21 +26,20 @@
 #include "accum.h"
 #include "condrender.h"
 #include "context.h"
 #include "format_unpack.h"
 #include "format_pack.h"
 #include "framebuffer.h"
 #include "imports.h"
 #include "macros.h"
 #include "state.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 
 
 void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
 {
    GLfloat tmp[4];
    GET_CURRENT_CONTEXT(ctx);
 
    tmp[0] = CLAMP( red,   -1.0F, 1.0F );
    tmp[1] = CLAMP( green, -1.0F, 1.0F );
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 0d2f7a918ac..899d4dec01c 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -44,21 +44,20 @@
 #include "hash.h"
 #include "image.h"
 #include "imports.h"
 #include "context.h"
 #include "bufferobj.h"
 #include "arrayobj.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "state.h"
 #include "varray.h"
-#include "main/dispatch.h"
 #include "util/bitscan.h"
 #include "util/u_atomic.h"
 
 
 const GLubyte
 _mesa_vao_attribute_map[ATTRIBUTE_MAP_MODE_MAX][VERT_ATTRIB_MAX] =
 {
    /* ATTRIBUTE_MAP_MODE_IDENTITY
     *
     * Grab vertex processing attribute VERT_ATTRIB_POS from
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index 6b636f1dc74..a9356ae95b1 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -21,21 +21,20 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/hash.h"
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/mtypes.h"
-#include "main/dispatch.h"
 #include "main/atifragshader.h"
 #include "program/program.h"
 
 #define MESA_DEBUG_ATI_FS 0
 
 static struct ati_fragment_shader DummyShader;
 
 
 /**
  * Allocate and initialize a new ATI fragment shader object.
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 9c632ffb51d..9f0e7161f3e 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -49,21 +49,20 @@
 #include "scissor.h"
 #include "stencil.h"
 #include "texenv.h"
 #include "texgen.h"
 #include "texobj.h"
 #include "texparam.h"
 #include "texstate.h"
 #include "varray.h"
 #include "viewport.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 #include "state.h"
 #include "hash.h"
 #include <stdbool.h>
 
 
 /**
  * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).
  */
 struct gl_enable_attrib
 {
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index a8edb03dd0e..e8df73a0b83 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -28,21 +28,20 @@
 #include "colortab.h"
 #include "context.h"
 #include "image.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "pack.h"
 #include "pbo.h"
 #include "state.h"
 #include "teximage.h"
 #include "texstate.h"
-#include "main/dispatch.h"
 
 
 void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalFormat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *data )
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable");
 }
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 83d590f4a48..e2c355c4f41 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -27,21 +27,20 @@
  * Image convolution functions.
  *
  * Notes: filter kernel elements are indexed by <n> and <m> as in
  * the GL spec.
  */
 
 
 #include "glheader.h"
 #include "context.h"
 #include "convolve.h"
-#include "main/dispatch.h"
 
 
 void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
    GET_CURRENT_CONTEXT(ctx);
 
    _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter1D");
 }
 
diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c
index 859e1f966d2..3d6cc18c2fa 100644
--- a/src/mesa/main/debug_output.c
+++ b/src/mesa/main/debug_output.c
@@ -20,21 +20,20 @@
  * 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.
  */
 
 
 #include <stdarg.h>
 #include <stdio.h>
 #include "context.h"
 #include "debug_output.h"
-#include "dispatch.h"
 #include "enums.h"
 #include "imports.h"
 #include "hash.h"
 #include "mtypes.h"
 #include "version.h"
 #include "util/hash_table.h"
 #include "util/simple_list.h"
 
 
 static simple_mtx_t DynamicIDMutex = _SIMPLE_MTX_INITIALIZER_NP;
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index ec1d2618cad..4bf14fc4f28 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -27,21 +27,20 @@
 #include "api_validate.h"
 #include "bufferobj.h"
 #include "context.h"
 #include "drawpix.h"
 #include "enums.h"
 #include "feedback.h"
 #include "framebuffer.h"
 #include "image.h"
 #include "pbo.h"
 #include "state.h"
-#include "dispatch.h"
 #include "glformats.h"
 #include "fbobject.h"
 
 
 /*
  * Execute glDrawPixels
  */
 void GLAPIENTRY
 _mesa_DrawPixels( GLsizei width, GLsizei height,
                   GLenum format, GLenum type, const GLvoid *pixels )
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 699e2a855a3..65f4c35d94e 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -28,21 +28,20 @@
  * Selection and feedback modes functions.
  */
 
 
 #include "glheader.h"
 #include "context.h"
 #include "enums.h"
 #include "feedback.h"
 #include "macros.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 
 
 #define FB_3D		0x01
 #define FB_4D		0x02
 #define FB_COLOR	0x04
 #define FB_TEXTURE	0X08
 
 
 
 void GLAPIENTRY
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 5759763d4b3..5696f548c9b 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -19,21 +19,20 @@
  * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 
 #include "glheader.h"
 #include "context.h"
 #include "histogram.h"
-#include "main/dispatch.h"
 
 
 /**********************************************************************
  * API functions
  */
 
 
 void GLAPIENTRY
 _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format,
                     GLenum type, GLsizei bufSize, GLvoid *values)
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 438f75bc74f..b4ca14d7257 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -27,21 +27,20 @@
  * \file pipelineobj.c
  * \author Hainaut Gregory <gregory.hainaut at gmail.com>
  *
  * Implementation of pipeline object related API functions. Based on
  * GL_ARB_separate_shader_objects extension.
  */
 
 #include <stdbool.h>
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/dispatch.h"
 #include "main/enums.h"
 #include "main/hash.h"
 #include "main/mtypes.h"
 #include "main/pipelineobj.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/state.h"
 #include "main/transformfeedback.h"
 #include "main/uniforms.h"
 #include "compiler/glsl/glsl_parser_extras.h"
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index a9a14df0e30..b234bacd9b6 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -28,21 +28,20 @@
  * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer)
  */
 
 #include "glheader.h"
 #include "bufferobj.h"
 #include "context.h"
 #include "macros.h"
 #include "pixel.h"
 #include "pbo.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 
 
 /**********************************************************************/
 /*****                    glPixelZoom                             *****/
 /**********************************************************************/
 
 void GLAPIENTRY
 _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 79600d7db19..7ee820aefd1 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -24,21 +24,20 @@
 
 
 #include "bufferobj.h"
 #include "glheader.h"
 #include "context.h"
 #include "enums.h"
 #include "hash.h"
 #include "imports.h"
 #include "queryobj.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 
 
 /**
  * Allocate a new query object.  This is a fallback routine called via
  * ctx->Driver.NewQueryObject().
  * \param ctx - rendering context
  * \param id - the new object's ID
  * \return pointer to new query_object object or NULL if out of memory.
  */
 static struct gl_query_object *
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index dd1042fc8c2..1ca83c78b0a 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -28,21 +28,20 @@
  * Raster position operations.
  */
 
 #include "glheader.h"
 #include "context.h"
 #include "feedback.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "rastpos.h"
 #include "state.h"
-#include "main/dispatch.h"
 #include "main/viewport.h"
 #include "util/bitscan.h"
 
 
 
 /**
  * Clip a point against the view volume.
  *
  * \param v vertex vector describing the point to clip.
  *
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 5ebf9e24f94..6656cf5022a 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -25,21 +25,20 @@
 
 /**
  * \file samplerobj.c
  * \brief Functions for the GL_ARB_sampler_objects extension.
  * \author Brian Paul
  */
 
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/dispatch.h"
 #include "main/enums.h"
 #include "main/hash.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/samplerobj.h"
 #include "main/texturebindless.h"
 
 
 struct gl_sampler_object *
 _mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 76bad7f31ea..44b18af4927 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -34,21 +34,20 @@
  * XXX things to do:
  * 1. Check that the right error code is generated for all _mesa_error() calls.
  * 2. Insert FLUSH_VERTICES calls in various places
  */
 
 
 #include <stdbool.h>
 #include <c99_alloca.h>
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/dispatch.h"
 #include "main/enums.h"
 #include "main/glspirv.h"
 #include "main/hash.h"
 #include "main/mtypes.h"
 #include "main/pipelineobj.h"
 #include "main/program_binary.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/state.h"
 #include "main/transformfeedback.h"
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index c38a5707ddb..736f043f90c 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -54,21 +54,20 @@
  *
  * \author Ian Romanick <ian.d.romanick at intel.com>
  */
 
 #include <inttypes.h>
 #include "glheader.h"
 #include "imports.h"
 #include "context.h"
 #include "macros.h"
 #include "get.h"
-#include "dispatch.h"
 #include "mtypes.h"
 #include "util/hash_table.h"
 #include "util/set.h"
 
 #include "syncobj.h"
 
 static struct gl_sync_object *
 _mesa_new_sync_object(struct gl_context *ctx)
 {
    struct gl_sync_object *s = CALLOC_STRUCT(gl_sync_object);
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index 45f86fd911f..4eb2f60464a 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -30,21 +30,20 @@
  */
 
 
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/macros.h"
 #include "main/texgen.h"
 #include "main/texstate.h"
 #include "math/m_matrix.h"
-#include "main/dispatch.h"
 
 
 /**
  * Return texgen state for given coordinate
  */
 static struct gl_texgen *
 get_texgen(struct gl_context *ctx, struct gl_fixedfunc_texture_unit *texUnit,
            GLenum coord)
 {
    if (ctx->API == API_OPENGLES) {
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index e4cc1db5e5b..a46c9f94bca 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -32,21 +32,20 @@
 
 
 #include "buffers.h"
 #include "context.h"
 #include "hash.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "transformfeedback.h"
 #include "shaderapi.h"
 #include "shaderobj.h"
-#include "main/dispatch.h"
 
 #include "program/prog_parameter.h"
 
 struct using_program_tuple
 {
    struct gl_program *prog;
    bool found;
 };
 
 static void
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 64124e2d59d..3b7249aabb5 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -31,21 +31,20 @@
  */
 
 /**
  * XXX things to do:
  * 1. Check that the right error code is generated for all _mesa_error() calls.
  * 2. Insert FLUSH_VERTICES calls in various places
  */
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/dispatch.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
 #include "main/enums.h"
 #include "compiler/glsl/ir_uniform.h"
 #include "compiler/glsl_types.h"
 #include "program/program.h"
 #include "util/bitscan.h"
 
 /**
-- 
2.15.1



More information about the mesa-dev mailing list