Преглед изворни кода

More documentation.

tags/embedded-1-20030324
Jose Fonseca пре 23 година
родитељ
комит
980e98d324

+ 63
- 45
src/mesa/glapi/glthread.h Прегледај датотеку

@@ -1,4 +1,17 @@
/* $Id: glthread.h,v 1.11.6.1 2002/11/21 15:45:55 brianp Exp $ */
/**
* \file glthread.h
* Thread support for gl dispatch.
*
* \author Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
* and Christoph Poliwoda (poliwoda@volumegraphics.com)
* \author Revised by Keith Whitwell
* \author Adapted for new gl dispatcher by Brian Paul
*
* \note
* If this file is accidentally included by a non-threaded build,
* it should not cause the build to fail, or otherwise cause problems.
* In general, it should only be included when needed however.
*/

/*
* Mesa 3-D graphics library
@@ -24,43 +37,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: glthread.h,v 1.11.6.2 2003/03/22 16:49:58 jrfonseca Exp $ */

/*
* Thread support for gl dispatch.
*
* Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
* and Christoph Poliwoda (poliwoda@volumegraphics.com)
* Revised by Keith Whitwell
* Adapted for new gl dispatcher by Brian Paul
*
*
*
* DOCUMENTATION
*
* This thread module exports the following types:
* _glthread_TSD Thread-specific data area
* _glthread_Thread Thread datatype
* _glthread_Mutex Mutual exclusion lock
*
* Macros:
* _glthread_DECLARE_STATIC_MUTEX(name) Declare a non-local mutex
* _glthread_INIT_MUTEX(name) Initialize a mutex
* _glthread_LOCK_MUTEX(name) Lock a mutex
* _glthread_UNLOCK_MUTEX(name) Unlock a mutex
*
* Functions:
* _glthread_GetID(v) Get integer thread ID
* _glthread_InitTSD() Initialize thread-specific data
* _glthread_GetTSD() Get thread-specific data
* _glthread_SetTSD() Set thread-specific data
*
*/

/*
* If this file is accidentally included by a non-threaded build,
* it should not cause the build to fail, or otherwise cause problems.
* In general, it should only be included when needed however.
*/

