fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed api_compat stuff, there's a better way.

Browse source 
Fixed FogCoord / SecondaryColor mix-ups in api_arrayelt.c
This commit is contained in:
Brian Paul 2002-01-14 16:06:35 +00:00
parent fe9f62ff18
commit 03c0c2e8aa
2 changed files with 90 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
src/mesa/main/api_arrayelt.c
View file

@ -1,10 +1,10 @@
/* $Id: api_arrayelt.c,v 1.5 2001/12/28 06:28:10 gareth Exp $ */
/* $Id: api_arrayelt.c,v 1.6 2002/01/14 16:06:35 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
* Version: 4.1
*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2002 Brian Paul 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"),
@ -172,38 +172,90 @@ static void (*normalfuncs[8])( const void * ) = {
(array_func)glNormal3dv,
};
static void (*fogcoordfuncs[8])( const void * );
static void (*secondarycolorfuncs[8])( const void * );
/* Wrapper functions in case glSecondaryColor*EXT doesn't exist */
static void SecondaryColor3bvEXT(const GLbyte *c)
{
_glapi_Dispatch->SecondaryColor3bvEXT(c);
}
static void SecondaryColor3ubvEXT(const GLubyte *c)
{
_glapi_Dispatch->SecondaryColor3ubvEXT(c);
}
static void SecondaryColor3svEXT(const GLshort *c)
{
_glapi_Dispatch->SecondaryColor3svEXT(c);
}
static void SecondaryColor3usvEXT(const GLushort *c)
{
_glapi_Dispatch->SecondaryColor3usvEXT(c);
}
static void SecondaryColor3ivEXT(const GLint *c)
{
_glapi_Dispatch->SecondaryColor3ivEXT(c);
}
static void SecondaryColor3uivEXT(const GLuint *c)
{
_glapi_Dispatch->SecondaryColor3uivEXT(c);
}
static void SecondaryColor3fvEXT(const GLfloat *c)
{
_glapi_Dispatch->SecondaryColor3fvEXT(c);
}
static void SecondaryColor3dvEXT(const GLdouble *c)
{
_glapi_Dispatch->SecondaryColor3dvEXT(c);
}
static void (*secondarycolorfuncs[8])( const void * ) = {
(array_func) SecondaryColor3bvEXT,
(array_func) SecondaryColor3ubvEXT,
(array_func) SecondaryColor3svEXT,
(array_func) SecondaryColor3usvEXT,
(array_func) SecondaryColor3ivEXT,
(array_func) SecondaryColor3uivEXT,
(array_func) SecondaryColor3fvEXT,
(array_func) SecondaryColor3dvEXT,
};
/* Again, wrapper functions in case glSecondaryColor*EXT doesn't exist */
static void FogCoordfvEXT(const GLfloat *f)
{
_glapi_Dispatch->FogCoordfvEXT(f);
}
static void FogCoorddvEXT(const GLdouble *f)
{
_glapi_Dispatch->FogCoorddvEXT(f);
}
static void (*fogcoordfuncs[8])( const void * ) = {
0,
0,
0,
0,
0,
0,
(array_func) FogCoordfvEXT,
(array_func) FogCoorddvEXT
};
GLboolean _ae_create_context( GLcontext *ctx )
{
static int firsttime = 1;
ctx->aelt_context = MALLOC( sizeof(AEcontext) );
if (!ctx->aelt_context)
return GL_FALSE;
if (firsttime)
{
firsttime = 0;
/* Don't really want to use api_compat.h for this, but the
* rational for using _glapi_get_proc_address is the same.
*/
fogcoordfuncs[0] = (array_func) _glapi_get_proc_address("glSecondaryColor3bvEXT");
fogcoordfuncs[1] = (array_func) _glapi_get_proc_address("glSecondaryColor3ubvEXT");
fogcoordfuncs[2] = (array_func) _glapi_get_proc_address("glSecondaryColor3svEXT");
fogcoordfuncs[3] = (array_func) _glapi_get_proc_address("glSecondaryColor3usvEXT");
fogcoordfuncs[4] = (array_func) _glapi_get_proc_address("glSecondaryColor3ivEXT");
fogcoordfuncs[5] = (array_func) _glapi_get_proc_address("glSecondaryColor3uivEXT");
fogcoordfuncs[6] = (array_func) _glapi_get_proc_address("glSecondaryColor3fvEXT");
fogcoordfuncs[7] = (array_func) _glapi_get_proc_address("glSecondaryColor3dvEXT");
secondarycolorfuncs[6] = (array_func) _glapi_get_proc_address("glFogCoordfvEXT");
secondarycolorfuncs[7] = (array_func) _glapi_get_proc_address("glFogCoorddvEXT");
}
AE_CONTEXT(ctx)->NewState = ~0;
return GL_TRUE;
}

18
src/mesa/main/api_loopback.c
View file

@ -1,10 +1,10 @@
/* $Id: api_loopback.c,v 1.14 2001/12/21 15:48:23 keithw Exp $ */
/* $Id: api_loopback.c,v 1.15 2002/01/14 16:06:35 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
* Version: 4.1
*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2002 Brian Paul 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"),
@ -29,10 +29,10 @@
#include "glheader.h"
#include "glapi.h"
#include "glapitable.h"
#include "macros.h"
#include "colormac.h"
#include "api_compat.h"
#include "api_loopback.h"
/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
@ -64,12 +64,12 @@
#define MATERIALFV(a,b,c) glMaterialfv(a,b,c)
#define RECTF(a,b,c,d) glRectf(a,b,c,d)
#define ATTRIB(index, x, y, z, w) _compat_VertexAttrib4fNV(index, x, y, z, w)
#define ATTRIB(index, x, y, z, w) _glapi_Dispatch->VertexAttrib4fNV(index, x, y, z, w)
#define FOGCOORDF(x) _compat_FogCoordfEXT(x)
#define SECONDARYCOLORUB(a,b,c) _compat_SecondaryColor3ubEXT(a,b,c)
#define SECONDARYCOLORF(a,b,c) _compat_SecondaryColor3fEXT(a,b,c)
#define FOGCOORDF(x) _glapi_Dispatch->FogCoordfEXT(x)
#define SECONDARYCOLORUB(a,b,c) _glapi_Dispatch->SecondaryColor3ubEXT(a,b,c)
#define SECONDARYCOLORF(a,b,c) _glapi_Dispatch->SecondaryColor3fEXT(a,b,c)
static void
@ -1633,6 +1633,7 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
}
void
_mesa_loopback_prefer_float( struct _glapi_table *dest,
GLboolean prefer_float_colors )
@ -1870,4 +1871,5 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest,
dest->VertexAttribs4fvNV = loopback_VertexAttribs4fvNV;
dest->VertexAttribs4dvNV = loopback_VertexAttribs4dvNV;
dest->VertexAttribs4ubvNV = loopback_VertexAttribs4ubvNV;
}