OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bunch of dispatch and extension-related changes

Browse Source
This commit is contained in:
Brian Paul
2000-02-24 22:04:03 +00:00
parent 8814124f35
commit ead285a926
8 changed files with 688 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1379
src/mesa/glapi/glapioffsets.h
View File

File diff suppressed because it is too large Load Diff

12
src/mesa/main/blend.c
View File

@@ -1,4 +1,4 @@
/* $Id: blend.c,v 1.12 2000/02/21 14:50:31 brianp Exp $ */ /* $Id: blend.c,v 1.13 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -102,10 +102,10 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
} }
/* GL_INGR_blend_func_separate */ /* GL_EXT_blend_func_separate */
void void
_mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB, _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA ) GLenum sfactorA, GLenum dfactorA )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendFuncSeparate"); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendFuncSeparate");
@@ -212,7 +212,7 @@ _mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB,
/* This is really an extension function! */ /* This is really an extension function! */
void void
_mesa_BlendEquationEXT( GLenum mode ) _mesa_BlendEquation( GLenum mode )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendEquation"); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendEquation");
@@ -256,7 +256,7 @@ _mesa_BlendEquationEXT( GLenum mode )
void void
_mesa_BlendColorEXT( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ctx->Color.BlendColor[0] = CLAMP( red, 0.0F, 1.0F ); ctx->Color.BlendColor[0] = CLAMP( red, 0.0F, 1.0F );

10
src/mesa/main/blend.h
View File

@@ -1,4 +1,4 @@
/* $Id: blend.h,v 1.3 2000/02/02 22:08:26 brianp Exp $ */ /* $Id: blend.h,v 1.4 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -49,16 +49,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
extern void extern void
_mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB, _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA ); GLenum sfactorA, GLenum dfactorA );
extern void extern void
_mesa_BlendEquationEXT( GLenum mode ); _mesa_BlendEquation( GLenum mode );
extern void extern void
_mesa_BlendColorEXT(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); _mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
#endif #endif

58
src/mesa/main/colortab.c
View File

@@ -1,10 +1,10 @@
/* $Id: colortab.c,v 1.7 1999/11/19 22:51:29 brianp Exp $ */ /* $Id: colortab.c,v 1.8 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 3.3 * Version: 3.3
* *
* Copyright (C) 1999 Brian Paul All Rights Reserved. * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -112,9 +112,9 @@ decode_internal_format( GLint format )
void void
_mesa_ColorTableEXT( GLenum target, GLenum internalFormat, _mesa_ColorTable( GLenum target, GLenum internalFormat,
GLsizei width, GLenum format, GLenum type, GLsizei width, GLenum format, GLenum type,
const GLvoid *table ) const GLvoid *table )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -122,7 +122,7 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat,
struct gl_color_table *palette; struct gl_color_table *palette;
GLboolean proxy = GL_FALSE; GLboolean proxy = GL_FALSE;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTableEXT"); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTable");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
@@ -157,24 +157,24 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat,
palette = &ctx->Texture.Palette; palette = &ctx->Texture.Palette;
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glColorTableEXT(target)"); gl_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
return; return;
} }
assert(palette); assert(palette);
if (!gl_is_legal_format_and_type(format, type)) { if (!gl_is_legal_format_and_type(format, type)) {
gl_error(ctx, GL_INVALID_ENUM, "glColorTableEXT(format or type)"); gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
return; return;
} }
if (decode_internal_format(internalFormat) < 0) { if (decode_internal_format(internalFormat) < 0) {
gl_error( ctx, GL_INVALID_ENUM, "glColorTableEXT(internalFormat)" ); gl_error( ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)" );
return; return;
} }
if (width < 1 || width > MAX_TEXTURE_PALETTE_SIZE || !power_of_two(width)) { if (width < 1 || width > MAX_TEXTURE_PALETTE_SIZE || !power_of_two(width)) {
gl_error(ctx, GL_INVALID_VALUE, "glColorTableEXT(width)"); gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
if (proxy) { if (proxy) {
palette->Size = 0; palette->Size = 0;
palette->IntFormat = (GLenum) 0; palette->IntFormat = (GLenum) 0;
@@ -209,9 +209,9 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat,
void void
_mesa_ColorSubTableEXT( GLenum target, GLsizei start, _mesa_ColorSubTable( GLenum target, GLsizei start,
GLsizei count, GLenum format, GLenum type, GLsizei count, GLenum format, GLenum type,
const GLvoid *table ) const GLvoid *table )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -220,7 +220,7 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start,
GLint comps; GLint comps;
GLubyte *dest; GLubyte *dest;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTableEXT"); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTable");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
@@ -240,19 +240,19 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start,
palette = &ctx->Texture.Palette; palette = &ctx->Texture.Palette;
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glColorSubTableEXT(target)"); gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
return; return;
} }
assert(palette); assert(palette);
if (!gl_is_legal_format_and_type(format, type)) { if (!gl_is_legal_format_and_type(format, type)) {
gl_error(ctx, GL_INVALID_ENUM, "glColorSubTableEXT(format or type)"); gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
return; return;
} }
if (count < 1) { if (count < 1) {
gl_error(ctx, GL_INVALID_VALUE, "glColorSubTableEXT(count)"); gl_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
return; return;
} }
@@ -260,7 +260,7 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start,
assert(comps > 0); /* error should be caught sooner */ assert(comps > 0); /* error should be caught sooner */
if (start + count > palette->Size) { if (start + count > palette->Size) {
gl_error(ctx, GL_INVALID_VALUE, "glColorSubTableEXT(count)"); gl_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
return; return;
} }
dest = palette->Table + start * comps * sizeof(GLubyte); dest = palette->Table + start * comps * sizeof(GLubyte);
@@ -285,8 +285,8 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start,
void void
_mesa_GetColorTableEXT( GLenum target, GLenum format, _mesa_GetColorTable( GLenum target, GLenum format,
GLenum type, GLvoid *table ) GLenum type, GLvoid *table )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -294,7 +294,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format,
GLubyte rgba[MAX_TEXTURE_PALETTE_SIZE][4]; GLubyte rgba[MAX_TEXTURE_PALETTE_SIZE][4];
GLint i; GLint i;
ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableEXT"); ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTable");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
@@ -310,7 +310,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format,
palette = &ctx->Texture.Palette; palette = &ctx->Texture.Palette;
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableEXT(target)"); gl_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
return; return;
} }
@@ -366,7 +366,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format,
} }
break; break;
default: default:
gl_problem(ctx, "bad palette format in glGetColorTableEXT"); gl_problem(ctx, "bad palette format in glGetColorTable");
return; return;
} }
@@ -381,23 +381,23 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format,
void void
_mesa_GetColorTableParameterfvEXT( GLenum target, GLenum pname, GLfloat *params ) _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
{ {
GLint iparams[10]; GLint iparams[10];
_mesa_GetColorTableParameterivEXT( target, pname, iparams ); _mesa_GetColorTableParameteriv( target, pname, iparams );
*params = (GLfloat) iparams[0]; *params = (GLfloat) iparams[0];
} }
void void
_mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ) _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
struct gl_color_table *palette; struct gl_color_table *palette;
ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameterEXT"); ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameter");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
@@ -413,7 +413,7 @@ _mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params )
palette = &ctx->Texture.Palette; palette = &ctx->Texture.Palette;
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterEXT(target)"); gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
return; return;
} }
@@ -443,7 +443,7 @@ _mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params )
*params = 8; *params = 8;
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterEXT" ); gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter" );
return; return;
} }
} }