#ifndef GLTHREAD_H
#define GLTHREAD_H
@@ -242,47 +220,87 @@ create_sem(0, #name"_benaphore") }

#ifndef THREADS

/*
* THREADS not defined
/**
* \name No thread support
*/
/*@{*/

/**
* \brief Thread-specific data area.
*
* Dummy type.
*/
typedef GLuint _glthread_TSD;

/**
* \brief Thread datatype
*
* Dummy type
*/
typedef GLuint _glthread_Thread;

/**
* \brief
*
* Dummy type Mutual exclusion lock
*/
typedef GLuint _glthread_Mutex;

/**
* \brief Declare a non-local mutex.
*
* No-op.
*/
#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0

/**
* \brief Initialize a mutex.
*
* No-op.
*/
#define _glthread_INIT_MUTEX(name) (void) name

/**
* \brief Lock a mutex.
*
* No-op.
*/
#define _glthread_LOCK_MUTEX(name) (void) name

/**
* \brief Unlock a mutex.
*
* No-op.
*/
#define _glthread_UNLOCK_MUTEX(name) (void) name

#endif /* THREADS */
/*@}*/

#endif /* THREADS */


/*
* Platform independent thread specific data API.
/**
* \name Platform independent thread specific data API.
*/
/*@{*/

/** \brief Get integer thread ID */
extern unsigned long
_glthread_GetID(void);

/** \brief Initialize thread-specific data */
extern void
_glthread_InitTSD(_glthread_TSD *);

/** \brief Get thread-specific data */
extern void *
_glthread_GetTSD(_glthread_TSD *);

/** \brief Set thread-specific data */
extern void
_glthread_SetTSD(_glthread_TSD *, void *);

/*@}*/


#endif /* THREADS_H */

+ 2
- 2
src/mesa/main/blend.c Прегледај датотеку

@@ -1,6 +1,6 @@
/**
* \file blend.c
* \brief Blending functions.
* \brief Blending operations.
*/

/*
@@ -27,7 +27,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: blend.c,v 1.38.4.3 2003/03/20 09:19:54 keithw Exp $ */
/* $Id: blend.c,v 1.38.4.4 2003/03/22 16:49:58 jrfonseca Exp $ */


#include "glheader.h"

+ 2
- 2
src/mesa/main/blend.h Прегледај датотеку

@@ -1,6 +1,6 @@
/**
* \file blend.h
* \brief Blending functions declarations.
* \brief Blending functions operations.
*/

/*
@@ -27,7 +27,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: blend.h,v 1.9.8.2 2003/03/20 09:19:59 keithw Exp $ */
/* $Id: blend.h,v 1.9.8.3 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef BLEND_H

+ 2
- 2
src/mesa/main/context.h Прегледај датотеку

@@ -1,6 +1,6 @@
/**
* \file context.h
* \brief Context.
* \brief Mesa context/visual/framebuffer management functions.
*
* There are three Mesa datatypes which are meant to be used by device
* drivers:
@@ -43,7 +43,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: context.h,v 1.35.4.1 2003/03/02 00:27:32 jrfonseca Exp $ */
/* $Id: context.h,v 1.35.4.2 2003/03/22 16:49:58 jrfonseca Exp $ */

#ifndef CONTEXT_H
#define CONTEXT_H

+ 11
- 4
src/mesa/main/depth.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: depth.h,v 1.11.8.2 2003/03/21 11:35:15 keithw Exp $ */
/**
* \file depth.h
* \brief Depth buffer operations.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: depth.h,v 1.11.8.3 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef DEPTH_H
#define DEPTH_H
@@ -33,22 +38,24 @@


#if _HAVE_FULL_GL

extern void
_mesa_ClearDepth( GLclampd depth );


extern void
_mesa_DepthFunc( GLenum func );


extern void
_mesa_DepthMask( GLboolean flag );


extern void
_mesa_init_depth( GLcontext * ctx );

#else

/** \brief No-op. */
#define _mesa_init_depth( c ) ((void)0)

#endif

#endif

+ 14
- 1
src/mesa/main/enums.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: enums.h,v 1.3.8.1 2003/03/05 14:04:19 keithw Exp $ */
/**
* \file enums.h
* \brief Enumeration name/number lookup functions.
*/

/*
* Mesa 3-D graphics library
@@ -24,16 +27,26 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: enums.h,v 1.3.8.2 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef _ENUMS_H_
#define _ENUMS_H_


#if _HAVE_FULL_GL

extern const char *_mesa_lookup_enum_by_nr( int nr );
extern int _mesa_lookup_enum_by_name( const char *symbol );

#else

/** \brief No-op */
#define _mesa_lookup_enum_by_name( s ) 0

/** \brief No-op */
#define _mesa_lookup_enum_by_nr( n ) "unknown"

#endif

#endif

+ 8
- 6
src/mesa/main/get.c Прегледај датотеку

@@ -27,7 +27,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: get.c,v 1.99.2.1.2.2 2003/03/19 15:43:15 jrfonseca Exp $ */
/* $Id: get.c,v 1.99.2.1.2.3 2003/03/22 16:49:58 jrfonseca Exp $ */

#include "glheader.h"
#include "colormac.h"
@@ -122,7 +122,7 @@ pixel_texgen_mode(const GLcontext *ctx)
*
* \sa glGetBooleanv().
*
* Tries to get the specified parameter via dd_function_table.GetBooleanv,
* Tries to get the specified parameter via dd_function_table::GetBooleanv,
* otherwise gets the specified parameter from the current context, converting
* it value into GLboolean.
*/
@@ -1503,7 +1503,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
*
* \sa glGetDoublev().
*
* Tries to get the specified parameter via dd_function_table.GetDoublev,
* Tries to get the specified parameter via dd_function_table::GetDoublev,
* otherwise gets the specified parameter from the current context, converting
* it value into GLdouble.
*/
@@ -2880,7 +2880,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
*
* \sa glGetFloatv().
*
* Tries to get the specified parameter via dd_function_table.GetFloatv,
* Tries to get the specified parameter via dd_function_table::GetFloatv,
* otherwise gets the specified parameter from the current context, converting
* it value into GLfloat.
*/
@@ -4233,7 +4233,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
*
* \sa glGetIntegerv().
*
* Tries to get the specified parameter via dd_function_table.GetIntegerv,
* Tries to get the specified parameter via dd_function_table::GetIntegerv,
* otherwise gets the specified parameter from the current context, converting
* it value into GLinteger.
*/
@@ -5625,7 +5625,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
*
* \sa glGetPointerv().
*
* Tries to get the specified pointer via dd_function_table.GetPointerv,
* Tries to get the specified pointer via dd_function_table::GetPointerv,
* otherwise gets the specified pointer from the current context.
*/
void
@@ -5765,6 +5765,8 @@ _mesa_GetString( GLenum name )
* \brief Execute a glGetError() command.
*
* \return error number.
*
* Returns __GLcontextRec::ErrorValue.
*/
GLenum
_mesa_GetError( void )

+ 6
- 3
src/mesa/main/get.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: get.h,v 1.5 2001/03/12 00:48:38 gareth Exp $ */
/**
* \file get.h
* \brief State query functions.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: get.h,v 1.5.8.1 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef GET_H
#define GET_H
@@ -53,6 +58,4 @@ _mesa_GetString( GLenum name );
extern GLenum
_mesa_GetError( void );



#endif

+ 11
- 1
src/mesa/main/histogram.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: histogram.h,v 1.4.4.1 2003/03/20 09:20:53 keithw Exp $ */
/**
* \file histogram.h
* \brief Histogram.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: histogram.h,v 1.4.4.2 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef HISTOGRAM_H
#define HISTOGRAM_H
@@ -32,6 +37,7 @@
#include "mtypes.h"

#if _HAVE_FULL_GL

extern void _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);

extern void _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
@@ -59,8 +65,12 @@ extern void
_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);

extern void _mesa_init_histogram( GLcontext * ctx );

#else

/** \brief No-op */
#define _mesa_init_histogram( c ) ((void) 0)

#endif

#endif

+ 2
- 2
src/mesa/main/matrix.c Прегледај датотеку

@@ -1,6 +1,6 @@
/**
* \file matrix.c
* \brief Matrix operations.
* brief Matrix operations.
*
* \note
* -# 4x4 transformation matrices are stored in memory in column major order.
@@ -32,7 +32,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: matrix.c,v 1.45.4.3 2003/03/20 19:38:41 jrfonseca Exp $ */
/* $Id: matrix.c,v 1.45.4.4 2003/03/22 16:49:58 jrfonseca Exp $ */


#include "glheader.h"

+ 13
- 8
src/mesa/main/pixel.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: pixel.h,v 1.10.8.1 2003/03/20 09:21:02 keithw Exp $ */
/**
* \file pixel.h
* \brief Pixel operations.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: pixel.h,v 1.10.8.2 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef PIXEL_H
#define PIXEL_H
@@ -32,10 +37,8 @@
#include "mtypes.h"


/*
* API functions
*/

/** \name API functions */
/*@*/

extern void
_mesa_GetPixelMapfv( GLenum map, GLfloat *values );
@@ -70,11 +73,11 @@ _mesa_PixelTransferi( GLenum pname, GLint param );
extern void
_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );

