From 5a1b40acf50955d727b15dc70703a19115bb3552 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Tue, 23 Oct 2012 14:31:27 -0700 Subject: [PATCH] dispatch: Make a header to go along with querymatrix.c. This patch creates a header querymatrix.h, to allow functions defined in querymatrix.c to be used from other .c files. It also switches from the nonstandard GL_APIENTRY to GLAPIENTRY. Reviewed-by: Kenneth Graunke v2: Don't declare _mesa_Get{Integer,Float}v in querymatrix.c. Instead, just include main/get.h. Reviewed-by: Chad Versace --- src/mesa/main/querymatrix.c | 13 ++++--------- src/mesa/main/querymatrix.h | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 src/mesa/main/querymatrix.h diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index 2843d5589c9..63d1d8e26c0 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -14,8 +14,9 @@ #include #include -#include "GLES/gl.h" -#include "GLES/glext.h" +#include "glheader.h" +#include "querymatrix.h" +#include "main/get.h" /** @@ -88,13 +89,7 @@ fpclassify(double x) #endif -extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); - -/* The Mesa functions we'll need */ -extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params); -extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params); - -GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) +GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) { GLfloat matrix[16]; GLint tmp; diff --git a/src/mesa/main/querymatrix.h b/src/mesa/main/querymatrix.h new file mode 100644 index 00000000000..37a22e961e6 --- /dev/null +++ b/src/mesa/main/querymatrix.h @@ -0,0 +1,39 @@ +/* + * Copyright © 2012 Intel Corporation + * + * 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL + * 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. + */ + +#ifndef QUERYMATRIX_H +#define QUERYMATRIX_H + + +#include "mfeatures.h" +#include "mtypes.h" + + +/* + * API functions + */ + +extern GLbitfield GLAPIENTRY +_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); + +#endif -- 2.30.2