31
src/mesa/main/colortab.h
View File

@@ -1,10 +1,10 @@
/* $Id: colortab.h,v 1.4 1999/11/12 08:32:37 joukj Exp $ */ /* $Id: colortab.h,v 1.5 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 3.3 * Version: 3.3
* *
* Copyright (C) 1999 Brian Paul All Rights Reserved. * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -33,29 +33,24 @@
extern void extern void
_mesa_ColorTableEXT( GLenum target, GLenum internalformat, _mesa_ColorTable( GLenum target, GLenum internalformat,
GLsizei width, GLenum format, GLenum type, GLsizei width, GLenum format, GLenum type,
const GLvoid *table );
extern void
_mesa_ColorSubTable( GLenum target, GLsizei start,
GLsizei count, GLenum format, GLenum type,
const GLvoid *table ); const GLvoid *table );
extern void extern void
_mesa_ColorSubTableEXT( GLenum target, GLsizei start, _mesa_GetColorTable( GLenum target, GLenum format,
GLsizei count, GLenum format, GLenum type, GLenum type, GLvoid *table );
const GLvoid *table );
extern void extern void
_mesa_GetColorTableEXT( GLenum target, GLenum format, _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
GLenum type, GLvoid *table );
#ifdef VMS
/* VMS does not support externals longer than 32 characters. */
#define _mesa_GetColorTableParameterfvEXT VMS_GCTParameterfvEXT
#define _mesa_GetColorTableParameterivEXT VMS_GCTParameterivEXT
#endif
extern void extern void
_mesa_GetColorTableParameterfvEXT( GLenum target, GLenum pname, GLfloat *params ); _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
extern void
_mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params );
#endif #endif