/*@}*/


/*
* Pixel processing functions
*/
/** \name Pixel processing functions */
/*@{*/

extern void
_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4],
@@ -142,4 +145,6 @@ _mesa_update_pixel( GLcontext *ctx, GLuint newstate );
extern void
_mesa_init_pixel( GLcontext * ctx );

/*@}*/

#endif

+ 51
- 22
src/mesa/main/state.c Прегледај датотеку

@@ -1,4 +1,9 @@
/* $Id: state.c,v 1.97.4.9 2003/03/22 14:36:50 keithw Exp $ */
/**
* \file state.c
* \brief State management.
*
* This file manages recalculation of derived values in the __GLcontextRec.
*/

/*
* Mesa 3-D graphics library
@@ -24,11 +29,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/


/*
* This file manages recalculation of derived values in the
* __GLcontext.
*/
/* $Id: state.c,v 1.97.4.10 2003/03/22 16:49:58 jrfonseca Exp $ */


#include "glheader.h"
@@ -75,6 +76,17 @@
/* #include "math/m_xform.h" */


/**********************************************************************/
/** \name Dispatch table setup */
/*@{*/

/**
* \brief Generic no-op dispatch function.
*
* Used in replacementof the functions which are not part of Mesa subset.
*
* Displays a message.
*/
static int
generic_noop(void)
{
@@ -83,9 +95,12 @@ generic_noop(void)
}


