-/* $Id: context.c,v 1.60 2000/04/17 17:57:04 brianp Exp $ */
+/* $Id: context.c,v 1.61 2000/04/22 01:05:00 brianp Exp $ */
/*
* Mesa 3-D graphics library
#endif
-
-
-/**********************************************************************/
-/***** Profiling functions *****/
-/**********************************************************************/
-
-#ifdef PROFILE
-
-#include <sys/times.h>
-#include <sys/param.h>
-
-
-/*
- * Return system time in seconds.
- * NOTE: this implementation may not be very portable!
- */
-GLdouble gl_time( void )
-{
- static GLdouble prev_time = 0.0;
- static GLdouble time;
- struct tms tm;
- clock_t clk;
-
- clk = times(&tm);
-
-#ifdef CLK_TCK
- time = (double)clk / (double)CLK_TCK;
-#else
- time = (double)clk / (double)HZ;
-#endif
-
- if (time>prev_time) {
- prev_time = time;
- return time;
- }
- else {
- return prev_time;
- }
-}
-
-/*
- * Reset the timing/profiling counters
- */
-static void init_timings( GLcontext *ctx )
-{
- ctx->BeginEndCount = 0;
- ctx->BeginEndTime = 0.0;
- ctx->VertexCount = 0;
- ctx->VertexTime = 0.0;
- ctx->PointCount = 0;
- ctx->PointTime = 0.0;
- ctx->LineCount = 0;
- ctx->LineTime = 0.0;
- ctx->PolygonCount = 0;
- ctx->PolygonTime = 0.0;
- ctx->ClearCount = 0;
- ctx->ClearTime = 0.0;
- ctx->SwapCount = 0;
- ctx->SwapTime = 0.0;
-}
-
-
-/*
- * Print the accumulated timing/profiling data.
- */
-static void print_timings( GLcontext *ctx )
-{
- GLdouble beginendrate;
- GLdouble vertexrate;
- GLdouble pointrate;
- GLdouble linerate;
- GLdouble polygonrate;
- GLdouble overhead;
- GLdouble clearrate;
- GLdouble swaprate;
- GLdouble avgvertices;
-
- if (ctx->BeginEndTime>0.0) {
- beginendrate = ctx->BeginEndCount / ctx->BeginEndTime;
- }
- else {
- beginendrate = 0.0;
- }
- if (ctx->VertexTime>0.0) {
- vertexrate = ctx->VertexCount / ctx->VertexTime;
- }
- else {
- vertexrate = 0.0;
- }
- if (ctx->PointTime>0.0) {
- pointrate = ctx->PointCount / ctx->PointTime;
- }
- else {
- pointrate = 0.0;
- }
- if (ctx->LineTime>0.0) {
- linerate = ctx->LineCount / ctx->LineTime;
- }
- else {
- linerate = 0.0;
- }
- if (ctx->PolygonTime>0.0) {
- polygonrate = ctx->PolygonCount / ctx->PolygonTime;
- }
- else {
- polygonrate = 0.0;
- }
- if (ctx->ClearTime>0.0) {
- clearrate = ctx->ClearCount / ctx->ClearTime;
- }
- else {
- clearrate = 0.0;
- }
- if (ctx->SwapTime>0.0) {
- swaprate = ctx->SwapCount / ctx->SwapTime;
- }
- else {
- swaprate = 0.0;
- }
-
- if (ctx->BeginEndCount>0) {
- avgvertices = (GLdouble) ctx->VertexCount / (GLdouble) ctx->BeginEndCount;
- }
- else {
- avgvertices = 0.0;
- }
-
- overhead = ctx->BeginEndTime - ctx->VertexTime - ctx->PointTime
- - ctx->LineTime - ctx->PolygonTime;
-
-
- printf(" Count Time (s) Rate (/s) \n");
- printf("--------------------------------------------------------\n");
- printf("glBegin/glEnd %7d %8.3f %10.3f\n",
- ctx->BeginEndCount, ctx->BeginEndTime, beginendrate);
- printf(" vertexes transformed %7d %8.3f %10.3f\n",
- ctx->VertexCount, ctx->VertexTime, vertexrate );
- printf(" points rasterized %7d %8.3f %10.3f\n",
- ctx->PointCount, ctx->PointTime, pointrate );
- printf(" lines rasterized %7d %8.3f %10.3f\n",
- ctx->LineCount, ctx->LineTime, linerate );
- printf(" polygons rasterized %7d %8.3f %10.3f\n",
- ctx->PolygonCount, ctx->PolygonTime, polygonrate );
- printf(" overhead %8.3f\n", overhead );
- printf("glClear %7d %8.3f %10.3f\n",
- ctx->ClearCount, ctx->ClearTime, clearrate );
- printf("SwapBuffers %7d %8.3f %10.3f\n",
- ctx->SwapCount, ctx->SwapTime, swaprate );
- printf("\n");
-
- printf("Average number of vertices per begin/end: %8.3f\n", avgvertices );
-}
-#endif
-
-
-
-
-
/**********************************************************************/
/***** GL Visual allocation/destruction *****/
/**********************************************************************/
GLint accumAlphaBits,
GLint numSamples )
{
- GLvisual *vis;
+ GLvisual *vis = (GLvisual *) CALLOC( sizeof(GLvisual) );
+ if (vis) {
+ if (!_mesa_initialize_visual(vis, rgbFlag, alphaFlag, dbFlag, stereoFlag,
+ redBits, greenBits, blueBits, alphaBits,
+ indexBits, depthBits, stencilBits,
+ accumRedBits, accumGreenBits,
+ accumBlueBits, accumAlphaBits,
+ numSamples )) {
+ FREE(vis);
+ return NULL;
+ }
+ }
+ return vis;
+}
+
+
+/*
+ * Initialize the fields of the given GLvisual.
+ * Input: see _mesa_create_visual() above.
+ * Return: GL_TRUE = success
+ * GL_FALSE = failure.
+ */
+GLboolean
+_mesa_initialize_visual( GLvisual *vis,
+ GLboolean rgbFlag,
+ GLboolean alphaFlag,
+ GLboolean dbFlag,
+ GLboolean stereoFlag,
+ GLint redBits,
+ GLint greenBits,
+ GLint blueBits,
+ GLint alphaBits,
+ GLint indexBits,
+ GLint depthBits,
+ GLint stencilBits,
+ GLint accumRedBits,
+ GLint accumGreenBits,
+ GLint accumBlueBits,
+ GLint accumAlphaBits,
+ GLint numSamples )
+{
+ assert(vis);
/* This is to catch bad values from device drivers not updated for
* Mesa 3.3. Some device drivers just passed 1. That's a REALLY
assert(depthBits == 0 || depthBits > 1);
if (depthBits < 0 || depthBits > 32) {
- return NULL;
+ return GL_FALSE;
}
if (stencilBits < 0 || stencilBits > (GLint) (8 * sizeof(GLstencil))) {
- return NULL;
+ return GL_FALSE;
}
if (accumRedBits < 0 || accumRedBits > (GLint) (8 * sizeof(GLaccum))) {
- return NULL;
+ return GL_FALSE;
}
if (accumGreenBits < 0 || accumGreenBits > (GLint) (8 * sizeof(GLaccum))) {
- return NULL;
+ return GL_FALSE;
}
if (accumBlueBits < 0 || accumBlueBits > (GLint) (8 * sizeof(GLaccum))) {
- return NULL;
+ return GL_FALSE;
}
if (accumAlphaBits < 0 || accumAlphaBits > (GLint) (8 * sizeof(GLaccum))) {
- return NULL;
- }
-
- vis = (GLvisual *) CALLOC( sizeof(GLvisual) );
- if (!vis) {
- return NULL;
+ return GL_FALSE;
}
vis->RGBAflag = rgbFlag;
vis->DepthMaxF = (GLfloat) vis->DepthMax;
}
- return vis;
+ return GL_TRUE;
}
/* This function should no longer be used. Use _mesa_create_visual() instead */
-GLvisual *gl_create_visual( GLboolean rgbFlag,
- GLboolean alphaFlag,
- GLboolean dbFlag,
- GLboolean stereoFlag,
- GLint depthBits,
- GLint stencilBits,
- GLint accumBits,
- GLint indexBits,
- GLint redBits,
- GLint greenBits,
- GLint blueBits,
- GLint alphaBits )
+GLvisual *
+gl_create_visual( GLboolean rgbFlag,
+ GLboolean alphaFlag,
+ GLboolean dbFlag,
+ GLboolean stereoFlag,
+ GLint depthBits,
+ GLint stencilBits,
+ GLint accumBits,
+ GLint indexBits,
+ GLint redBits,
+ GLint greenBits,
+ GLint blueBits,
+ GLint alphaBits )
{
return _mesa_create_visual(rgbFlag, alphaFlag, dbFlag, stereoFlag,
redBits, greenBits, blueBits, alphaBits,
/* obsolete */
-void gl_destroy_visual( GLvisual *vis )
+void
+gl_destroy_visual( GLvisual *vis )
{
_mesa_destroy_visual(vis);
}
* Return: pointer to new GLframebuffer struct or NULL if error.
*/
-GLframebuffer *gl_create_framebuffer( GLvisual *visual,
- GLboolean softwareDepth,
- GLboolean softwareStencil,
- GLboolean softwareAccum,
- GLboolean softwareAlpha )
+GLframebuffer *
+gl_create_framebuffer( GLvisual *visual,
+ GLboolean softwareDepth,
+ GLboolean softwareStencil,
+ GLboolean softwareAccum,
+ GLboolean softwareAlpha )
{
- GLframebuffer *buffer;
-
- buffer = CALLOC_STRUCT(gl_frame_buffer);
- if (!buffer) {
- return NULL;
+ GLframebuffer *buffer = CALLOC_STRUCT(gl_frame_buffer);
+ assert(visual);
+ if (buffer) {
+ _mesa_initialize_framebuffer(buffer, visual,
+ softwareDepth, softwareStencil,
+ softwareAccum, softwareAlpha );
}
+ return buffer;
+}
+
+
+/*
+ * Initialize a GLframebuffer object.
+ * Input: See gl_create_framebuffer() above.
+ */
+void
+_mesa_initialize_framebuffer( GLframebuffer *buffer,
+ GLvisual *visual,
+ GLboolean softwareDepth,
+ GLboolean softwareStencil,
+ GLboolean softwareAccum,
+ GLboolean softwareAlpha )
+{
+ assert(buffer);
+ assert(visual);
/* sanity checks */
if (softwareDepth ) {
buffer->UseSoftwareStencilBuffer = softwareStencil;
buffer->UseSoftwareAccumBuffer = softwareAccum;
buffer->UseSoftwareAlphaBuffers = softwareAlpha;
-
- return buffer;
}
-
/*
* Free a framebuffer struct and its buffers.
*/
-void gl_destroy_framebuffer( GLframebuffer *buffer )
+void
+gl_destroy_framebuffer( GLframebuffer *buffer )
{
if (buffer) {
if (buffer->DepthBuffer) {
/*
* This function just calls all the various one-time-init functions in Mesa.
*/
-static void one_time_init( void )
+static void
+one_time_init( void )
{
static GLboolean alreadyCalled = GL_FALSE;
_glthread_LOCK_MUTEX(OneTimeLock);
/*
* Allocate and initialize a shared context state structure.
*/
-static struct gl_shared_state *alloc_shared_state( void )
+static struct gl_shared_state *
+alloc_shared_state( void )
{
GLuint d;
struct gl_shared_state *ss;
/*
* Deallocate a shared state context and all children structures.
*/
-static void free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
+static void
+free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
{
/* Free display lists */
while (1) {
* Initialize the nth light. Note that the defaults for light 0 are
* different than the other lights.
*/
-static void init_light( struct gl_light *l, GLuint n )
+static void
+init_light( struct gl_light *l, GLuint n )
{
make_empty_list( l );
-static void init_lightmodel( struct gl_lightmodel *lm )
+static void
+init_lightmodel( struct gl_lightmodel *lm )
{
ASSIGN_4V( lm->Ambient, 0.2, 0.2, 0.2, 1.0 );
lm->LocalViewer = GL_FALSE;
}
-static void init_material( struct gl_material *m )
+static void
+init_material( struct gl_material *m )
{
ASSIGN_4V( m->Ambient, 0.2, 0.2, 0.2, 1.0 );
ASSIGN_4V( m->Diffuse, 0.8, 0.8, 0.8, 1.0 );
-static void init_texture_unit( GLcontext *ctx, GLuint unit )
+static void
+init_texture_unit( GLcontext *ctx, GLuint unit )
{
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
}
-static void init_fallback_arrays( GLcontext *ctx )
+static void
+init_fallback_arrays( GLcontext *ctx )
{
struct gl_client_array *cl;
GLuint i;
/* Initialize a 1-D evaluator map */
-static void init_1d_map( struct gl_1d_map *map, int n, const float *initial )
+static void
+init_1d_map( struct gl_1d_map *map, int n, const float *initial )
{
map->Order = 1;
map->u1 = 0.0;
/* Initialize a 2-D evaluator map */
-static void init_2d_map( struct gl_2d_map *map, int n, const float *initial )
+static void
+init_2d_map( struct gl_2d_map *map, int n, const float *initial )
{
map->Uorder = 1;
map->Vorder = 1;
/*
* Initialize the attribute groups in a GLcontext.
*/
-static void init_attrib_groups( GLcontext *ctx )
+static void
+init_attrib_groups( GLcontext *ctx )
{
GLuint i, j;
* the allocations clean up and return GL_FALSE.
* Return: GL_TRUE=success, GL_FALSE=failure
*/
-static GLboolean alloc_proxy_textures( GLcontext *ctx )
+static GLboolean
+alloc_proxy_textures( GLcontext *ctx )
{
GLboolean out_of_memory;
GLint i;
/*
* Initialize a GLcontext struct.
*/
-GLboolean gl_initialize_context_data( GLcontext *ctx,
- GLvisual *visual,
- GLcontext *share_list,
- void *driver_ctx,
- GLboolean direct )
+GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+ GLvisual *visual,
+ GLcontext *share_list,
+ void *driver_ctx,
+ GLboolean direct )
{
(void) direct; /* not used */
ctx->Pixel.DriverReadBuffer = GL_FRONT_LEFT;
}
-#ifdef PROFILE
- init_timings( ctx );
-#endif
-
if (!alloc_proxy_textures(ctx)) {
free_shared_state(ctx, ctx->Shared);
FREE(ctx->VB);
* driver_ctx - pointer to device driver's context state struct
* Return: pointer to a new gl_context struct or NULL if error.
*/
-GLcontext *gl_create_context( GLvisual *visual,
- GLcontext *share_list,
- void *driver_ctx,
- GLboolean direct )
+GLcontext *
+gl_create_context( GLvisual *visual,
+ GLcontext *share_list,
+ void *driver_ctx,
+ GLboolean direct )
{
GLcontext *ctx = (GLcontext *) CALLOC( sizeof(GLcontext) );
if (!ctx) {
return NULL;
}
- if (gl_initialize_context_data(ctx, visual, share_list,
- driver_ctx, direct)) {
+ if (_mesa_initialize_context(ctx, visual, share_list, driver_ctx, direct)) {
return ctx;
}
else {
* Free the data associated with the given context.
* But don't free() the GLcontext struct itself!
*/
-void gl_free_context_data( GLcontext *ctx )
+void
+gl_free_context_data( GLcontext *ctx )
{
struct gl_shine_tab *s, *tmps;
GLuint i, j;
gl_make_current(NULL, NULL);
}
-#ifdef PROFILE
- if (getenv("MESA_PROFILE")) {
- print_timings( ctx );
- }
-#endif
-
gl_matrix_dtr( &ctx->ModelView );
for (i = 0; i < MAX_MODELVIEW_STACK_DEPTH - 1; i++) {
gl_matrix_dtr( &ctx->ModelViewStack[i] );
/*
* Destroy a GLcontext structure.
*/
-void gl_destroy_context( GLcontext *ctx )
+void
+gl_destroy_context( GLcontext *ctx )
{
if (ctx) {
gl_free_context_data(ctx);
* Called by the driver after both the context and driver are fully
* initialized. Currently just reads the config file.
*/
-void gl_context_initialize( GLcontext *ctx )
+void
+gl_context_initialize( GLcontext *ctx )
{
gl_read_config_file( ctx );
}
* dst - destination context
* mask - bitwise OR of GL_*_BIT flags
*/
-void gl_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
+void
+gl_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
{
if (mask & GL_ACCUM_BUFFER_BIT) {
MEMCPY( &dst->Accum, &src->Accum, sizeof(struct gl_accum_attrib) );
-/* $Id: context.h,v 1.15 2000/03/31 01:05:51 brianp Exp $ */
+/* $Id: context.h,v 1.16 2000/04/22 01:05:00 brianp Exp $ */
/*
* Mesa 3-D graphics library
GLint accumAlphaBits,
GLint numSamples );
+extern GLboolean
+_mesa_initialize_visual( GLvisual *v,
+ GLboolean rgbFlag,
+ GLboolean alphaFlag,
+ GLboolean dbFlag,
+ GLboolean stereoFlag,
+ GLint redBits,
+ GLint greenBits,
+ GLint blueBits,
+ GLint alphaBits,
+ GLint indexBits,
+ GLint depthBits,
+ GLint stencilBits,
+ GLint accumRedBits,
+ GLint accumGreenBits,
+ GLint accumBlueBits,
+ GLint accumAlphaBits,
+ GLint numSamples );
+
/* this function is obsolete */
-extern GLvisual *gl_create_visual( GLboolean rgbFlag,
- GLboolean alphaFlag,
- GLboolean dbFlag,
- GLboolean stereoFlag,
- GLint depthBits,
- GLint stencilBits,
- GLint accumBits,
- GLint indexBits,
- GLint redBits,
- GLint greenBits,
- GLint blueBits,
- GLint alphaBits );
+extern GLvisual *
+gl_create_visual( GLboolean rgbFlag,
+ GLboolean alphaFlag,
+ GLboolean dbFlag,
+ GLboolean stereoFlag,
+ GLint depthBits,
+ GLint stencilBits,
+ GLint accumBits,
+ GLint indexBits,
+ GLint redBits,
+ GLint greenBits,
+ GLint blueBits,
+ GLint alphaBits );
extern void
/*obsolete */ extern void gl_destroy_visual( GLvisual *vis );
+
/*
* Create/destroy a GLframebuffer. A GLframebuffer is like a GLX drawable.
* It bundles up the depth buffer, stencil buffer and accum buffers into a
* single entity.
*/
-extern GLframebuffer *gl_create_framebuffer( GLvisual *visual,
- GLboolean softwareDepth,
- GLboolean softwareStencil,
- GLboolean softwareAccum,
- GLboolean softwareAlpha );
+extern GLframebuffer *
+gl_create_framebuffer( GLvisual *visual,
+ GLboolean softwareDepth,
+ GLboolean softwareStencil,
+ GLboolean softwareAccum,
+ GLboolean softwareAlpha );
+
+extern void
+_mesa_initialize_framebuffer( GLframebuffer *fb,
+ GLvisual *visual,
+ GLboolean softwareDepth,
+ GLboolean softwareStencil,
+ GLboolean softwareAccum,
+ GLboolean softwareAlpha );
-extern void gl_destroy_framebuffer( GLframebuffer *buffer );
+extern void
+gl_destroy_framebuffer( GLframebuffer *buffer );
* Create/destroy a GLcontext. A GLcontext is like a GLX context. It
* contains the rendering state.
*/
-extern GLcontext *gl_create_context( GLvisual *visual,
- GLcontext *share_list,
- void *driver_ctx,
- GLboolean direct);
+extern GLcontext *
+gl_create_context( GLvisual *visual,
+ GLcontext *share_list,
+ void *driver_ctx,
+ GLboolean direct);
+
+extern GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+ GLvisual *visual,
+ GLcontext *share_list,
+ void *driver_ctx,
+ GLboolean direct );
-extern GLboolean gl_initialize_context_data( GLcontext *ctx,
- GLvisual *visual,
- GLcontext *share_list,
- void *driver_ctx,
- GLboolean direct );
+extern void
+gl_free_context_data( GLcontext *ctx );
-extern void gl_free_context_data( GLcontext *ctx );
+extern void
+gl_destroy_context( GLcontext *ctx );
-extern void gl_destroy_context( GLcontext *ctx );
+extern void
+gl_context_initialize( GLcontext *ctx );
-extern void gl_context_initialize( GLcontext *ctx );
+extern void
+gl_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
-extern void gl_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
+extern void
+gl_make_current( GLcontext *ctx, GLframebuffer *buffer );
-extern void gl_make_current( GLcontext *ctx, GLframebuffer *buffer );
+extern void
+gl_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
+ GLframebuffer *readBuffer );
-extern void gl_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
- GLframebuffer *readBuffer );
+extern GLcontext *
+gl_get_current_context(void);
-extern GLcontext *gl_get_current_context(void);
/*
* Miscellaneous
*/
-extern void gl_problem( const GLcontext *ctx, const char *s );
+extern void
+gl_problem( const GLcontext *ctx, const char *s );
-extern void gl_warning( const GLcontext *ctx, const char *s );
+extern void
+gl_warning( const GLcontext *ctx, const char *s );
-extern void gl_error( GLcontext *ctx, GLenum error, const char *s );
+extern void
+gl_error( GLcontext *ctx, GLenum error, const char *s );
-extern void gl_compile_error( GLcontext *ctx, GLenum error, const char *s );
+extern void
+gl_compile_error( GLcontext *ctx, GLenum error, const char *s );
_mesa_init_exec_table(struct _glapi_table *exec);
-
-#ifdef PROFILE
-extern GLdouble gl_time( void );
-#endif
-
-
#endif
projects / mesa.git / commitdiff