diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-06 03:30:20 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-06 03:30:20 +0000 |
commit | e41c57758d30c59cf5986f50c6f2326815c6ac53 (patch) | |
tree | a63e78f5524b24d32a14631cfff5b201f4881480 /src/mesa | |
parent | 7d7ec0ea917e6abb5711b7c8dad0b17c8469482f (diff) |
fixed glSampleCoverage typo
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/glapi/APIspec | 6 | ||||
-rw-r--r-- | src/mesa/glapi/glapitemp.h | 7 | ||||
-rw-r--r-- | src/mesa/main/glprocs.h | 1 | ||||
-rw-r--r-- | src/mesa/sparc/glapi_sparc.S | 21 | ||||
-rw-r--r-- | src/mesa/x86/glapi_x86.S | 6 |
5 files changed, 37 insertions, 4 deletions
diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec index f5b113d0a7..b2978de4dc 100644 --- a/src/mesa/glapi/APIspec +++ b/src/mesa/glapi/APIspec @@ -1,4 +1,4 @@ -# $Id: APIspec,v 1.10 2002/09/06 03:19:36 brianp Exp $ +# $Id: APIspec,v 1.11 2002/09/06 03:30:20 brianp Exp $ # This file describes all the OpenGL functions. # We use a number of Python scripts to parse this file and @@ -3526,8 +3526,8 @@ return void param m const GLdouble * category 1.3 -name SampleCover -alias SampleCoverageARBARB +name SampleCoverage +alias SampleCoverageARB return void param value GLclampf param invert GLboolean diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index 21acf56287..0f76b28750 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -2343,7 +2343,11 @@ KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixd)(const GLdouble * m) DISPATCH(MultTransposeMatrixdARB, (m), (F, "glMultTransposeMatrixd(%p);\n", (void *) m)); } -/* No dispatch for SampleCover() */ +KEYWORD1 void KEYWORD2 NAME(SampleCoverage)(GLclampf value, GLboolean invert) +{ + DISPATCH(SampleCoverageARB, (value, invert), (F, "glSampleCoverage(%f, %d);\n", value, invert)); +} + KEYWORD1 void KEYWORD2 NAME(CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data) { DISPATCH(CompressedTexImage3DARB, (target, level, internalformat, width, height, depth, border, imageSize, data), (F, "glCompressedTexImage3D(0x%x, %d, 0x%x, %d, %d, %d, %d, %d, %p);\n", target, level, internalformat, width, height, depth, border, imageSize, (void *) data)); @@ -4998,6 +5002,7 @@ void *UNUSED_TABLE_NAME[] = { TABLE_ENTRY(LoadTransposeMatrixd), TABLE_ENTRY(MultTransposeMatrixf), TABLE_ENTRY(MultTransposeMatrixd), + TABLE_ENTRY(SampleCoverage), TABLE_ENTRY(CompressedTexImage3D), TABLE_ENTRY(CompressedTexImage2D), TABLE_ENTRY(CompressedTexImage1D), diff --git a/src/mesa/main/glprocs.h b/src/mesa/main/glprocs.h index 2df9870d69..e63f14e041 100644 --- a/src/mesa/main/glprocs.h +++ b/src/mesa/main/glprocs.h @@ -463,6 +463,7 @@ static struct name_address_offset static_functions[] = { { "glLoadTransposeMatrixd", (GLvoid *) glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB }, { "glMultTransposeMatrixf", (GLvoid *) glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB }, { "glMultTransposeMatrixd", (GLvoid *) glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB }, + { "glSampleCoverage", (GLvoid *) glSampleCoverage, _gloffset_SampleCoverageARB }, { "glCompressedTexImage3D", (GLvoid *) glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB }, { "glCompressedTexImage2D", (GLvoid *) glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB }, { "glCompressedTexImage1D", (GLvoid *) glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB }, diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S index 2f7c93607f..ebf17b6e79 100644 --- a/src/mesa/sparc/glapi_sparc.S +++ b/src/mesa/sparc/glapi_sparc.S @@ -9660,6 +9660,27 @@ glMultTransposeMatrixd: jmpl %g3, %g0 nop +.globl glSampleCoverage +.type glSampleCoverage,#function +glSampleCoverage: +#ifdef __sparc_v9__ + sethi %hi(0x00000000), %g2 + sethi %hi(0x00000000), %g1 + or %g2, %lo(0x00000000), %g2 + or %g1, %lo(0x00000000), %g1 + sllx %g2, 32, %g2 + ldx [%g1 + %g2], %g1 + sethi %hi(8 * _gloffset_SampleCoverageARB), %g2 + or %g2, %lo(8 * _gloffset_SampleCoverageARB), %g2 + ldx [%g1 + %g2], %g3 +#else + sethi %hi(0x00000000), %g1 + ld [%g1 + %lo(0x00000000)], %g1 + ld [%g1 + (4 * _gloffset_SampleCoverageARB)], %g3 +#endif + jmpl %g3, %g0 + nop + .globl glCompressedTexImage3D .type glCompressedTexImage3D,#function glCompressedTexImage3D: diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 28482b3c5a..337da91598 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -2776,6 +2776,12 @@ GL_PREFIX(MultTransposeMatrixd): JMP(GL_OFFSET(_gloffset_MultTransposeMatrixdARB)) ALIGNTEXT16 +GLOBL_FN(GL_PREFIX(SampleCoverage)) +GL_PREFIX(SampleCoverage): + MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) + JMP(GL_OFFSET(_gloffset_SampleCoverageARB)) + +ALIGNTEXT16 GLOBL_FN(GL_PREFIX(CompressedTexImage3D)) GL_PREFIX(CompressedTexImage3D): MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) |