/*
* Set all pointers in the given dispatch table to point to a
* generic no-op function.
/**
* \brief Set all pointers in the given dispatch table to point to a
* generic no-op function - generic_noop().
*
* \param table dispatch table.
* \param tableSize dispatch table size.
*/
void
_mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize)
@@ -98,13 +113,15 @@ _mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize)
}



/*
* Initialize the given dispatch table with pointers to Mesa's
* immediate-mode commands.
/**
* \brief Initialize a dispatch table with pointers to Mesa's immediate-mode
* commands.
*
* Pointers to begin/end object commands and a few others
* are provided via the vtxfmt interface elsewhere.
* Pointers to glBegin()/glEnd() object commands and a few others
* are provided via the GLvertexformat interface.
*
* \param exec dispatch table.
* \param tableSize disptach table size.
*/
void
_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
@@ -582,18 +599,29 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
/* reuse EXT_point_parameters functions */
}

/*@}*/


/**********************************************************************/
/***** State update logic *****/
/**********************************************************************/
/** \name State update logic */
/*@{*/


/*
* If ctx->NewState is non-zero then this function MUST be called before
* rendering any primitive. Basically, function pointers and miscellaneous
* flags are updated to reflect the current state of the state machine.
/**
* \brief Update state.
*
* \param ctx GL context.
*
* If __GLcontextRec::NewState is non-zero then this function \b must be called
* before rendering any primitive. Basically, function pointers and
* miscellaneous flags are updated to reflect the current state of the state
* machine.
*
* Calls dd_function_table::UpdateState to perform any internal stte management
* necessary.
*
* \sa _mesa_update_modelview_project(), _mesa_update_texture(),
* _mesa_update_buffers(), _mesa_update_polygon(), _mesa_update_lighting() and
* _mesa_update_tnl_spaces().
*/
void _mesa_update_state( GLcontext *ctx )
{
@@ -649,3 +677,4 @@ void _mesa_update_state( GLcontext *ctx )
_mesa_check_driver_hooks( ctx );
}

/*@}*/

+ 6
- 1
src/mesa/main/state.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: state.h,v 1.8.6.1 2003/03/20 09:21:11 keithw Exp $ */
/**
* \file state.h
* \brief State management.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: state.h,v 1.8.6.2 2003/03/22 16:49:58 jrfonseca Exp $ */


#ifndef STATE_H
#define STATE_H

+ 2
- 1
src/mesa/main/texformat.c Прегледај датотеку

@@ -29,7 +29,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: texformat.c,v 1.18.4.1 2003/03/16 00:27:13 jrfonseca Exp $ */
/* $Id: texformat.c,v 1.18.4.2 2003/03/22 16:49:58 jrfonseca Exp $ */

#include "glheader.h"
#include "colormac.h"
@@ -56,6 +56,7 @@