94
src/mesa/main/dlist.c
View File

@@ -1,4 +1,4 @@
/* $Id: dlist.c,v 1.30 2000/02/12 17:26:15 brianp Exp $ */ /* $Id: dlist.c,v 1.31 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -33,6 +33,7 @@
#include "attrib.h" #include "attrib.h"
#include "bitmap.h" #include "bitmap.h"
#include "bbox.h" #include "bbox.h"
#include "blend.h"
#include "buffers.h" #include "buffers.h"
#include "clip.h" #include "clip.h"
#include "colortab.h" #include "colortab.h"
@@ -692,7 +693,7 @@ static void save_BlendEquation( GLenum mode )
n[1].e = mode; n[1].e = mode;
} }
if (ctx->ExecuteFlag) { if (ctx->ExecuteFlag) {
(*ctx->Exec->BlendEquationEXT)( mode ); (*ctx->Exec->BlendEquation)( mode );
} }
} }
@@ -713,8 +714,8 @@ static void save_BlendFunc( GLenum sfactor, GLenum dfactor )
} }
static void save_BlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, static void save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA) GLenum sfactorA, GLenum dfactorA)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
Node *n; Node *n;
@@ -727,7 +728,7 @@ static void save_BlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB,
n[4].e = dfactorA; n[4].e = dfactorA;
} }
if (ctx->ExecuteFlag) { if (ctx->ExecuteFlag) {
(*ctx->Exec->BlendFuncSeparateINGR)( sfactorRGB, dfactorRGB, (*ctx->Exec->BlendFuncSeparateEXT)( sfactorRGB, dfactorRGB,
sfactorA, dfactorA); sfactorA, dfactorA);
} }
} }
@@ -747,7 +748,7 @@ static void save_BlendColor( GLfloat red, GLfloat green,
n[4].f = alpha; n[4].f = alpha;
} }
if (ctx->ExecuteFlag) { if (ctx->ExecuteFlag) {
(*ctx->Exec->BlendColorEXT)( red, green, blue, alpha ); (*ctx->Exec->BlendColor)( red, green, blue, alpha );
} }
} }
@@ -939,17 +940,17 @@ static void save_ColorMaterial( GLenum face, GLenum mode )
} }
static void save_ColorTableEXT( GLenum target, GLenum internalFormat, static void save_ColorTable( GLenum target, GLenum internalFormat,
GLsizei width, GLenum format, GLenum type, GLsizei width, GLenum format, GLenum type,
const GLvoid *table ) const GLvoid *table )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_1D || if (target == GL_PROXY_TEXTURE_1D ||
target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_2D ||
target == GL_PROXY_TEXTURE_3D) { target == GL_PROXY_TEXTURE_3D) {
/* execute immediately */ /* execute immediately */
(*ctx->Exec->ColorTableEXT)( target, internalFormat, width, (*ctx->Exec->ColorTable)( target, internalFormat, width,
format, type, table ); format, type, table );
} }
else { else {
GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, table, GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, table,
@@ -969,16 +970,16 @@ static void save_ColorTableEXT( GLenum target, GLenum internalFormat,
FREE(image); FREE(image);
} }
if (ctx->ExecuteFlag) { if (ctx->ExecuteFlag) {
(*ctx->Exec->ColorTableEXT)( target, internalFormat, width, (*ctx->Exec->ColorTable)( target, internalFormat, width,
format, type, table ); format, type, table );
} }
} }
} }
static void save_ColorSubTableEXT( GLenum target, GLsizei start, GLsizei count, static void save_ColorSubTable( GLenum target, GLsizei start, GLsizei count,
GLenum format, GLenum type, GLenum format, GLenum type,
const GLvoid *table) const GLvoid *table)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
GLvoid *image = _mesa_unpack_image(count, 1, 1, format, type, table, GLvoid *image = _mesa_unpack_image(count, 1, 1, format, type, table,
@@ -998,7 +999,7 @@ static void save_ColorSubTableEXT( GLenum target, GLsizei start, GLsizei count,
FREE(image); FREE(image);
} }
if (ctx->ExecuteFlag) { if (ctx->ExecuteFlag) {
(*ctx->Exec->ColorSubTableEXT)(target, start, count, format, type, table); (*ctx->Exec->ColorSubTable)(target, start, count, format, type, table);
} }
} }
@@ -2883,17 +2884,6 @@ static void save_TexImage3D( GLenum target,
} }
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, static void save_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format, GLenum type, GLsizei width, GLenum format, GLenum type,
const GLvoid *pixels ) const GLvoid *pixels )
@@ -3403,16 +3393,16 @@ static void execute_list( GLcontext *ctx, GLuint list )
} }
break; break;
case OPCODE_BLEND_COLOR: 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; break;
case OPCODE_BLEND_EQUATION: case OPCODE_BLEND_EQUATION:
(*ctx->Exec->BlendEquationEXT)( n[1].e ); (*ctx->Exec->BlendEquation)( n[1].e );
break; break;
case OPCODE_BLEND_FUNC: case OPCODE_BLEND_FUNC:
(*ctx->Exec->BlendFunc)( n[1].e, n[2].e ); (*ctx->Exec->BlendFunc)( n[1].e, n[2].e );
break; break;
case OPCODE_BLEND_FUNC_SEPARATE: 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; break;
case OPCODE_CALL_LIST: case OPCODE_CALL_LIST:
/* Generated by glCallList(), don't add ListBase */ /* Generated by glCallList(), don't add ListBase */
@@ -3464,8 +3454,8 @@ static void execute_list( GLcontext *ctx, GLuint list )
{ {
struct gl_pixelstore_attrib save = ctx->Unpack; struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing; ctx->Unpack = _mesa_native_packing;
(*ctx->Exec->ColorTableEXT)( n[1].e, n[2].e, n[3].i, n[4].e, (*ctx->Exec->ColorTable)( n[1].e, n[2].e, n[3].i, n[4].e,
n[5].e, n[6].data ); n[5].e, n[6].data );
ctx->Unpack = save; /* restore */ ctx->Unpack = save; /* restore */
} }
break; break;
@@ -3473,8 +3463,8 @@ static void execute_list( GLcontext *ctx, GLuint list )
{ {
struct gl_pixelstore_attrib save = ctx->Unpack; struct gl_pixelstore_attrib save = ctx->Unpack;
ctx->Unpack = _mesa_native_packing; ctx->Unpack = _mesa_native_packing;
(*ctx->Exec->ColorSubTableEXT)( n[1].e, n[2].i, n[3].i, (*ctx->Exec->ColorSubTable)( n[1].e, n[2].i, n[3].i,
n[4].e, n[5].e, n[6].data ); n[4].e, n[5].e, n[6].data );
ctx->Unpack = save; /* restore */ ctx->Unpack = save; /* restore */
} }
break; break;
@@ -4515,9 +4505,9 @@ _mesa_init_dlist_table( struct _glapi_table *table )
table->TexSubImage3D = save_TexSubImage3D; table->TexSubImage3D = save_TexSubImage3D;
/* GL_ARB_imaging */ /* GL_ARB_imaging */
/* NOT supported, just call stub functions */ /* Not all are supported */
table->BlendColor = _mesa_BlendColor; table->BlendColor = save_BlendColor;
table->BlendEquation = _mesa_BlendEquation; table->BlendEquation = save_BlendEquation;
table->ColorSubTable = _mesa_ColorSubTable; table->ColorSubTable = _mesa_ColorSubTable;
table->ColorTable = _mesa_ColorTable; table->ColorTable = _mesa_ColorTable;
table->ColorTableParameterfv = _mesa_ColorTableParameterfv; table->ColorTableParameterfv = _mesa_ColorTableParameterfv;
@@ -4551,17 +4541,21 @@ _mesa_init_dlist_table( struct _glapi_table *table )
table->ResetMinmax = _mesa_ResetMinmax; table->ResetMinmax = _mesa_ResetMinmax;
table->SeparableFilter2D = _mesa_SeparableFilter2D; table->SeparableFilter2D = _mesa_SeparableFilter2D;
/* 6. GL_EXT_texture3d */ /* GL_EXT_texture3d */
#if 0
table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D; table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D;
table->TexImage3DEXT = save_TexImage3DEXT; table->TexImage3DEXT = save_TexImage3DEXT;
table->TexSubImage3DEXT = save_TexSubImage3D; table->TexSubImage3DEXT = save_TexSubImage3D;
#endif
/* GL_EXT_paletted_texture */ /* GL_EXT_paletted_texture */
table->ColorTableEXT = save_ColorTableEXT; #if 0
table->ColorSubTableEXT = save_ColorSubTableEXT; table->ColorTableEXT = save_ColorTable;
table->GetColorTableEXT = _mesa_GetColorTableEXT; table->ColorSubTableEXT = save_ColorSubTable;
table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfvEXT; #endif
table->GetColorTableParameterivEXT = _mesa_GetColorTableParameterivEXT; table->GetColorTableEXT = _mesa_GetColorTable;
table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
table->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
/* GL_EXT_compiled_vertex_array */ /* GL_EXT_compiled_vertex_array */
table->LockArraysEXT = _mesa_LockArraysEXT; table->LockArraysEXT = _mesa_LockArraysEXT;
@@ -4578,10 +4572,14 @@ _mesa_init_dlist_table( struct _glapi_table *table )
table->PolygonOffsetEXT = save_PolygonOffsetEXT; table->PolygonOffsetEXT = save_PolygonOffsetEXT;
/* GL_EXT_blend_minmax */ /* GL_EXT_blend_minmax */
table->BlendEquationEXT = save_BlendEquation; #if 0
table->BlendEquationEXT = save_BlendEquationEXT;
#endif
/* GL_EXT_blend_color */ /* GL_EXT_blend_color */
table->BlendColorEXT = save_BlendColor; #if 0
table->BlendColorEXT = save_BlendColorEXT;
#endif
/* GL_ARB_multitexture */ /* GL_ARB_multitexture */
table->ActiveTextureARB = save_ActiveTextureARB; table->ActiveTextureARB = save_ActiveTextureARB;
@@ -4619,8 +4617,8 @@ _mesa_init_dlist_table( struct _glapi_table *table )
table->MultiTexCoord4sARB = _mesa_MultiTexCoord4sARB; table->MultiTexCoord4sARB = _mesa_MultiTexCoord4sARB;
table->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB; table->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB;
/* GL_INGR_blend_func_separate */ /* GL_EXT_blend_func_separate */
table->BlendFuncSeparateINGR = save_BlendFuncSeparateINGR; table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT;
/* GL_MESA_window_pos */ /* GL_MESA_window_pos */
table->WindowPos2dMESA = save_WindowPos2dMESA; table->WindowPos2dMESA = save_WindowPos2dMESA;

