projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Unindent the body of intelDestroyContext.
[mesa.git]
/
src
/
mesa
/
main
/
es1_conversion.c
diff --git
a/src/mesa/main/es1_conversion.c
b/src/mesa/main/es1_conversion.c
index ae3c5badce4c419eab0a2c55db52309dbc3981eb..60a60e287d96278a0f2302fe38c4995980a143b7 100644
(file)
--- a/
src/mesa/main/es1_conversion.c
+++ b/
src/mesa/main/es1_conversion.c
@@
-1,7
+1,4
@@
#include <stdbool.h>
#include <stdbool.h>
-#include "main/mfeatures.h"
-
-#if FEATURE_ES1
#include "api_loopback.h"
#include "api_exec.h"
#include "api_loopback.h"
#include "api_exec.h"
@@
-29,20
+26,16
@@
#include "main/drawtex.h"
#include "vbo/vbo.h"
#include "main/drawtex.h"
#include "vbo/vbo.h"
-#ifndef GL_APIENTRY
-#define GL_APIENTRY GLAPIENTRY
-#endif
-
#include "main/es1_conversion.h"
void GL_APIENTRY
#include "main/es1_conversion.h"
void GL_APIENTRY
-_
es
_AlphaFuncx(GLenum func, GLclampx ref)
+_
mesa
_AlphaFuncx(GLenum func, GLclampx ref)
{
_mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
}
void GL_APIENTRY
{
_mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
}
void GL_APIENTRY
-_
es
_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
+_
mesa
_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
{
_mesa_ClearColor((GLclampf) (red / 65536.0f),
(GLclampf) (green / 65536.0f),
{
_mesa_ClearColor((GLclampf) (red / 65536.0f),
(GLclampf) (green / 65536.0f),
@@
-51,13
+44,13
@@
_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_ClearDepthx(GLclampx depth)
+_
mesa
_ClearDepthx(GLclampx depth)
{
_mesa_ClearDepthf((GLclampf) (depth / 65536.0f));
}
void GL_APIENTRY
{
_mesa_ClearDepthf((GLclampf) (depth / 65536.0f));
}
void GL_APIENTRY
-_
es
_ClipPlanef(GLenum plane, const GLfloat *equation)
+_
mesa
_ClipPlanef(GLenum plane, const GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
{
unsigned int i;
GLdouble converted_equation[4];
@@
-70,7
+63,7
@@
_es_ClipPlanef(GLenum plane, const GLfloat *equation)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_ClipPlanex(GLenum plane, const GLfixed *equation)
+_
mesa
_ClipPlanex(GLenum plane, const GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
{
unsigned int i;
GLdouble converted_equation[4];
@@
-92,7
+85,7
@@
_es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
+_
mesa
_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
{
_es_Color4f((GLfloat) (red / 65536.0f),
(GLfloat) (green / 65536.0f),
{
_es_Color4f((GLfloat) (red / 65536.0f),
(GLfloat) (green / 65536.0f),
@@
-101,17
+94,17
@@
_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_DepthRangex(GLclampx zNear, GLclampx zFar)
+_
mesa
_DepthRangex(GLclampx zNear, GLclampx zFar)
{
_mesa_DepthRangef((GLclampf) (zNear / 65536.0f),
(GLclampf) (zFar / 65536.0f));
}
void GL_APIENTRY
{
_mesa_DepthRangef((GLclampf) (zNear / 65536.0f),
(GLclampf) (zFar / 65536.0f));
}
void GL_APIENTRY
-_
es
_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
+_
mesa
_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
{
{
- _mesa_DrawTexf((GLfloat) (x / 65536.0f),
+ _mesa_DrawTexf
OES
((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f),
(GLfloat) (w / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f),
(GLfloat) (w / 65536.0f),
@@
-119,7
+112,7
@@
_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_DrawTexxvOES(const GLfixed *coords)
+_
mesa
_DrawTexxvOES(const GLfixed *coords)
{
unsigned int i;
GLfloat converted_coords[5];
{
unsigned int i;
GLfloat converted_coords[5];
@@
-128,11
+121,11
@@
_es_DrawTexxvOES(const GLfixed *coords)
converted_coords[i] = (GLfloat) (coords[i] / 65536.0f);
}
converted_coords[i] = (GLfloat) (coords[i] / 65536.0f);
}
- _mesa_DrawTexfv(converted_coords);
+ _mesa_DrawTexfv
OES
(converted_coords);
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Fogx(GLenum pname, GLfixed param)
+_
mesa
_Fogx(GLenum pname, GLfixed param)
{
if (pname != GL_FOG_MODE) {
_mesa_Fogf(pname, (GLfloat) (param / 65536.0f));
{
if (pname != GL_FOG_MODE) {
_mesa_Fogf(pname, (GLfloat) (param / 65536.0f));
@@
-143,7
+136,7
@@
_es_Fogx(GLenum pname, GLfixed param)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Fogxv(GLenum pname, const GLfixed *params)
+_
mesa
_Fogxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-183,7
+176,7
@@
_es_Fogxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_
mesa
_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Frustum((GLdouble) (left),
GLfloat zNear, GLfloat zFar)
{
_mesa_Frustum((GLdouble) (left),
@@
-195,7
+188,7
@@
_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_
mesa
_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Frustum((GLdouble) (left / 65536.0),
GLfixed zNear, GLfixed zFar)
{
_mesa_Frustum((GLdouble) (left / 65536.0),
@@
-207,7
+200,7
@@
_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_GetClipPlanef(GLenum plane, GLfloat *equation)
+_
mesa
_GetClipPlanef(GLenum plane, GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
{
unsigned int i;
GLdouble converted_equation[4];
@@
-219,7
+212,7
@@
_es_GetClipPlanef(GLenum plane, GLfloat *equation)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_GetClipPlanex(GLenum plane, GLfixed *equation)
+_
mesa
_GetClipPlanex(GLenum plane, GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
{
unsigned int i;
GLdouble converted_equation[4];
@@
-231,7
+224,7
@@
_es_GetClipPlanex(GLenum plane, GLfixed *equation)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
+_
mesa
_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-272,7
+265,7
@@
_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
+_
mesa
_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-310,7
+303,7
@@
_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
+_
mesa
_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-402,13
+395,13
@@
_check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
check
_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
+_
mesa
_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
{
_mesa_GetTexGeniv(coord, pname, (GLint *) params);
}
void GL_APIENTRY
{
_mesa_GetTexGeniv(coord, pname, (GLint *) params);
}
void GL_APIENTRY
-_
es
_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
+_
mesa
_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-456,13
+449,13
@@
_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_LightModelx(GLenum pname, GLfixed param)
+_
mesa
_LightModelx(GLenum pname, GLfixed param)
{
_mesa_LightModelf(pname, (GLfloat) param);
}
void GL_APIENTRY
{
_mesa_LightModelf(pname, (GLfloat) param);
}
void GL_APIENTRY
-_
es
_LightModelxv(GLenum pname, const GLfixed *params)
+_
mesa
_LightModelxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-497,13
+490,13
@@
_es_LightModelxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Lightx(GLenum light, GLenum pname, GLfixed param)
+_
mesa
_Lightx(GLenum light, GLenum pname, GLfixed param)
{
_mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
{
_mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
-_
es
_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
+_
mesa
_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-545,13
+538,13
@@
_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_LineWidthx(GLfixed width)
+_
mesa
_LineWidthx(GLfixed width)
{
_mesa_LineWidth((GLfloat) (width / 65536.0f));
}
void GL_APIENTRY
{
_mesa_LineWidth((GLfloat) (width / 65536.0f));
}
void GL_APIENTRY
-_
es
_LoadMatrixx(const GLfixed *m)
+_
mesa
_LoadMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
{
unsigned int i;
GLfloat converted_m[16];
@@
-564,7
+557,7
@@
_es_LoadMatrixx(const GLfixed *m)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Materialx(GLenum face, GLenum pname, GLfixed param)
+_
mesa
_Materialx(GLenum face, GLenum pname, GLfixed param)
{
if (face != GL_FRONT_AND_BACK) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
{
if (face != GL_FRONT_AND_BACK) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
@@
-582,7
+575,7
@@
_es_Materialx(GLenum face, GLenum pname, GLfixed param)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
+_
mesa
_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-619,7
+612,7
@@
_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_MultMatrixx(const GLfixed *m)
+_
mesa
_MultMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
{
unsigned int i;
GLfloat converted_m[16];
@@
-632,7
+625,7
@@
_es_MultMatrixx(const GLfixed *m)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
+_
mesa
_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
{
_es_MultiTexCoord4f(texture,
(GLfloat) (s / 65536.0f),
{
_es_MultiTexCoord4f(texture,
(GLfloat) (s / 65536.0f),
@@
-642,7
+635,7
@@
_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
+_
mesa
_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
{
_es_Normal3f((GLfloat) (nx / 65536.0f),
(GLfloat) (ny / 65536.0f),
{
_es_Normal3f((GLfloat) (nx / 65536.0f),
(GLfloat) (ny / 65536.0f),
@@
-650,7
+643,7
@@
_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_
mesa
_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Ortho((GLdouble) (left),
GLfloat zNear, GLfloat zFar)
{
_mesa_Ortho((GLdouble) (left),
@@
-662,7
+655,7
@@
_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_
mesa
_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Ortho((GLdouble) (left / 65536.0),
GLfixed zNear, GLfixed zFar)
{
_mesa_Ortho((GLdouble) (left / 65536.0),
@@
-674,13
+667,13
@@
_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_PointParameterx(GLenum pname, GLfixed param)
+_
mesa
_PointParameterx(GLenum pname, GLfixed param)
{
_mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
{
_mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
-_
es
_PointParameterxv(GLenum pname, const GLfixed *params)
+_
mesa
_PointParameterxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 3;
{
unsigned int i;
unsigned int n_params = 3;
@@
-709,20
+702,20
@@
_es_PointParameterxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_PointSizex(GLfixed size)
+_
mesa
_PointSizex(GLfixed size)
{
_mesa_PointSize((GLfloat) (size / 65536.0f));
}
void GL_APIENTRY
{
_mesa_PointSize((GLfloat) (size / 65536.0f));
}
void GL_APIENTRY
-_
es
_PolygonOffsetx(GLfixed factor, GLfixed units)
+_
mesa
_PolygonOffsetx(GLfixed factor, GLfixed units)
{
_mesa_PolygonOffset((GLfloat) (factor / 65536.0f),
(GLfloat) (units / 65536.0f));
}
void GL_APIENTRY
{
_mesa_PolygonOffset((GLfloat) (factor / 65536.0f),
(GLfloat) (units / 65536.0f));
}
void GL_APIENTRY
-_
es
_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
+_
mesa
_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Rotatef((GLfloat) (angle / 65536.0f),
(GLfloat) (x / 65536.0f),
{
_mesa_Rotatef((GLfloat) (angle / 65536.0f),
(GLfloat) (x / 65536.0f),
@@
-731,14
+724,14
@@
_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_SampleCoveragex(GLclampx value, GLboolean invert)
+_
mesa
_SampleCoveragex(GLclampx value, GLboolean invert)
{
{
- _mesa_SampleCoverage
ARB
((GLclampf) (value / 65536.0f),
+ _mesa_SampleCoverage((GLclampf) (value / 65536.0f),
invert);
}
void GL_APIENTRY
invert);
}
void GL_APIENTRY
-_
es
_Scalex(GLfixed x, GLfixed y, GLfixed z)
+_
mesa
_Scalex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Scalef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
{
_mesa_Scalef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
@@
-746,7
+739,7
@@
_es_Scalex(GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_TexEnvx(GLenum target, GLenum pname, GLfixed param)
+_
mesa
_TexEnvx(GLenum target, GLenum pname, GLfixed param)
{
switch(target) {
case GL_POINT_SPRITE:
{
switch(target) {
case GL_POINT_SPRITE:
@@
-791,7
+784,7
@@
_es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
+_
mesa
_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
{
switch(target) {
case GL_POINT_SPRITE:
{
switch(target) {
case GL_POINT_SPRITE:
@@
-859,19
+852,19
@@
_check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
check
_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
+_
mesa
_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
{
_es_TexGenf(coord, pname, (GLfloat) param);
}
void GL_APIENTRY
{
_es_TexGenf(coord, pname, (GLfloat) param);
}
void GL_APIENTRY
-_
check
_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
+_
mesa
_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
{
_es_TexGenf(coord, pname, (GLfloat) params[0]);
}
void GL_APIENTRY
{
_es_TexGenf(coord, pname, (GLfloat) params[0]);
}
void GL_APIENTRY
-_
es
_TexParameterx(GLenum target, GLenum pname, GLfixed param)
+_
mesa
_TexParameterx(GLenum target, GLenum pname, GLfixed param)
{
if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
_mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
{
if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
_mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
@@
-881,7
+874,7
@@
_es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
+_
mesa
_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
{
unsigned int i;
unsigned int n_params = 4;
@@
-936,11
+929,9
@@
_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
}
void GL_APIENTRY
-_
es
_Translatex(GLfixed x, GLfixed y, GLfixed z)
+_
mesa
_Translatex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Translatef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f));
}
{
_mesa_Translatef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f));
}
-
-#endif /* FEATURE_ES1 */