/**
* \brief Null texel fetch function.
*
* Have to have this so the FetchTexel function pointer is never NULL.
*/
static void fetch_null_texel( const struct gl_texture_image *texImage,

+ 5
- 6
src/mesa/main/teximage.c Прегледај датотеку

@@ -2,11 +2,11 @@
* \file teximage.c
* \brief Texture images manipulation functions.
*
* \note
* Mesa's native texture datatype is GLchan. Native formats are GL_ALPHA,
* GL_LUMINANCE, GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, GL_RGBA, and
* \note Mesa's native texture datatype is GLchan. Native formats are
* GL_ALPHA, GL_LUMINANCE, GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, GL_RGBA, and
* GL_COLOR_INDEX.
* Device drivers are free to implement any internal format they want.
*
* \note Device drivers are free to implement any internal format they want.
*/

/*
@@ -33,7 +33,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: teximage.c,v 1.124.4.2 2003/03/16 00:27:13 jrfonseca Exp $ */
/* $Id: teximage.c,v 1.124.4.3 2003/03/22 16:49:58 jrfonseca Exp $ */

#include "glheader.h"
#include "context.h"
@@ -105,7 +105,6 @@ static void PrintTexture(GLcontext *ctx, const struct gl_texture_image *img)
#endif



/**
* \brief Compute log base 2 of \p n.
*

+ 12
- 4
src/mesa/main/teximage.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: teximage.h,v 1.22 2002/10/18 18:03:07 brianp Exp $ */
/**
* \file teximage.h
* \brief Texture images manipulation functions.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: teximage.h,v 1.22.4.1 2003/03/22 16:49:59 jrfonseca Exp $ */


#ifndef TEXIMAGE_H
#define TEXIMAGE_H
@@ -32,8 +37,8 @@
#include "mtypes.h"


/*** Internal functions ***/
/** \name Internal functions */
/*@{*/

extern GLint
_mesa_base_tex_format( GLcontext *ctx, GLint format );
@@ -73,9 +78,11 @@ _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
extern GLint
_mesa_max_texture_levels(GLcontext *ctx, GLenum target);

/*@}*/

/*** API entry point functions ***/

/** \name API entry point functions */
/*@{*/

extern void
_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
@@ -202,5 +209,6 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
extern void
_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);

/*@}*/

#endif

+ 19
- 5
src/mesa/main/texstate.h Прегледај датотеку

@@ -1,4 +1,7 @@
/* $Id: texstate.h,v 1.9.6.1 2003/03/20 09:21:17 keithw Exp $ */
/**
* \file texstate.h
* \brief Texture state management.
*/

/*
* Mesa 3-D graphics library
@@ -24,6 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: texstate.h,v 1.9.6.2 2003/03/22 16:49:59 jrfonseca Exp $ */


#ifndef TEXSTATE_H
#define TEXSTATE_H
@@ -36,7 +41,10 @@ extern void
_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );


/*** Called from API ***/
/**
* \name Called from API
*/
/*@{*/

extern void
_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
@@ -114,8 +122,6 @@ extern void
_mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );




/*
* GL_ARB_multitexture
*/
@@ -163,8 +169,14 @@ _mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
extern void
_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value);

/* Initialization, State maintainance
/*@}*/


/**
* \name Initialization, state maintainance
*/
/*@{*/

extern void
_mesa_update_texture( GLcontext *ctx, GLuint new_state );

@@ -174,4 +186,6 @@ _mesa_init_texture( GLcontext *ctx );
extern void
_mesa_free_texture_data( GLcontext *ctx );

/*@}*/

#endif

+ 7
- 5
src/mesa/main/texstore.h Прегледај датотеку

@@ -1,4 +1,9 @@
/* $Id: texstore.h,v 1.11 2002/09/27 02:45:38 brianp Exp $ */
/**
* \file texstore.h
* \brief Texture image storage.
*
* \author Brian Paul
*/

/*
* Mesa 3-D graphics library
@@ -24,10 +29,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/*
* Authors:
* Brian Paul
*/
/* $Id: texstore.h,v 1.11.6.1 2003/03/22 16:49:59 jrfonseca Exp $ */


#ifndef TEXSTORE_H

+ 23
- 24
src/mesa/main/texutil_tmp.h Прегледај датотеку

@@ -1,4 +1,25 @@
/* $Id: texutil_tmp.h,v 1.12 2002/10/29 20:28:55 brianp Exp $ */
/**
* \file texutil_tmp.h
*
* \author Gareth Hughes
*
* For 2D and 3D texture images, we generate functions for
* - conversion without pixel unpacking and standard stride
* - conversion without pixel unpacking and non-standard stride
* - conversion with pixel unpacking and standard stride
* - conversion with pixel unpacking and non-standard stride
*
* Macros which need to be defined before including this file:
* - \c TAG(x) - the function name wrapper
* - \c DST_TYPE - the destination texel datatype (GLuint, GLushort, etc)
* - \c DST_TEXELS_PER_DWORD - number of dest texels that'll fit in 4 bytes
* - \c CONVERT_TEXEL - code to convert from source to dest texel
* - \c CONVER_TEXEL_DWORD - if multiple texels fit in 4 bytes, this macros
* will convert/store multiple texels at once
* - \c CONVERT_DIRECT - if defined, just memcpy texels from src to dest
* - \c SRC_TEXEL_BYTES - bytes per source texel
* - \c PRESERVE_DST_TYPE - if defined, don't undefined these macros at end
*/