34
src/mesa/main/get.c
View File

@@ -1,4 +1,4 @@
/* $Id: get.c,v 1.13 2000/02/17 20:53:48 brianp Exp $ */ /* $Id: get.c,v 1.14 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -122,16 +122,16 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
case GL_BLEND_SRC: case GL_BLEND_SRC:
*params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB); *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_SRC_RGB_INGR: case GL_BLEND_SRC_RGB_EXT:
*params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB); *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_DST_RGB_INGR: case GL_BLEND_DST_RGB_EXT:
*params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB); *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB);
break; break;
case GL_BLEND_SRC_ALPHA_INGR: case GL_BLEND_SRC_ALPHA_EXT:
*params = ENUM_TO_BOOL(ctx->Color.BlendSrcA); *params = ENUM_TO_BOOL(ctx->Color.BlendSrcA);
break; break;
case GL_BLEND_DST_ALPHA_INGR: case GL_BLEND_DST_ALPHA_EXT:
*params = ENUM_TO_BOOL(ctx->Color.BlendDstA); *params = ENUM_TO_BOOL(ctx->Color.BlendDstA);
break; break;
case GL_BLEND_EQUATION_EXT: case GL_BLEND_EQUATION_EXT:
@@ -1084,16 +1084,16 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
case GL_BLEND_SRC: case GL_BLEND_SRC:
*params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB); *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_SRC_RGB_INGR: case GL_BLEND_SRC_RGB_EXT:
*params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB); *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_DST_RGB_INGR: case GL_BLEND_DST_RGB_EXT:
*params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB); *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB);
break; break;
case GL_BLEND_SRC_ALPHA_INGR: case GL_BLEND_SRC_ALPHA_EXT:
*params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA); *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA);
break; break;
case GL_BLEND_DST_ALPHA_INGR: case GL_BLEND_DST_ALPHA_EXT:
*params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA); *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA);
break; break;
case GL_BLEND_EQUATION_EXT: case GL_BLEND_EQUATION_EXT:
@@ -2047,16 +2047,16 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
case GL_BLEND_SRC: case GL_BLEND_SRC:
*params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB); *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_SRC_RGB_INGR: case GL_BLEND_SRC_RGB_EXT:
*params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB); *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
break; break;
case GL_BLEND_DST_RGB_INGR: case GL_BLEND_DST_RGB_EXT:
*params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB); *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
break; break;
case GL_BLEND_SRC_ALPHA_INGR: case GL_BLEND_SRC_ALPHA_EXT:
*params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA); *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
break; break;
case GL_BLEND_DST_ALPHA_INGR: case GL_BLEND_DST_ALPHA_EXT:
*params = ENUM_TO_FLOAT(ctx->Color.BlendDstA); *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
break; break;
case GL_BLEND_EQUATION_EXT: case GL_BLEND_EQUATION_EXT:
@@ -2987,16 +2987,16 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
case GL_BLEND_SRC: case GL_BLEND_SRC:
*params = (GLint) ctx->Color.BlendSrcRGB; *params = (GLint) ctx->Color.BlendSrcRGB;
break; break;
case GL_BLEND_SRC_RGB_INGR: case GL_BLEND_SRC_RGB_EXT:
*params = (GLint) ctx->Color.BlendSrcRGB; *params = (GLint) ctx->Color.BlendSrcRGB;
break; break;
case GL_BLEND_DST_RGB_INGR: case GL_BLEND_DST_RGB_EXT:
*params = (GLint) ctx->Color.BlendDstRGB; *params = (GLint) ctx->Color.BlendDstRGB;
break; break;
case GL_BLEND_SRC_ALPHA_INGR: case GL_BLEND_SRC_ALPHA_EXT:
*params = (GLint) ctx->Color.BlendSrcA; *params = (GLint) ctx->Color.BlendSrcA;
break; break;
case GL_BLEND_DST_ALPHA_INGR: case GL_BLEND_DST_ALPHA_EXT:
*params = (GLint) ctx->Color.BlendDstA; *params = (GLint) ctx->Color.BlendDstA;
break; break;
case GL_BLEND_EQUATION_EXT: case GL_BLEND_EQUATION_EXT:

24
src/mesa/main/state.c
View File

@@ -1,4 +1,4 @@
/* $Id: state.c,v 1.3 2000/02/11 21:14:29 brianp Exp $ */ /* $Id: state.c,v 1.4 2000/02/24 22:04:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -88,8 +88,6 @@
static int static int
generic_noop(void) generic_noop(void)
{ {
@@ -511,17 +509,21 @@ _mesa_init_exec_table(struct _glapi_table *exec)
exec->ResetMinmax = _mesa_ResetMinmax; exec->ResetMinmax = _mesa_ResetMinmax;
exec->SeparableFilter2D = _mesa_SeparableFilter2D; exec->SeparableFilter2D = _mesa_SeparableFilter2D;
/* 6. GL_EXT_texture3d */ /* GL_EXT_texture3d */
#if 0
exec->CopyTexSubImage3DEXT = _mesa_CopyTexSubImage3D; exec->CopyTexSubImage3DEXT = _mesa_CopyTexSubImage3D;
exec->TexImage3DEXT = _mesa_TexImage3DEXT; exec->TexImage3DEXT = _mesa_TexImage3DEXT;
exec->TexSubImage3DEXT = _mesa_TexSubImage3D; exec->TexSubImage3DEXT = _mesa_TexSubImage3D;
#endif
/* GL_EXT_paletted_texture */ /* GL_EXT_paletted_texture */
#if 0
exec->ColorTableEXT = _mesa_ColorTableEXT; exec->ColorTableEXT = _mesa_ColorTableEXT;
exec->ColorSubTableEXT = _mesa_ColorSubTableEXT; exec->ColorSubTableEXT = _mesa_ColorSubTableEXT;
exec->GetColorTableEXT = _mesa_GetColorTableEXT; #endif
exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfvEXT; exec->GetColorTableEXT = _mesa_GetColorTable;
exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameterivEXT; exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
/* GL_EXT_compiled_vertex_array */ /* GL_EXT_compiled_vertex_array */
exec->LockArraysEXT = _mesa_LockArraysEXT; exec->LockArraysEXT = _mesa_LockArraysEXT;
@@ -531,17 +533,21 @@ _mesa_init_exec_table(struct _glapi_table *exec)
exec->PointParameterfEXT = _mesa_PointParameterfEXT; exec->PointParameterfEXT = _mesa_PointParameterfEXT;
exec->PointParameterfvEXT = _mesa_PointParameterfvEXT; exec->PointParameterfvEXT = _mesa_PointParameterfvEXT;
/* 77. GL_PGI_misc_hints */ /* GL_PGI_misc_hints */
exec->HintPGI = _mesa_HintPGI; exec->HintPGI = _mesa_HintPGI;
/* GL_EXT_polygon_offset */ /* GL_EXT_polygon_offset */
exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT; exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT;
/* GL_EXT_blend_minmax */ /* GL_EXT_blend_minmax */
#if 0
exec->BlendEquationEXT = _mesa_BlendEquationEXT; exec->BlendEquationEXT = _mesa_BlendEquationEXT;
#endif
/* GL_EXT_blend_color */ /* GL_EXT_blend_color */
#if 0
exec->BlendColorEXT = _mesa_BlendColorEXT; exec->BlendColorEXT = _mesa_BlendColorEXT;
#endif
/* GL_ARB_multitexture */ /* GL_ARB_multitexture */
exec->ActiveTextureARB = _mesa_ActiveTextureARB; exec->ActiveTextureARB = _mesa_ActiveTextureARB;
@@ -580,7 +586,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
exec->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB; exec->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB;
/* GL_INGR_blend_func_separate */ /* GL_INGR_blend_func_separate */
exec->BlendFuncSeparateINGR = _mesa_BlendFuncSeparateINGR; exec->BlendFuncSeparateEXT = _mesa_BlendFuncSeparateEXT;
/* GL_MESA_window_pos */ /* GL_MESA_window_pos */
exec->WindowPos2dMESA = _mesa_WindowPos2dMESA; exec->WindowPos2dMESA = _mesa_WindowPos2dMESA;