-/* $Id: dlist.c,v 1.27 2000/02/02 19:17:57 brianp Exp $ */
+/* $Id: dlist.c,v 1.36 2000/03/21 17:42:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
#include "attrib.h"
#include "bitmap.h"
#include "bbox.h"
+#include "blend.h"
#include "buffers.h"
#include "clip.h"
#include "colortab.h"
#include "copypix.h"
#include "cva.h"
#include "depth.h"
-#include "dispatch.h"
#include "enable.h"
#include "enums.h"
#include "eval.h"
n[2].f = value;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Accum)( op, value );
+ (*ctx->Exec->Accum)( op, value );
}
}
n[2].f = (GLfloat) ref;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.AlphaFunc)( func, ref );
+ (*ctx->Exec->AlphaFunc)( func, ref );
}
}
n[2].ui = texture;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.BindTexture)( target, texture );
+ (*ctx->Exec->BindTexture)( target, texture );
}
}
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Bitmap)( width, height,
+ (*ctx->Exec->Bitmap)( width, height,
xorig, yorig, xmove, ymove, pixels );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.BlendEquationEXT)( mode );
+ (*ctx->Exec->BlendEquation)( mode );
}
}
n[2].e = dfactor;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.BlendFunc)( sfactor, dfactor );
+ (*ctx->Exec->BlendFunc)( sfactor, dfactor );
}
}
-static void save_BlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB,
- GLenum sfactorA, GLenum dfactorA)
+static void save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
+ GLenum sfactorA, GLenum dfactorA)
{
GET_CURRENT_CONTEXT(ctx);
Node *n;
n[4].e = dfactorA;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.BlendFuncSeparateINGR)( sfactorRGB, dfactorRGB,
+ (*ctx->Exec->BlendFuncSeparateEXT)( sfactorRGB, dfactorRGB,
sfactorA, dfactorA);
}
}
n[4].f = alpha;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.BlendColorEXT)( red, green, blue, alpha );
+ (*ctx->Exec->BlendColor)( red, green, blue, alpha );
}
}
n[1].ui = list;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CallList)( list );
+ (*ctx->Exec->CallList)( list );
}
}
}
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CallLists)( n, type, lists );
+ (*ctx->Exec->CallLists)( n, type, lists );
}
}
n[1].bf = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Clear)( mask );
+ (*ctx->Exec->Clear)( mask );
}
}
n[4].f = alpha;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClearAccum)( red, green, blue, alpha );
+ (*ctx->Exec->ClearAccum)( red, green, blue, alpha );
}
}
n[4].f = alpha;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClearColor)( red, green, blue, alpha );
+ (*ctx->Exec->ClearColor)( red, green, blue, alpha );
}
}
n[1].f = (GLfloat) depth;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClearDepth)( depth );
+ (*ctx->Exec->ClearDepth)( depth );
}
}
n[1].f = c;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClearIndex)( c );
+ (*ctx->Exec->ClearIndex)( c );
}
}
n[1].i = s;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClearStencil)( s );
+ (*ctx->Exec->ClearStencil)( s );
}
}
n[5].f = equ[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClipPlane)( plane, equ );
+ (*ctx->Exec->ClipPlane)( plane, equ );
}
}
n[4].b = alpha;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ColorMask)( red, green, blue, alpha );
+ (*ctx->Exec->ColorMask)( red, green, blue, alpha );
}
}
n[2].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ColorMaterial)( face, mode );
+ (*ctx->Exec->ColorMaterial)( face, mode );
}
}
-static void save_ColorTableEXT( GLenum target, GLenum internalFormat,
- GLsizei width, GLenum format, GLenum type,
- const GLvoid *table )
+static void save_ColorTable( GLenum target, GLenum internalFormat,
+ GLsizei width, GLenum format, GLenum type,
+ const GLvoid *table )
{
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_1D ||
target == GL_PROXY_TEXTURE_2D ||
target == GL_PROXY_TEXTURE_3D) {
/* execute immediately */
- (*ctx->Exec.ColorTableEXT)( target, internalFormat, width,
- format, type, table );
+ (*ctx->Exec->ColorTable)( target, internalFormat, width,
+ format, type, table );
}
else {
GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, table,
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ColorTableEXT)( target, internalFormat, width,
- format, type, table );
+ (*ctx->Exec->ColorTable)( target, internalFormat, width,
+ format, type, table );
}
}
}
-static void save_ColorSubTableEXT( GLenum target, GLsizei start, GLsizei count,
- GLenum format, GLenum type,
- const GLvoid *table)
+static void save_ColorSubTable( GLenum target, GLsizei start, GLsizei count,
+ GLenum format, GLenum type,
+ const GLvoid *table)
{
GET_CURRENT_CONTEXT(ctx);
GLvoid *image = _mesa_unpack_image(count, 1, 1, format, type, table,
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ColorSubTableEXT)(target, start, count, format, type, table);
+ (*ctx->Exec->ColorSubTable)(target, start, count, format, type, table);
}
}
n[5].e = type;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyPixels)( x, y, width, height, type );
+ (*ctx->Exec->CopyPixels)( x, y, width, height, type );
}
}
n[7].i = border;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyTexImage1D)( target, level, internalformat,
+ (*ctx->Exec->CopyTexImage1D)( target, level, internalformat,
x, y, width, border );
}
}
n[8].i = border;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyTexImage2D)( target, level, internalformat,
+ (*ctx->Exec->CopyTexImage2D)( target, level, internalformat,
x, y, width, height, border );
}
}
n[6].i = width;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyTexSubImage1D)( target, level, xoffset, x, y, width );
+ (*ctx->Exec->CopyTexSubImage1D)( target, level, xoffset, x, y, width );
}
}
n[8].i = height;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyTexSubImage2D)( target, level, xoffset, yoffset,
+ (*ctx->Exec->CopyTexSubImage2D)( target, level, xoffset, yoffset,
x, y, width, height );
}
}
n[9].i = height;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CopyTexSubImage3D)( target, level,
+ (*ctx->Exec->CopyTexSubImage3D)( target, level,
xoffset, yoffset, zoffset,
x, y, width, height );
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.CullFace)( mode );
+ (*ctx->Exec->CullFace)( mode );
}
}
n[1].e = func;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.DepthFunc)( func );
+ (*ctx->Exec->DepthFunc)( func );
}
}
n[1].b = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.DepthMask)( mask );
+ (*ctx->Exec->DepthMask)( mask );
}
}
n[2].f = (GLfloat) farval;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.DepthRange)( nearval, farval );
+ (*ctx->Exec->DepthRange)( nearval, farval );
}
}
n[1].e = cap;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Disable)( cap );
+ (*ctx->Exec->Disable)( cap );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.DrawBuffer)( mode );
+ (*ctx->Exec->DrawBuffer)( mode );
}
}
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.DrawPixels)( width, height, format, type, pixels );
+ (*ctx->Exec->DrawPixels)( width, height, format, type, pixels );
}
}
n[1].e = cap;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Enable)( cap );
+ (*ctx->Exec->Enable)( cap );
}
}
n[3].i = i2;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.EvalMesh1)( mode, i1, i2 );
+ (*ctx->Exec->EvalMesh1)( mode, i1, i2 );
}
}
n[5].i = j2;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.EvalMesh2)( mode, i1, i2, j1, j2 );
+ (*ctx->Exec->EvalMesh2)( mode, i1, i2, j1, j2 );
}
}
n[5].f = params[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Fogfv)( pname, params );
+ (*ctx->Exec->Fogfv)( pname, params );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.FrontFace)( mode );
+ (*ctx->Exec->FrontFace)( mode );
}
}
n[6].f = farval;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Frustum)( left, right, bottom, top, nearval, farval );
+ (*ctx->Exec->Frustum)( left, right, bottom, top, nearval, farval );
}
}
n[2].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Hint)( target, mode );
+ (*ctx->Exec->Hint)( target, mode );
}
}
n[2].i = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.HintPGI)( target, mode );
+ (*ctx->Exec->HintPGI)( target, mode );
}
}
n[1].ui = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.IndexMask)( mask );
+ (*ctx->Exec->IndexMask)( mask );
}
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_INIT_NAMES, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.InitNames)();
+ (*ctx->Exec->InitNames)();
}
}
}
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Lightfv)( light, pname, params );
+ (*ctx->Exec->Lightfv)( light, pname, params );
}
}
n[5].f = params[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LightModelfv)( pname, params );
+ (*ctx->Exec->LightModelfv)( pname, params );
}
}
n[2].us = pattern;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LineStipple)( factor, pattern );
+ (*ctx->Exec->LineStipple)( factor, pattern );
}
}
n[1].f = width;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LineWidth)( width );
+ (*ctx->Exec->LineWidth)( width );
}
}
n[1].ui = base;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ListBase)( base );
+ (*ctx->Exec->ListBase)( base );
}
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_LOAD_IDENTITY, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LoadIdentity)();
+ (*ctx->Exec->LoadIdentity)();
}
}
}
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LoadMatrixf)( m );
+ (*ctx->Exec->LoadMatrixf)( m );
}
}
n[1].ui = name;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LoadName)( name );
+ (*ctx->Exec->LoadName)( name );
}
}
n[1].e = opcode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.LogicOp)( opcode );
+ (*ctx->Exec->LogicOp)( opcode );
}
}
n[6].data = (void *) pnts;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Map1d)( target, u1, u2, stride, order, points );
+ (*ctx->Exec->Map1d)( target, u1, u2, stride, order, points );
}
}
n[6].data = (void *) pnts;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Map1f)( target, u1, u2, stride, order, points );
+ (*ctx->Exec->Map1f)( target, u1, u2, stride, order, points );
}
}
n[10].data = (void *) pnts;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Map2d)( target,
+ (*ctx->Exec->Map2d)( target,
u1, u2, ustride, uorder,
v1, v2, vstride, vorder, points );
}
n[10].data = (void *) pnts;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Map2f)( target, u1, u2, ustride, uorder,
+ (*ctx->Exec->Map2f)( target, u1, u2, ustride, uorder,
v1, v2, vstride, vorder, points );
}
}
n[3].f = u2;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.MapGrid1f)( un, u1, u2 );
+ (*ctx->Exec->MapGrid1f)( un, u1, u2 );
}
}
n[6].f = v2;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.MapGrid2f)( un, u1, u2, vn, v1, v2 );
+ (*ctx->Exec->MapGrid2f)( un, u1, u2, vn, v1, v2 );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.MatrixMode)( mode );
+ (*ctx->Exec->MatrixMode)( mode );
}
}
}
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.MultMatrixf)( m );
+ (*ctx->Exec->MultMatrixf)( m );
}
}
n[6].f = farval;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Ortho)( left, right, bottom, top, nearval, farval );
+ (*ctx->Exec->Ortho)( left, right, bottom, top, nearval, farval );
}
}
MEMCPY( n[3].data, (void *) values, mapsize * sizeof(GLfloat) );
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PixelMapfv)( map, mapsize, values );
+ (*ctx->Exec->PixelMapfv)( map, mapsize, values );
}
}
n[2].f = param;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PixelTransferf)( pname, param );
+ (*ctx->Exec->PixelTransferf)( pname, param );
}
}
n[2].f = yfactor;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PixelZoom)( xfactor, yfactor );
+ (*ctx->Exec->PixelZoom)( xfactor, yfactor );
}
}
n[4].f = params[2];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PointParameterfvEXT)( pname, params );
+ (*ctx->Exec->PointParameterfvEXT)( pname, params );
}
}
n[1].f = size;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PointSize)( size );
+ (*ctx->Exec->PointSize)( size );
}
}
n[2].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PolygonMode)( face, mode );
+ (*ctx->Exec->PolygonMode)( face, mode );
}
}
MEMCPY( data, pattern, 32 * 4 );
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PolygonStipple)( (GLubyte*) pattern );
+ (*ctx->Exec->PolygonStipple)( (GLubyte*) pattern );
}
}
n[2].f = units;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PolygonOffset)( factor, units );
+ (*ctx->Exec->PolygonOffset)( factor, units );
}
}
static void save_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
{
- save_PolygonOffset(factor, DEPTH_SCALE * bias);
+ GET_CURRENT_CONTEXT(ctx);
+ save_PolygonOffset(factor, ctx->Visual->DepthMaxF * bias);
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_POP_ATTRIB, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PopAttrib)();
+ (*ctx->Exec->PopAttrib)();
}
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_POP_MATRIX, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PopMatrix)();
+ (*ctx->Exec->PopMatrix)();
}
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_POP_NAME, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PopName)();
+ (*ctx->Exec->PopName)();
}
}
}
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PrioritizeTextures)( num, textures, priorities );
+ (*ctx->Exec->PrioritizeTextures)( num, textures, priorities );
}
}
n[1].bf = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PushAttrib)( mask );
+ (*ctx->Exec->PushAttrib)( mask );
}
}
FLUSH_VB(ctx, "dlist");
(void) alloc_instruction( ctx, OPCODE_PUSH_MATRIX, 0 );
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PushMatrix)();
+ (*ctx->Exec->PushMatrix)();
}
}
n[1].ui = name;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PushName)( name );
+ (*ctx->Exec->PushName)( name );
}
}
n[4].f = w;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.RasterPos4f)( x, y, z, w );
+ (*ctx->Exec->RasterPos4f)( x, y, z, w );
}
}
n[1].f = token;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.PassThrough)( token );
+ (*ctx->Exec->PassThrough)( token );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ReadBuffer)( mode );
+ (*ctx->Exec->ReadBuffer)( mode );
}
}
n[4].f = y2;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Rectf)( x1, y1, x2, y2 );
+ (*ctx->Exec->Rectf)( x1, y1, x2, y2 );
}
}
n[3].f = z;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Scalef)( x, y, z );
+ (*ctx->Exec->Scalef)( x, y, z );
}
}
n[4].i = height;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Scissor)( x, y, width, height );
+ (*ctx->Exec->Scissor)( x, y, width, height );
}
}
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ShadeModel)( mode );
+ (*ctx->Exec->ShadeModel)( mode );
}
}
n[3].ui = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.StencilFunc)( func, ref, mask );
+ (*ctx->Exec->StencilFunc)( func, ref, mask );
}
}
n[1].ui = mask;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.StencilMask)( mask );
+ (*ctx->Exec->StencilMask)( mask );
}
}
n[3].e = zpass;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.StencilOp)( fail, zfail, zpass );
+ (*ctx->Exec->StencilOp)( fail, zfail, zpass );
}
}
n[6].f = params[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexEnvfv)( target, pname, params );
+ (*ctx->Exec->TexEnvfv)( target, pname, params );
}
}
n[6].f = params[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexGenfv)( coord, pname, params );
+ (*ctx->Exec->TexGenfv)( coord, pname, params );
}
}
n[6].f = params[3];
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexParameterfv)( target, pname, params );
+ (*ctx->Exec->TexParameterfv)( target, pname, params );
}
}
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_1D) {
/* don't compile, execute immediately */
- (*ctx->Exec.TexImage1D)( target, level, components, width,
+ (*ctx->Exec->TexImage1D)( target, level, components, width,
border, format, type, pixels );
}
else {
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexImage1D)( target, level, components, width,
+ (*ctx->Exec->TexImage1D)( target, level, components, width,
border, format, type, pixels );
}
}
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_2D) {
/* don't compile, execute immediately */
- (*ctx->Exec.TexImage2D)( target, level, components, width,
+ (*ctx->Exec->TexImage2D)( target, level, components, width,
height, border, format, type, pixels );
}
else {
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexImage2D)( target, level, components, width,
+ (*ctx->Exec->TexImage2D)( target, level, components, width,
height, border, format, type, pixels );
}
}
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_3D) {
/* don't compile, execute immediately */
- (*ctx->Exec.TexImage3D)( target, level, components, width,
+ (*ctx->Exec->TexImage3D)( target, level, components, width,
height, depth, border, format, type, pixels );
}
else {
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexImage3D)( target, level, components, width,
+ (*ctx->Exec->TexImage3D)( target, level, components, width,
height, depth, border, format, type, pixels );
}
}
}
-static void save_TexImage3DEXT( GLenum target,
- GLint level, GLenum components,
- GLsizei width, GLsizei height, GLsizei depth,
- GLint border, GLenum format, GLenum type,
- const GLvoid *pixels )
-{
- save_TexImage3D(target, level, (GLint) components, width, height,
- depth, border, format, type, pixels);
-}
-
-
static void save_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format, GLenum type,
const GLvoid *pixels )
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexSubImage1D)( target, level, xoffset, width,
+ (*ctx->Exec->TexSubImage1D)( target, level, xoffset, width,
format, type, pixels );
}
}
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexSubImage2D)( target, level, xoffset, yoffset,
+ (*ctx->Exec->TexSubImage2D)( target, level, xoffset, yoffset,
width, height, format, type, pixels );
}
}
FREE(image);
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.TexSubImage3D)( target, level,
+ (*ctx->Exec->TexSubImage3D)( target, level,
xoffset, yoffset, zoffset,
width, height, depth, format, type, pixels );
}
n[3].f = z;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Translatef)( x, y, z );
+ (*ctx->Exec->Translatef)( x, y, z );
}
}
n[4].i = (GLint) height;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.Viewport)( x, y, width, height );
+ (*ctx->Exec->Viewport)( x, y, width, height );
}
}
n[4].f = w;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.WindowPos4fMESA)( x, y, z, w );
+ (*ctx->Exec->WindowPos4fMESA)( x, y, z, w );
}
}
+static void save_WindowPos2dMESA(GLdouble x, GLdouble y)
+{
+ save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void save_WindowPos2fMESA(GLfloat x, GLfloat y)
+{
+ save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void save_WindowPos2iMESA(GLint x, GLint y)
+{
+ save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void save_WindowPos2sMESA(GLshort x, GLshort y)
+{
+ save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
+{
+ save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
+{
+ save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void save_WindowPos3iMESA(GLint x, GLint y, GLint z)
+{
+ save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
+{
+ save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+ save_WindowPos4fMESA(x, y, z, w);
+}
+
+static void save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
+{
+ save_WindowPos4fMESA(x, y, z, w);
+}
+
+static void save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+ save_WindowPos4fMESA(x, y, z, w);
+}
+
+static void save_WindowPos2dvMESA(const GLdouble *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void save_WindowPos2fvMESA(const GLfloat *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void save_WindowPos2ivMESA(const GLint *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void save_WindowPos2svMESA(const GLshort *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void save_WindowPos3dvMESA(const GLdouble *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void save_WindowPos3fvMESA(const GLfloat *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void save_WindowPos3ivMESA(const GLint *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void save_WindowPos3svMESA(const GLshort *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void save_WindowPos4dvMESA(const GLdouble *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
+
+static void save_WindowPos4fvMESA(const GLfloat *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
+
+static void save_WindowPos4ivMESA(const GLint *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
+
+static void save_WindowPos4svMESA(const GLshort *v)
+{
+ save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
n[1].e = target;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ActiveTextureARB)( target );
+ (*ctx->Exec->ActiveTextureARB)( target );
}
}
n[1].e = target;
}
if (ctx->ExecuteFlag) {
- (*ctx->Exec.ClientActiveTextureARB)( target );
+ (*ctx->Exec->ClientActiveTextureARB)( target );
}
}
(MESA_VERBOSE & VERBOSE_IMMEDIATE))
gl_print_cassette( (struct immediate *) n[1].data );
- if (0)
- fprintf(stderr, "Run cassette %d, rows %d..%d, beginstate %x\n",
+ if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST) {
+ fprintf(stderr, "Run cassette %d, rows %d..%d, beginstate %x ",
IM->id,
IM->Start, IM->Count, IM->BeginState);
+ gl_print_vert_flags("orflag", IM->OrFlag);
+ }
gl_fixup_cassette( ctx, (struct immediate *) n[1].data );
gl_execute_cassette( ctx, (struct immediate *) n[1].data );
break;
}
case OPCODE_ACCUM:
- (*ctx->Exec.Accum)( n[1].e, n[2].f );
+ (*ctx->Exec->Accum)( n[1].e, n[2].f );
break;
case OPCODE_ALPHA_FUNC:
- (*ctx->Exec.AlphaFunc)( n[1].e, n[2].f );
+ (*ctx->Exec->AlphaFunc)( n[1].e, n[2].f );
break;
case OPCODE_BIND_TEXTURE:
- (*ctx->Exec.BindTexture)( n[1].e, n[2].ui );
+ (*ctx->Exec->BindTexture)( n[1].e, n[2].ui );
break;
case OPCODE_BITMAP:
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.Bitmap)( (GLsizei) n[1].i, (GLsizei) n[2].i,
- n[3].f, n[4].f, n[5].f, n[6].f, n[7].data );
+ (*ctx->Exec->Bitmap)( (GLsizei) n[1].i, (GLsizei) n[2].i,
+ n[3].f, n[4].f, n[5].f, n[6].f, (const GLubyte *) n[7].data );
ctx->Unpack = save; /* restore */
}
break;
case OPCODE_BLEND_COLOR:
- (*ctx->Exec.BlendColorEXT)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->BlendColor)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_BLEND_EQUATION:
- (*ctx->Exec.BlendEquationEXT)( n[1].e );
+ (*ctx->Exec->BlendEquation)( n[1].e );
break;
case OPCODE_BLEND_FUNC:
- (*ctx->Exec.BlendFunc)( n[1].e, n[2].e );
+ (*ctx->Exec->BlendFunc)( n[1].e, n[2].e );
break;
case OPCODE_BLEND_FUNC_SEPARATE:
- (*ctx->Exec.BlendFuncSeparateINGR)(n[1].e, n[2].e, n[3].e, n[4].e);
+ (*ctx->Exec->BlendFuncSeparateEXT)(n[1].e, n[2].e, n[3].e, n[4].e);
break;
case OPCODE_CALL_LIST:
/* Generated by glCallList(), don't add ListBase */
}
break;
case OPCODE_CLEAR:
- (*ctx->Exec.Clear)( n[1].bf );
+ (*ctx->Exec->Clear)( n[1].bf );
break;
case OPCODE_CLEAR_COLOR:
- (*ctx->Exec.ClearColor)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->ClearColor)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_CLEAR_ACCUM:
- (*ctx->Exec.ClearAccum)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->ClearAccum)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_CLEAR_DEPTH:
- (*ctx->Exec.ClearDepth)( (GLclampd) n[1].f );
+ (*ctx->Exec->ClearDepth)( (GLclampd) n[1].f );
break;
case OPCODE_CLEAR_INDEX:
- (*ctx->Exec.ClearIndex)( n[1].ui );
+ (*ctx->Exec->ClearIndex)( n[1].ui );
break;
case OPCODE_CLEAR_STENCIL:
- (*ctx->Exec.ClearStencil)( n[1].i );
+ (*ctx->Exec->ClearStencil)( n[1].i );
break;
case OPCODE_CLIP_PLANE:
{
eq[1] = n[3].f;
eq[2] = n[4].f;
eq[3] = n[5].f;
- (*ctx->Exec.ClipPlane)( n[1].e, eq );
+ (*ctx->Exec->ClipPlane)( n[1].e, eq );
}
break;
case OPCODE_COLOR_MASK:
- (*ctx->Exec.ColorMask)( n[1].b, n[2].b, n[3].b, n[4].b );
+ (*ctx->Exec->ColorMask)( n[1].b, n[2].b, n[3].b, n[4].b );
break;
case OPCODE_COLOR_MATERIAL:
- (*ctx->Exec.ColorMaterial)( n[1].e, n[2].e );
+ (*ctx->Exec->ColorMaterial)( n[1].e, n[2].e );
break;
case OPCODE_COLOR_TABLE:
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.ColorTableEXT)( n[1].e, n[2].e, n[3].i, n[4].e,
- n[5].e, n[6].data );
+ (*ctx->Exec->ColorTable)( n[1].e, n[2].e, n[3].i, n[4].e,
+ n[5].e, n[6].data );
ctx->Unpack = save; /* restore */
}
break;
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.ColorSubTableEXT)( n[1].e, n[2].i, n[3].i,
- n[4].e, n[5].e, n[6].data );
+ (*ctx->Exec->ColorSubTable)( n[1].e, n[2].i, n[3].i,
+ n[4].e, n[5].e, n[6].data );
ctx->Unpack = save; /* restore */
}
break;
case OPCODE_COPY_PIXELS:
- (*ctx->Exec.CopyPixels)( n[1].i, n[2].i,
+ (*ctx->Exec->CopyPixels)( n[1].i, n[2].i,
(GLsizei) n[3].i, (GLsizei) n[4].i, n[5].e );
break;
case OPCODE_COPY_TEX_IMAGE1D:
- (*ctx->Exec.CopyTexImage1D)( n[1].e, n[2].i, n[3].e, n[4].i,
+ (*ctx->Exec->CopyTexImage1D)( n[1].e, n[2].i, n[3].e, n[4].i,
n[5].i, n[6].i, n[7].i );
break;
case OPCODE_COPY_TEX_IMAGE2D:
- (*ctx->Exec.CopyTexImage2D)( n[1].e, n[2].i, n[3].e, n[4].i,
+ (*ctx->Exec->CopyTexImage2D)( n[1].e, n[2].i, n[3].e, n[4].i,
n[5].i, n[6].i, n[7].i, n[8].i );
break;
case OPCODE_COPY_TEX_SUB_IMAGE1D:
- (*ctx->Exec.CopyTexSubImage1D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->CopyTexSubImage1D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].i, n[6].i );
break;
case OPCODE_COPY_TEX_SUB_IMAGE2D:
- (*ctx->Exec.CopyTexSubImage2D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->CopyTexSubImage2D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].i, n[6].i, n[7].i, n[8].i );
break;
case OPCODE_COPY_TEX_SUB_IMAGE3D:
- (*ctx->Exec.CopyTexSubImage3D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->CopyTexSubImage3D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].i, n[6].i, n[7].i, n[8].i , n[9].i);
break;
case OPCODE_CULL_FACE:
- (*ctx->Exec.CullFace)( n[1].e );
+ (*ctx->Exec->CullFace)( n[1].e );
break;
case OPCODE_DEPTH_FUNC:
- (*ctx->Exec.DepthFunc)( n[1].e );
+ (*ctx->Exec->DepthFunc)( n[1].e );
break;
case OPCODE_DEPTH_MASK:
- (*ctx->Exec.DepthMask)( n[1].b );
+ (*ctx->Exec->DepthMask)( n[1].b );
break;
case OPCODE_DEPTH_RANGE:
- (*ctx->Exec.DepthRange)( (GLclampd) n[1].f, (GLclampd) n[2].f );
+ (*ctx->Exec->DepthRange)( (GLclampd) n[1].f, (GLclampd) n[2].f );
break;
case OPCODE_DISABLE:
- (*ctx->Exec.Disable)( n[1].e );
+ (*ctx->Exec->Disable)( n[1].e );
break;
case OPCODE_DRAW_BUFFER:
- (*ctx->Exec.DrawBuffer)( n[1].e );
+ (*ctx->Exec->DrawBuffer)( n[1].e );
break;
case OPCODE_DRAW_PIXELS:
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.DrawPixels)( n[1].i, n[2].i, n[3].e, n[4].e,
+ (*ctx->Exec->DrawPixels)( n[1].i, n[2].i, n[3].e, n[4].e,
n[5].data );
ctx->Unpack = save; /* restore */
}
break;
case OPCODE_ENABLE:
- (*ctx->Exec.Enable)( n[1].e );
+ (*ctx->Exec->Enable)( n[1].e );
break;
case OPCODE_EVALMESH1:
- (*ctx->Exec.EvalMesh1)( n[1].e, n[2].i, n[3].i );
+ (*ctx->Exec->EvalMesh1)( n[1].e, n[2].i, n[3].i );
break;
case OPCODE_EVALMESH2:
- (*ctx->Exec.EvalMesh2)( n[1].e, n[2].i, n[3].i, n[4].i, n[5].i );
+ (*ctx->Exec->EvalMesh2)( n[1].e, n[2].i, n[3].i, n[4].i, n[5].i );
break;
case OPCODE_FOG:
{
p[1] = n[3].f;
p[2] = n[4].f;
p[3] = n[5].f;
- (*ctx->Exec.Fogfv)( n[1].e, p );
+ (*ctx->Exec->Fogfv)( n[1].e, p );
}
break;
case OPCODE_FRONT_FACE:
- (*ctx->Exec.FrontFace)( n[1].e );
+ (*ctx->Exec->FrontFace)( n[1].e );
break;
case OPCODE_FRUSTUM:
- (*ctx->Exec.Frustum)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+ (*ctx->Exec->Frustum)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
break;
case OPCODE_HINT:
- (*ctx->Exec.Hint)( n[1].e, n[2].e );
+ (*ctx->Exec->Hint)( n[1].e, n[2].e );
break;
case OPCODE_HINT_PGI:
- (*ctx->Exec.HintPGI)( n[1].e, n[2].i );
+ (*ctx->Exec->HintPGI)( n[1].e, n[2].i );
break;
case OPCODE_INDEX_MASK:
- (*ctx->Exec.IndexMask)( n[1].ui );
+ (*ctx->Exec->IndexMask)( n[1].ui );
break;
case OPCODE_INIT_NAMES:
- (*ctx->Exec.InitNames)();
+ (*ctx->Exec->InitNames)();
break;
case OPCODE_LIGHT:
{
p[1] = n[4].f;
p[2] = n[5].f;
p[3] = n[6].f;
- (*ctx->Exec.Lightfv)( n[1].e, n[2].e, p );
+ (*ctx->Exec->Lightfv)( n[1].e, n[2].e, p );
}
break;
case OPCODE_LIGHT_MODEL:
p[1] = n[3].f;
p[2] = n[4].f;
p[3] = n[5].f;
- (*ctx->Exec.LightModelfv)( n[1].e, p );
+ (*ctx->Exec->LightModelfv)( n[1].e, p );
}
break;
case OPCODE_LINE_STIPPLE:
- (*ctx->Exec.LineStipple)( n[1].i, n[2].us );
+ (*ctx->Exec->LineStipple)( n[1].i, n[2].us );
break;
case OPCODE_LINE_WIDTH:
- (*ctx->Exec.LineWidth)( n[1].f );
+ (*ctx->Exec->LineWidth)( n[1].f );
break;
case OPCODE_LIST_BASE:
- (*ctx->Exec.ListBase)( n[1].ui );
+ (*ctx->Exec->ListBase)( n[1].ui );
break;
case OPCODE_LOAD_IDENTITY:
- (*ctx->Exec.LoadIdentity)();
+ (*ctx->Exec->LoadIdentity)();
break;
case OPCODE_LOAD_MATRIX:
if (sizeof(Node)==sizeof(GLfloat)) {
- (*ctx->Exec.LoadMatrixf)( &n[1].f );
+ (*ctx->Exec->LoadMatrixf)( &n[1].f );
}
else {
GLfloat m[16];
for (i=0;i<16;i++) {
m[i] = n[1+i].f;
}
- (*ctx->Exec.LoadMatrixf)( m );
+ (*ctx->Exec->LoadMatrixf)( m );
}
break;
case OPCODE_LOAD_NAME:
- (*ctx->Exec.LoadName)( n[1].ui );
+ (*ctx->Exec->LoadName)( n[1].ui );
break;
case OPCODE_LOGIC_OP:
- (*ctx->Exec.LogicOp)( n[1].e );
+ (*ctx->Exec->LogicOp)( n[1].e );
break;
case OPCODE_MAP1:
{
GLint uorder = n[5].i;
GLfloat u1 = n[2].f;
GLfloat u2 = n[3].f;
- (*ctx->Exec.Map1f)( target, u1, u2, ustride, uorder,
+ (*ctx->Exec->Map1f)( target, u1, u2, ustride, uorder,
(GLfloat *) n[6].data );
}
break;
GLint vstride = n[7].i;
GLint uorder = n[8].i;
GLint vorder = n[9].i;
- (*ctx->Exec.Map2f)( target, u1, u2, ustride, uorder,
+ (*ctx->Exec->Map2f)( target, u1, u2, ustride, uorder,
v1, v2, vstride, vorder,
(GLfloat *) n[10].data );
}
break;
case OPCODE_MAPGRID1:
- (*ctx->Exec.MapGrid1f)( n[1].i, n[2].f, n[3].f );
+ (*ctx->Exec->MapGrid1f)( n[1].i, n[2].f, n[3].f );
break;
case OPCODE_MAPGRID2:
- (*ctx->Exec.MapGrid2f)( n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);
+ (*ctx->Exec->MapGrid2f)( n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);
break;
case OPCODE_MATRIX_MODE:
- (*ctx->Exec.MatrixMode)( n[1].e );
+ (*ctx->Exec->MatrixMode)( n[1].e );
break;
case OPCODE_MULT_MATRIX:
if (sizeof(Node)==sizeof(GLfloat)) {
- (*ctx->Exec.MultMatrixf)( &n[1].f );
+ (*ctx->Exec->MultMatrixf)( &n[1].f );
}
else {
GLfloat m[16];
for (i=0;i<16;i++) {
m[i] = n[1+i].f;
}
- (*ctx->Exec.MultMatrixf)( m );
+ (*ctx->Exec->MultMatrixf)( m );
}
break;
case OPCODE_ORTHO:
- (*ctx->Exec.Ortho)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+ (*ctx->Exec->Ortho)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
break;
case OPCODE_PASSTHROUGH:
- (*ctx->Exec.PassThrough)( n[1].f );
+ (*ctx->Exec->PassThrough)( n[1].f );
break;
case OPCODE_PIXEL_MAP:
- (*ctx->Exec.PixelMapfv)( n[1].e, n[2].i, (GLfloat *) n[3].data );
+ (*ctx->Exec->PixelMapfv)( n[1].e, n[2].i, (GLfloat *) n[3].data );
break;
case OPCODE_PIXEL_TRANSFER:
- (*ctx->Exec.PixelTransferf)( n[1].e, n[2].f );
+ (*ctx->Exec->PixelTransferf)( n[1].e, n[2].f );
break;
case OPCODE_PIXEL_ZOOM:
- (*ctx->Exec.PixelZoom)( n[1].f, n[2].f );
+ (*ctx->Exec->PixelZoom)( n[1].f, n[2].f );
break;
case OPCODE_POINT_SIZE:
- (*ctx->Exec.PointSize)( n[1].f );
+ (*ctx->Exec->PointSize)( n[1].f );
break;
case OPCODE_POINT_PARAMETERS:
{
params[0] = n[2].f;
params[1] = n[3].f;
params[2] = n[4].f;
- (*ctx->Exec.PointParameterfvEXT)( n[1].e, params );
+ (*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
}
break;
case OPCODE_POLYGON_MODE:
- (*ctx->Exec.PolygonMode)( n[1].e, n[2].e );
+ (*ctx->Exec->PolygonMode)( n[1].e, n[2].e );
break;
case OPCODE_POLYGON_STIPPLE:
- (*ctx->Exec.PolygonStipple)( (GLubyte *) n[1].data );
+ (*ctx->Exec->PolygonStipple)( (GLubyte *) n[1].data );
break;
case OPCODE_POLYGON_OFFSET:
- (*ctx->Exec.PolygonOffset)( n[1].f, n[2].f );
+ (*ctx->Exec->PolygonOffset)( n[1].f, n[2].f );
break;
case OPCODE_POP_ATTRIB:
- (*ctx->Exec.PopAttrib)();
+ (*ctx->Exec->PopAttrib)();
break;
case OPCODE_POP_MATRIX:
- (*ctx->Exec.PopMatrix)();
+ (*ctx->Exec->PopMatrix)();
break;
case OPCODE_POP_NAME:
- (*ctx->Exec.PopName)();
+ (*ctx->Exec->PopName)();
break;
case OPCODE_PRIORITIZE_TEXTURE:
- (*ctx->Exec.PrioritizeTextures)( 1, &n[1].ui, &n[2].f );
+ (*ctx->Exec->PrioritizeTextures)( 1, &n[1].ui, &n[2].f );
break;
case OPCODE_PUSH_ATTRIB:
- (*ctx->Exec.PushAttrib)( n[1].bf );
+ (*ctx->Exec->PushAttrib)( n[1].bf );
break;
case OPCODE_PUSH_MATRIX:
- (*ctx->Exec.PushMatrix)();
+ (*ctx->Exec->PushMatrix)();
break;
case OPCODE_PUSH_NAME:
- (*ctx->Exec.PushName)( n[1].ui );
+ (*ctx->Exec->PushName)( n[1].ui );
break;
case OPCODE_RASTER_POS:
- (*ctx->Exec.RasterPos4f)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->RasterPos4f)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_READ_BUFFER:
- (*ctx->Exec.ReadBuffer)( n[1].e );
+ (*ctx->Exec->ReadBuffer)( n[1].e );
break;
case OPCODE_RECTF:
- (*ctx->Exec.Rectf)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->Rectf)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_SCALE:
- (*ctx->Exec.Scalef)( n[1].f, n[2].f, n[3].f );
+ (*ctx->Exec->Scalef)( n[1].f, n[2].f, n[3].f );
break;
case OPCODE_SCISSOR:
- (*ctx->Exec.Scissor)( n[1].i, n[2].i, n[3].i, n[4].i );
+ (*ctx->Exec->Scissor)( n[1].i, n[2].i, n[3].i, n[4].i );
break;
case OPCODE_SHADE_MODEL:
- (*ctx->Exec.ShadeModel)( n[1].e );
+ (*ctx->Exec->ShadeModel)( n[1].e );
break;
case OPCODE_STENCIL_FUNC:
- (*ctx->Exec.StencilFunc)( n[1].e, n[2].i, n[3].ui );
+ (*ctx->Exec->StencilFunc)( n[1].e, n[2].i, n[3].ui );
break;
case OPCODE_STENCIL_MASK:
- (*ctx->Exec.StencilMask)( n[1].ui );
+ (*ctx->Exec->StencilMask)( n[1].ui );
break;
case OPCODE_STENCIL_OP:
- (*ctx->Exec.StencilOp)( n[1].e, n[2].e, n[3].e );
+ (*ctx->Exec->StencilOp)( n[1].e, n[2].e, n[3].e );
break;
case OPCODE_TEXENV:
{
params[1] = n[4].f;
params[2] = n[5].f;
params[3] = n[6].f;
- (*ctx->Exec.TexEnvfv)( n[1].e, n[2].e, params );
+ (*ctx->Exec->TexEnvfv)( n[1].e, n[2].e, params );
}
break;
case OPCODE_TEXGEN:
params[1] = n[4].f;
params[2] = n[5].f;
params[3] = n[6].f;
- (*ctx->Exec.TexGenfv)( n[1].e, n[2].e, params );
+ (*ctx->Exec->TexGenfv)( n[1].e, n[2].e, params );
}
break;
case OPCODE_TEXPARAMETER:
params[1] = n[4].f;
params[2] = n[5].f;
params[3] = n[6].f;
- (*ctx->Exec.TexParameterfv)( n[1].e, n[2].e, params );
+ (*ctx->Exec->TexParameterfv)( n[1].e, n[2].e, params );
}
break;
case OPCODE_TEX_IMAGE1D:
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexImage1D)(
+ (*ctx->Exec->TexImage1D)(
n[1].e, /* target */
n[2].i, /* level */
n[3].i, /* components */
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexImage2D)(
+ (*ctx->Exec->TexImage2D)(
n[1].e, /* target */
n[2].i, /* level */
n[3].i, /* components */
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexImage3D)(
+ (*ctx->Exec->TexImage3D)(
n[1].e, /* target */
n[2].i, /* level */
n[3].i, /* components */
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexSubImage1D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->TexSubImage1D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].e,
n[6].e, n[7].data );
ctx->Unpack = save; /* restore */
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexSubImage2D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->TexSubImage2D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].e,
n[6].i, n[7].e, n[8].e, n[9].data );
ctx->Unpack = save; /* restore */
{
struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
- (*ctx->Exec.TexSubImage3D)( n[1].e, n[2].i, n[3].i,
+ (*ctx->Exec->TexSubImage3D)( n[1].e, n[2].i, n[3].i,
n[4].i, n[5].i, n[6].i, n[7].i,
n[8].i, n[9].e, n[10].e,
n[11].data );
}
break;
case OPCODE_TRANSLATE:
- (*ctx->Exec.Translatef)( n[1].f, n[2].f, n[3].f );
+ (*ctx->Exec->Translatef)( n[1].f, n[2].f, n[3].f );
break;
case OPCODE_VIEWPORT:
- (*ctx->Exec.Viewport)(n[1].i, n[2].i,
+ (*ctx->Exec->Viewport)(n[1].i, n[2].i,
(GLsizei) n[3].i, (GLsizei) n[4].i);
break;
case OPCODE_WINDOW_POS:
- (*ctx->Exec.WindowPos4fMESA)( n[1].f, n[2].f, n[3].f, n[4].f );
+ (*ctx->Exec->WindowPos4fMESA)( n[1].f, n[2].f, n[3].f, n[4].f );
break;
case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */
- (*ctx->Exec.ActiveTextureARB)( n[1].e );
+ (*ctx->Exec->ActiveTextureARB)( n[1].e );
break;
case OPCODE_CLIENT_ACTIVE_TEXTURE: /* GL_ARB_multitexture */
- (*ctx->Exec.ClientActiveTextureARB)( n[1].e );
+ (*ctx->Exec->ClientActiveTextureARB)( n[1].e );
break;
case OPCODE_CONTINUE:
n = (Node *) n[1].next;
return 0;
}
+ /*
+ * Make this an atomic operation
+ */
+ _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
base = _mesa_HashFindFreeKeyBlock(ctx->Shared->DisplayList, range);
if (base) {
/* reserve the list IDs by with empty/dummy lists */
_mesa_HashInsert(ctx->Shared->DisplayList, base+i, make_empty_list());
}
}
+
+ _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
return base;
}
ctx->CompileCVAFlag = GL_FALSE;
ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);
- ctx->CurrentDispatch = &ctx->Save;
+ ctx->CurrentDispatch = ctx->Save;
_glapi_set_dispatch( ctx->CurrentDispatch );
}
*/
ctx->NewState = ~0;
- ctx->CurrentDispatch = &ctx->Exec;
+ ctx->CurrentDispatch = ctx->Exec;
_glapi_set_dispatch( ctx->CurrentDispatch );
}
/* also restore API function pointers to point to "save" versions */
if (save_compile_flag) {
- ctx->CurrentDispatch = &ctx->Save;
+ ctx->CurrentDispatch = ctx->Save;
_glapi_set_dispatch( ctx->CurrentDispatch );
}
}
/* also restore API function pointers to point to "save" versions */
if (save_compile_flag) {
- ctx->CurrentDispatch = &ctx->Save;
+ ctx->CurrentDispatch = ctx->Save;
_glapi_set_dispatch( ctx->CurrentDispatch );
}
table->TexSubImage3D = save_TexSubImage3D;
/* GL_ARB_imaging */
- /* NOT supported, just call stub functions */
- table->BlendColor = _mesa_BlendColor;
- table->BlendEquation = _mesa_BlendEquation;
- table->ColorSubTable = _mesa_ColorSubTable;
- table->ColorTable = _mesa_ColorTable;
+ /* Not all are supported */
+ table->BlendColor = save_BlendColor;
+ table->BlendEquation = save_BlendEquation;
+ table->ColorSubTable = save_ColorSubTable;
+ table->ColorTable = save_ColorTable;
table->ColorTableParameterfv = _mesa_ColorTableParameterfv;
table->ColorTableParameteriv = _mesa_ColorTableParameteriv;
table->ConvolutionFilter1D = _mesa_ConvolutionFilter1D;
table->ResetMinmax = _mesa_ResetMinmax;
table->SeparableFilter2D = _mesa_SeparableFilter2D;
- /* 6. GL_EXT_texture3d */
+ /* GL_EXT_texture3d */
+#if 0
table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D;
table->TexImage3DEXT = save_TexImage3DEXT;
table->TexSubImage3DEXT = save_TexSubImage3D;
+#endif
/* GL_EXT_paletted_texture */
- table->ColorTableEXT = save_ColorTableEXT;
- table->ColorSubTableEXT = save_ColorSubTableEXT;
- table->GetColorTableEXT = _mesa_GetColorTableEXT;
- table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfvEXT;
- table->GetColorTableParameterivEXT = _mesa_GetColorTableParameterivEXT;
+#if 0
+ table->ColorTableEXT = save_ColorTable;
+ table->ColorSubTableEXT = save_ColorSubTable;
+#endif
+ table->GetColorTableEXT = _mesa_GetColorTable;
+ table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
+ table->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
/* GL_EXT_compiled_vertex_array */
table->LockArraysEXT = _mesa_LockArraysEXT;
table->PolygonOffsetEXT = save_PolygonOffsetEXT;
/* GL_EXT_blend_minmax */
- table->BlendEquationEXT = save_BlendEquation;
+#if 0
+ table->BlendEquationEXT = save_BlendEquationEXT;
+#endif
/* GL_EXT_blend_color */
- table->BlendColorEXT = save_BlendColor;
+#if 0
+ table->BlendColorEXT = save_BlendColorEXT;
+#endif
/* GL_ARB_multitexture */
table->ActiveTextureARB = save_ActiveTextureARB;
table->MultiTexCoord4sARB = _mesa_MultiTexCoord4sARB;
table->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB;
- /* GL_INGR_blend_func_separate */
- table->BlendFuncSeparateINGR = save_BlendFuncSeparateINGR;
+ /* GL_EXT_blend_func_separate */
+ table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT;
/* GL_MESA_window_pos */
+ table->WindowPos2dMESA = save_WindowPos2dMESA;
+ table->WindowPos2dvMESA = save_WindowPos2dvMESA;
+ table->WindowPos2fMESA = save_WindowPos2fMESA;
+ table->WindowPos2fvMESA = save_WindowPos2fvMESA;
+ table->WindowPos2iMESA = save_WindowPos2iMESA;
+ table->WindowPos2ivMESA = save_WindowPos2ivMESA;
+ table->WindowPos2sMESA = save_WindowPos2sMESA;
+ table->WindowPos2svMESA = save_WindowPos2svMESA;
+ table->WindowPos3dMESA = save_WindowPos3dMESA;
+ table->WindowPos3dvMESA = save_WindowPos3dvMESA;
+ table->WindowPos3fMESA = save_WindowPos3fMESA;
+ table->WindowPos3fvMESA = save_WindowPos3fvMESA;
+ table->WindowPos3iMESA = save_WindowPos3iMESA;
+ table->WindowPos3ivMESA = save_WindowPos3ivMESA;
+ table->WindowPos3sMESA = save_WindowPos3sMESA;
+ table->WindowPos3svMESA = save_WindowPos3svMESA;
+ table->WindowPos4dMESA = save_WindowPos4dMESA;
+ table->WindowPos4dvMESA = save_WindowPos4dvMESA;
table->WindowPos4fMESA = save_WindowPos4fMESA;
+ table->WindowPos4fvMESA = save_WindowPos4fvMESA;
+ table->WindowPos4iMESA = save_WindowPos4iMESA;
+ table->WindowPos4ivMESA = save_WindowPos4ivMESA;
+ table->WindowPos4sMESA = save_WindowPos4sMESA;
+ table->WindowPos4svMESA = save_WindowPos4svMESA;
/* GL_MESA_resize_buffers */
table->ResizeBuffersMESA = _mesa_ResizeBuffersMESA;
((struct immediate *) n[1].data)->id,
n[2].ui,
n[3].ui);
+ gl_print_cassette( (struct immediate *) n[1].data );
break;
case OPCODE_CONTINUE:
fprintf(f,"DISPLAY-LIST-CONTINUE\n");
projects / mesa.git / blobdiff