/*
* Mesa 3-D graphics library
@@ -22,31 +43,9 @@
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Author:
* Gareth Hughes
*/


/*
* For 2D and 3D texture images, we generate functions for
* - conversion without pixel unpacking and standard stride
* - conversion without pixel unpacking and non-standard stride
* - conversion with pixel unpacking and standard stride
* - conversion with pixel unpacking and non-standard stride
*
*
* Macros which need to be defined before including this file:
* TAG(x) - the function name wrapper
* DST_TYPE - the destination texel datatype (GLuint, GLushort, etc)
* DST_TEXELS_PER_DWORD - number of dest texels that'll fit in 4 bytes
* CONVERT_TEXEL - code to convert from source to dest texel
* CONVER_TEXEL_DWORD - if multiple texels fit in 4 bytes, this macros
* will convert/store multiple texels at once
* CONVERT_DIRECT - if defined, just memcpy texels from src to dest
* SRC_TEXEL_BYTES - bytes per source texel
* PRESERVE_DST_TYPE - if defined, don't undefined these macros at end
*/
/* $Id: texutil_tmp.h,v 1.12.4.1 2003/03/22 16:49:59 jrfonseca Exp $ */


#define DST_TEXEL_BYTES (4 / DST_TEXELS_PER_DWORD)

+ 2
- 2
src/mesa/math/m_matrix.c Прегледај датотеку

@@ -32,7 +32,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: m_matrix.c,v 1.14.4.1 2003/03/02 00:27:36 jrfonseca Exp $ */
/* $Id: m_matrix.c,v 1.14.4.2 2003/03/22 16:49:59 jrfonseca Exp $ */


#include "glheader.h"
@@ -181,7 +181,7 @@ _math_matrix_mul_floats( GLmatrix *dest, const GLfloat *m )
matmul4( dest->m, dest->m, m );
}

/*@{*/
/*@}*/


/**********************************************************************/

+ 16
- 3
src/mesa/math/m_matrix.h Прегледај датотеку

@@ -27,7 +27,8 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/* $Id: m_matrix.h,v 1.4.8.2 2003/03/22 14:36:50 keithw Exp $ */
/* $Id: m_matrix.h,v 1.4.8.3 2003/03/22 16:49:59 jrfonseca Exp $ */


#ifndef _M_MATRIX_H
#define _M_MATRIX_H
@@ -35,15 +36,18 @@


/**
* Give symbolic names to some of the entries in the matrix to help
* out with the rework of the viewport_map as a matrix transform.
* \name Symbolic names to some of the entries in the matrix
*
* To help out with the rework of the viewport_map as a matrix transform.
*/
/*@{*/
#define MAT_SX 0
#define MAT_SY 5
#define MAT_SZ 10
#define MAT_TX 12
#define MAT_TY 13
#define MAT_TZ 14
/*@}*/

/**
* \brief Different kinds of 4x4 transformation matrices.
@@ -58,6 +62,12 @@ enum GLmatrixtype {
MATRIX_3D = 6, /**< \brief 3-D transformation */
} ;


/**
* \name Matrix flags
*/
/*@{*/

#define MAT_FLAG_IDENTITY 0 /**< \brief is an identity matrix flag.
* (Not actualy used - the identity
* matrix is identified by the abcense
@@ -105,6 +115,9 @@ enum GLmatrixtype {
MAT_DIRTY_FLAGS | \
MAT_DIRTY_INVERSE)

/*@}*/


/**
* \brief Test geometry related matrix flags.
*

Loading…
Откажи
Сачувај