mesa: Branch 'origin' - 9 commits
Brian Paul
brianp at kemper.freedesktop.org
Fri Apr 13 15:55:38 UTC 2007
include/GL/xmesa.h | 15 ++
include/GL/xmesa_xf86.h | 3
progs/demos/fslight.c | 10 +
src/mesa/drivers/x11/xm_api.c | 19 ++-
src/mesa/drivers/x11/xm_image.c | 17 --
src/mesa/drivers/x11/xm_image.h | 7 -
src/mesa/drivers/x11/xmesaP.h | 10 -
src/mesa/shader/shader_api.c | 200 +++++++++++++++++++++++++---------
src/mesa/shader/shader_api.h | 13 ++
src/mesa/shader/slang/slang_codegen.c | 95 +++++++++++-----
src/mesa/shader/slang/slang_link.c | 2
src/mesa/vbo/vbo_save_draw.c | 2
12 files changed, 272 insertions(+), 121 deletions(-)
New commits:
diff-tree 9f8373d5cada37ed71e5908a7158d56d9a4c34d5 (from 50aaabc248c9823106ff772873cbf2631d4dadcd)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri Apr 13 18:13:08 2007 +0300
xmesa: drop unused XMesaPutImageHelper.
It could only be called from XMesaCopySubBuffer but this function is not used
by XFree86.
It seems that XMesaPutImageHelper would handle sub-images but never got
finished. Proper sub-image helpers should be written if need be.
diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index c84ffe8..7d5a7c5 100644
--- a/include/GL/xmesa_xf86.h
+++ b/include/GL/xmesa_xf86.h
@@ -124,8 +124,7 @@ do { \
do { \
/* Assumes: Images are always in ZPixmap format */ \
(void) __d; \
- if (__sx || __sy) /* The non-trivial case */ \
- XMesaPutImageHelper(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h); \
+ ASSERT(!__sx && !__sy) /* The SubImage case */ \
ValidateGC(__b, __gc); \
(*__gc->ops->PutImage)(__b, __gc, ((XMesaDrawable)(__b))->depth, \
__x, __y, __w, __h, 0, ZPixmap, \
diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c
index b91d567..087b4e4 100644
--- a/src/mesa/drivers/x11/xm_image.c
+++ b/src/mesa/drivers/x11/xm_image.c
@@ -130,21 +130,4 @@ void XMesaPutPixel(XMesaImage *image, in
}
#endif
-void XMesaPutImageHelper(ScreenPtr display,
- DrawablePtr d, GCPtr gc,
- XMesaImage *image,
- int src_x, int src_y,
- int dest_x, int dest_y,
- unsigned int width, unsigned int height)
-{
- /* NOT_DONE: Verify that the following works for all depths */
- char *src = (image->data +
- src_y * image->bytes_per_line +
- ((src_x * image->bits_per_pixel) >> 3));
-
- ValidateGC(d, gc);
- (*gc->ops->PutImage)(d, gc, d->depth, dest_x, dest_y, width, height,
- 0, ZPixmap, src);
-}
-
#endif /* XFree86Server */
diff --git a/src/mesa/drivers/x11/xm_image.h b/src/mesa/drivers/x11/xm_image.h
index c91ab39..240ccee 100644
--- a/src/mesa/drivers/x11/xm_image.h
+++ b/src/mesa/drivers/x11/xm_image.h
@@ -81,11 +81,4 @@ extern void XMesaPutPixel(XMesaImage *im
unsigned long pixel);
#endif
-extern void XMesaPutImageHelper(ScreenPtr display,
- DrawablePtr d, GCPtr gc,
- XMesaImage *image,
- int src_x, int src_y,
- int dest_x, int dest_y,
- unsigned int width, unsigned int height);
-
#endif /* _XM_IMAGE_H_ */
diff-tree 50aaabc248c9823106ff772873cbf2631d4dadcd (from 30b6f11de1f2f3b9198388451b8a1f73f012c964)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri Apr 13 18:12:37 2007 +0300
xmesa: export xmesa functions used by xfree86.
This uses xmesa.h as the GLcore interface and avoids adding an explicit GLcore
inteface which would not be a proper interface anyway.
It puts the declarations of the three functions specific for XMesa/XFree86 in
xmesa.h, we can push them down to xmesa_xf86.h if hiding behind XFree86Server
ifdef's is not enough.
diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h
index ab813b2..f185a15 100644
--- a/include/GL/xmesa.h
+++ b/include/GL/xmesa.h
@@ -180,6 +180,21 @@ extern XMesaContext XMesaCreateContext(
extern void XMesaDestroyContext( XMesaContext c );
+#ifdef XFree86Server
+/*
+ * These are the extra routines required for integration with XFree86.
+ * None of these routines should be user visible. -KEM
+ */
+extern GLboolean XMesaForceCurrent( XMesaContext c );
+
+extern GLboolean XMesaLoseCurrent( XMesaContext c );
+
+extern GLboolean XMesaCopyContext( XMesaContext src,
+ XMesaContext dst,
+ GLuint mask );
+#endif /* XFree86Server */
+
+
/*
* Create an XMesaBuffer from an X window.
*/
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 24028a4..6439d13 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1308,6 +1308,7 @@ xmesa_convert_from_x_visual_type( int vi
* visualCaveat - ala the GLX extension, usually GLX_NONE
* Return; a new XMesaVisual or 0 if error.
*/
+PUBLIC
XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
XMesaVisualInfo visinfo,
GLboolean rgb_flag,
@@ -1450,6 +1451,7 @@ XMesaVisual XMesaCreateVisual( XMesaDisp
}
+PUBLIC
void XMesaDestroyVisual( XMesaVisual v )
{
#ifndef XFree86Server
@@ -1467,6 +1469,7 @@ void XMesaDestroyVisual( XMesaVisual v )
* lists or NULL if no sharing is wanted.
* \return an XMesaContext or NULL if error.
*/
+PUBLIC
XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
{
static GLboolean firstTime = GL_TRUE;
@@ -1550,6 +1553,7 @@ XMesaContext XMesaCreateContext( XMesaVi
+PUBLIC
void XMesaDestroyContext( XMesaContext c )
{
GLcontext *mesaCtx = &c->mesa;
@@ -1721,7 +1725,7 @@ XMesaCreateWindowBuffer2(XMesaVisual v,
}
-XMesaBuffer
+PUBLIC XMesaBuffer
XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w)
{
return XMesaCreateWindowBuffer2( v, w, NULL );
@@ -1737,7 +1741,7 @@ XMesaCreateWindowBuffer(XMesaVisual v, X
* \c GLX_DIRECT_COLOR visual for the pixmap
* \returns new XMesaBuffer or NULL if error
*/
-XMesaBuffer
+PUBLIC XMesaBuffer
XMesaCreatePixmapBuffer(XMesaVisual v, XMesaPixmap p, XMesaColormap cmap)
{
int client = 0;
@@ -1802,7 +1806,7 @@ XMesaCreatePBuffer(XMesaVisual v, XMesaC
/*
* Deallocate an XMesaBuffer structure and all related info.
*/
-void
+PUBLIC void
XMesaDestroyBuffer(XMesaBuffer b)
{
xmesa_free_buffer(b);
@@ -1845,6 +1849,7 @@ GLboolean XMesaMakeCurrent( XMesaContext
/*
* Bind buffer b to context c and make c the current rendering context.
*/
+PUBLIC
GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer,
XMesaBuffer readBuffer )
{
@@ -1958,6 +1963,8 @@ XMesaBuffer XMesaGetCurrentReadBuffer( v
}
+#ifdef XFree86Server
+PUBLIC
GLboolean XMesaForceCurrent(XMesaContext c)
{
if (c) {
@@ -1976,6 +1983,7 @@ GLboolean XMesaForceCurrent(XMesaContext
}
+PUBLIC
GLboolean XMesaLoseCurrent(XMesaContext c)
{
(void) c;
@@ -1984,11 +1992,13 @@ GLboolean XMesaLoseCurrent(XMesaContext
}
+PUBLIC
GLboolean XMesaCopyContext( XMesaContext xm_src, XMesaContext xm_dst, GLuint mask )
{
_mesa_copy_context(&xm_src->mesa, &xm_dst->mesa, mask);
return GL_TRUE;
}
+#endif /* XFree86Server */
/*
@@ -2135,6 +2145,7 @@ static void FXgetImage( XMesaBuffer b )
* Copy the back buffer to the front buffer. If there's no back buffer
* this is a no-op.
*/
+PUBLIC
void XMesaSwapBuffers( XMesaBuffer b )
{
GET_CURRENT_CONTEXT(ctx);
@@ -2475,7 +2486,7 @@ unsigned long XMesaDitherColor( XMesaCon
* This is typically called when the window size changes and we need
* to reallocate the buffer's back/depth/stencil/accum buffers.
*/
-void
+PUBLIC void
XMesaResizeBuffers( XMesaBuffer b )
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index bd5dce1..98d03cc 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -573,16 +573,6 @@ extern XMesaBuffer XMesaCreateWindowBuff
XMesaWindow w,
XMesaContext c );
-/*
- * These are the extra routines required for integration with XFree86.
- * None of these routines should be user visible. -KEM
- */
-extern GLboolean XMesaForceCurrent(XMesaContext c);
-extern GLboolean XMesaLoseCurrent(XMesaContext c);
-extern GLboolean XMesaCopyContext( XMesaContext src,
- XMesaContext dst,
- GLuint mask );
-
#define ENABLE_EXT_texure_compression_s3tc 0 /* SW texture compression */
diff-tree 30b6f11de1f2f3b9198388451b8a1f73f012c964 (from f11604a30d9ec7ab74f03be2055f8bb8ca4fe211)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 16:18:27 2007 -0600
s/version/vertex/
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index a5e4081..8940551 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -58,7 +58,7 @@ static void _playback_copy_to_current( G
node->vertex_size * sizeof(GLfloat),
data, node->vertex_store->bufferobj );
- data += node->attrsz[0]; /* skip version position */
+ data += node->attrsz[0]; /* skip vertex position */
for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
if (node->attrsz[i]) {
diff-tree f11604a30d9ec7ab74f03be2055f8bb8ca4fe211 (from 99193e4f7454bf5a9cfa0bc3ee6935d8cc85b7fa)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 16:17:01 2007 -0600
fix bug in _playback_copy_to_current(): need to skip version position data (see bug 10587)
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 75cbf02..a5e4081 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -58,6 +58,8 @@ static void _playback_copy_to_current( G
node->vertex_size * sizeof(GLfloat),
data, node->vertex_store->bufferobj );
+ data += node->attrsz[0]; /* skip version position */
+
for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
if (node->attrsz[i]) {
GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
diff-tree 99193e4f7454bf5a9cfa0bc3ee6935d8cc85b7fa (from 5b74fe08897d8897161566ef4cd59b09474d5837)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 15:45:02 2007 -0600
disable debug printfs
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 47622fd..fc1ae28 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -135,7 +135,6 @@ _mesa_free_shader_program_data(GLcontext
void
_mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
{
- printf("FREE SHADER PROG %d\n", shProg->Name);
_mesa_free_shader_program_data(ctx, shProg);
if (shProg->Shaders) {
_mesa_free(shProg->Shaders);
@@ -184,8 +183,8 @@ _mesa_reference_shader_program(GLcontext
if (shProg) {
shProg->RefCount++;
- printf("SHPROG INCR %p (%d) to %d\n",
- (void*) shProg, shProg->Name, shProg->RefCount);
+ /*printf("SHPROG INCR %p (%d) to %d\n",
+ (void*) shProg, shProg->Name, shProg->RefCount);*/
*ptr = shProg;
}
}
@@ -236,7 +235,6 @@ void
_mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
{
GLuint i;
- printf("FREE SHADER %d\n", sh->Name);
if (sh->Source)
_mesa_free((void *) sh->Source);
if (sh->InfoLog)
@@ -274,8 +272,8 @@ _mesa_reference_shader(GLcontext *ctx, s
ASSERT(old->RefCount > 0);
old->RefCount--;
- printf("SHADER DECR %p (%d) to %d\n",
- (void*) old, old->Name, old->RefCount);
+ /*printf("SHADER DECR %p (%d) to %d\n",
+ (void*) old, old->Name, old->RefCount);*/
deleteFlag = (old->RefCount == 0);
if (deleteFlag) {
@@ -290,8 +288,8 @@ _mesa_reference_shader(GLcontext *ctx, s
if (sh) {
/* reference new */
sh->RefCount++;
- printf("SHADER INCR %p (%d) to %d\n",
- (void*) sh, sh->Name, sh->RefCount);
+ /*printf("SHADER INCR %p (%d) to %d\n",
+ (void*) sh, sh->Name, sh->RefCount);*/
*ptr = sh;
}
}
diff-tree 5b74fe08897d8897161566ef4cd59b09474d5837 (from 431d650f2b2969951cdc66822d1652da1bf6c286)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 15:23:55 2007 -0600
Added sanity checking in _slang_sizeof_type_specifier() to be sure sizes are what's expected.
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index fe6b615..06bceea 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -107,54 +107,84 @@ _slang_field_offset(const slang_type_spe
}
+/**
+ * Return the size (in floats) of the given type specifier.
+ * If the size is greater than 4, the size should be a multiple of 4
+ * so that the correct number of 4-float registers are allocated.
+ * For example, a mat3x2 is size 12 because we want to store the
+ * 3 columns in 3 float[4] registers.
+ */
GLuint
_slang_sizeof_type_specifier(const slang_type_specifier *spec)
{
+ GLuint sz;
switch (spec->type) {
case SLANG_SPEC_VOID:
- return 0;
+ sz = 0;
+ break;
case SLANG_SPEC_BOOL:
- return 1;
+ sz = 1;
+ break;
case SLANG_SPEC_BVEC2:
- return 2;
+ sz = 2;
+ break;
case SLANG_SPEC_BVEC3:
- return 3;
+ sz = 3;
+ break;
case SLANG_SPEC_BVEC4:
- return 4;
+ sz = 4;
+ break;
case SLANG_SPEC_INT:
- return 1;
+ sz = 1;
+ break;
case SLANG_SPEC_IVEC2:
- return 2;
+ sz = 2;
+ break;
case SLANG_SPEC_IVEC3:
- return 3;
+ sz = 3;
+ break;
case SLANG_SPEC_IVEC4:
- return 4;
+ sz = 4;
+ break;
case SLANG_SPEC_FLOAT:
- return 1;
+ sz = 1;
+ break;
case SLANG_SPEC_VEC2:
- return 2;
+ sz = 2;
+ break;
case SLANG_SPEC_VEC3:
- return 3;
+ sz = 3;
+ break;
case SLANG_SPEC_VEC4:
- return 4;
+ sz = 4;
+ break;
case SLANG_SPEC_MAT2:
- return 2 * 2;
+ sz = 2 * 4; /* 2 columns (regs) */
+ break;
case SLANG_SPEC_MAT3:
- return 3 * 3;
+ sz = 3 * 4;
+ break;
case SLANG_SPEC_MAT4:
- return 4 * 4;
+ sz = 4 * 4;
+ break;
case SLANG_SPEC_MAT23:
- return 2 * 4; /* special case */
+ sz = 2 * 4; /* 2 columns (regs) */
+ break;
case SLANG_SPEC_MAT32:
- return 3 * 4; /* special case: 3 registers (columns), not two */
+ sz = 3 * 4; /* 3 columns (regs) */
+ break;
case SLANG_SPEC_MAT24:
- return 2 * 4;
+ sz = 2 * 4;
+ break;
case SLANG_SPEC_MAT42:
- return 4 * 4; /* special case: 4 registers (columns), not two */
+ sz = 4 * 4; /* 4 columns (regs) */
+ break;
case SLANG_SPEC_MAT34:
- return 3 * 4;
+ sz = 3 * 4;
+ break;
case SLANG_SPEC_MAT43:
- return 4 * 4; /* special case: 4 registers (columns), not two */
+ sz = 4 * 4; /* 4 columns (regs) */
+ break;
case SLANG_SPEC_SAMPLER1D:
case SLANG_SPEC_SAMPLER2D:
case SLANG_SPEC_SAMPLER3D:
@@ -163,16 +193,27 @@ _slang_sizeof_type_specifier(const slang
case SLANG_SPEC_SAMPLER2DSHADOW:
case SLANG_SPEC_SAMPLER2DRECT:
case SLANG_SPEC_SAMPLER2DRECTSHADOW:
- return 1; /* a sampler is basically just an integer index */
+ sz = 1; /* a sampler is basically just an integer index */
+ break;
case SLANG_SPEC_STRUCT:
- return _slang_field_offset(spec, 0); /* special use */
+ sz = _slang_field_offset(spec, 0); /* special use */
+ if (sz > 4) {
+ sz = (sz + 3) & ~0x3; /* round up to multiple of four */
+ }
+ break;
case SLANG_SPEC_ARRAY:
- return _slang_sizeof_type_specifier(spec->_array);
+ sz = _slang_sizeof_type_specifier(spec->_array);
+ break;
default:
_mesa_problem(NULL, "Unexpected type in _slang_sizeof_type_specifier()");
- return 0;
+ sz = 0;
+ }
+
+ if (sz > 4) {
+ /* if size is > 4, it should be a multiple of four */
+ assert((sz & 0x3) == 0);
}
- return 0;
+ return sz;
}
diff-tree 431d650f2b2969951cdc66822d1652da1bf6c286 (from 3c008a014f7c1d14209b70b4b030bf7738aa16d7)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 15:22:53 2007 -0600
use _mesa_clear_shader_program_data()
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 0cad69d..20c6690 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -475,7 +475,7 @@ _slang_link(GLcontext *ctx,
const struct gl_fragment_program *fragProg;
GLuint i;
- _mesa_free_shader_program_data(ctx, shProg);
+ _mesa_clear_shader_program_data(ctx, shProg);
shProg->Uniforms = _mesa_new_parameter_list();
shProg->Varying = _mesa_new_parameter_list();
diff-tree 3c008a014f7c1d14209b70b4b030bf7738aa16d7 (from bf287356cfc806f9df862a05620f046f8980a8e7)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 12 15:22:32 2007 -0600
New _mesa_reference_shader/program() function to consolidate refcounting.
Note that (unlike texture objects), shader handles remain valid (in the
hash table) after glDeleteShader/Program() if the refcount isn't zero.
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index cf42a58..47622fd 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -68,15 +68,12 @@ _mesa_new_shader_program(GLcontext *ctx,
/**
- * Free the data that hangs off a shader program object, but not the object
- * itself.
+ * Clear (free) the shader program state that gets produced by linking.
*/
void
-_mesa_free_shader_program_data(GLcontext *ctx,
- struct gl_shader_program *shProg)
+_mesa_clear_shader_program_data(GLcontext *ctx,
+ struct gl_shader_program *shProg)
{
- assert(shProg->Type == GL_SHADER_PROGRAM);
-
if (shProg->VertexProgram) {
if (shProg->VertexProgram->Base.Parameters == shProg->Uniforms) {
/* to prevent a double-free in the next call */
@@ -95,7 +92,6 @@ _mesa_free_shader_program_data(GLcontext
shProg->FragmentProgram = NULL;
}
-
if (shProg->Uniforms) {
_mesa_free_parameter_list(shProg->Uniforms);
shProg->Uniforms = NULL;
@@ -109,11 +105,37 @@ _mesa_free_shader_program_data(GLcontext
/**
+ * Free all the data that hangs off a shader program object, but not the
+ * object itself.
+ */
+void
+_mesa_free_shader_program_data(GLcontext *ctx,
+ struct gl_shader_program *shProg)
+{
+ GLuint i;
+
+ assert(shProg->Type == GL_SHADER_PROGRAM);
+
+ _mesa_clear_shader_program_data(ctx, shProg);
+
+ /* detach shaders */
+ for (i = 0; i < shProg->NumShaders; i++) {
+ _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
+ }
+ if (shProg->Shaders) {
+ _mesa_free(shProg->Shaders);
+ shProg->Shaders = NULL;
+ }
+}
+
+
+/**
* Free/delete a shader program object.
*/
void
_mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
{
+ printf("FREE SHADER PROG %d\n", shProg->Name);
_mesa_free_shader_program_data(ctx, shProg);
if (shProg->Shaders) {
_mesa_free(shProg->Shaders);
@@ -124,6 +146,52 @@ _mesa_free_shader_program(GLcontext *ctx
/**
+ * Set ptr to point to shProg.
+ * If ptr is pointing to another object, decrement its refcount (and delete
+ * if refcount hits zero).
+ * Then set ptr to point to shProg, incrementing its refcount.
+ */
+/* XXX this could be static */
+void
+_mesa_reference_shader_program(GLcontext *ctx,
+ struct gl_shader_program **ptr,
+ struct gl_shader_program *shProg)
+{
+ assert(ptr);
+ if (*ptr == shProg) {
+ /* no-op */
+ return;
+ }
+ if (*ptr) {
+ /* Unreference the old shader program */
+ GLboolean deleteFlag = GL_FALSE;
+ struct gl_shader_program *old = *ptr;
+
+ ASSERT(old->RefCount > 0);
+ old->RefCount--;
+ /*printf("SHPROG DECR %p (%d) to %d\n",
+ (void*) old, old->Name, old->RefCount);*/
+ deleteFlag = (old->RefCount == 0);
+
+ if (deleteFlag) {
+ _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
+ _mesa_free_shader_program(ctx, old);
+ }
+
+ *ptr = NULL;
+ }
+ assert(!*ptr);
+
+ if (shProg) {
+ shProg->RefCount++;
+ printf("SHPROG INCR %p (%d) to %d\n",
+ (void*) shProg, shProg->Name, shProg->RefCount);
+ *ptr = shProg;
+ }
+}
+
+
+/**
* Lookup a GLSL program object.
*/
struct gl_shader_program *
@@ -168,6 +236,7 @@ void
_mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
{
GLuint i;
+ printf("FREE SHADER %d\n", sh->Name);
if (sh->Source)
_mesa_free((void *) sh->Source);
if (sh->InfoLog)
@@ -183,6 +252,52 @@ _mesa_free_shader(GLcontext *ctx, struct
/**
+ * Set ptr to point to sh.
+ * If ptr is pointing to another shader, decrement its refcount (and delete
+ * if refcount hits zero).
+ * Then set ptr to point to sh, incrementing its refcount.
+ */
+/* XXX this could be static */
+void
+_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+ struct gl_shader *sh)
+{
+ assert(ptr);
+ if (*ptr == sh) {
+ /* no-op */
+ return;
+ }
+ if (*ptr) {
+ /* Unreference the old shader */
+ GLboolean deleteFlag = GL_FALSE;
+ struct gl_shader *old = *ptr;
+
+ ASSERT(old->RefCount > 0);
+ old->RefCount--;
+ printf("SHADER DECR %p (%d) to %d\n",
+ (void*) old, old->Name, old->RefCount);
+ deleteFlag = (old->RefCount == 0);
+
+ if (deleteFlag) {
+ _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
+ _mesa_free_shader(ctx, old);
+ }
+
+ *ptr = NULL;
+ }
+ assert(!*ptr);
+
+ if (sh) {
+ /* reference new */
+ sh->RefCount++;
+ printf("SHADER INCR %p (%d) to %d\n",
+ (void*) sh, sh->Name, sh->RefCount);
+ *ptr = sh;
+ }
+}
+
+
+/**
* Lookup a GLSL shader object.
*/
struct gl_shader *
@@ -227,13 +342,7 @@ _mesa_init_shader_state(GLcontext * ctx)
void
_mesa_free_shader_state(GLcontext *ctx)
{
- if (ctx->Shader.CurrentProgram) {
- ctx->Shader.CurrentProgram->RefCount--;
- if (ctx->Shader.CurrentProgram->RefCount <= 0) {
- _mesa_free_shader_program(ctx, ctx->Shader.CurrentProgram);
- ctx->Shader.CurrentProgram = NULL;
- }
- }
+ _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
}
@@ -294,8 +403,8 @@ _mesa_attach_shader(GLcontext *ctx, GLui
}
/* append */
- shProg->Shaders[n] = sh;
- sh->RefCount++;
+ shProg->Shaders[n] = NULL; /* since realloc() didn't zero the new space */
+ _mesa_reference_shader(ctx, &shProg->Shaders[n], sh);
shProg->NumShaders++;
}
@@ -381,13 +490,27 @@ _mesa_create_program(GLcontext *ctx)
_mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);
+ assert(shProg->RefCount == 1);
+
return name;
}
+/**
+ * Named w/ "2" to indicate OpenGL 2.x vs GL_ARB_fragment_programs's
+ * DeleteProgramARB.
+ */
void
_mesa_delete_program2(GLcontext *ctx, GLuint name)
{
+ /*
+ * NOTE: deleting shaders/programs works a bit differently than
+ * texture objects (and buffer objects, etc). Shader/program
+ * handles/IDs exist in the hash table until the object is really
+ * deleted (refcount==0). With texture objects, the handle/ID is
+ * removed from the hash table in glDeleteTextures() while the tex
+ * object itself might linger until its refcount goes to zero.
+ */
struct gl_shader_program *shProg;
shProg = _mesa_lookup_shader_program(ctx, name);
@@ -396,16 +519,10 @@ _mesa_delete_program2(GLcontext *ctx, GL
return;
}
- /* always remove from hash table */
- _mesa_HashRemove(ctx->Shared->ShaderObjects, name);
-
shProg->DeletePending = GL_TRUE;
- /* decrement refcount, delete if zero */
- shProg->RefCount--;
- if (shProg->RefCount <= 0) {
- _mesa_free_shader_program(ctx, shProg);
- }
+ /* effectively, decr shProg's refcount */
+ _mesa_reference_shader_program(ctx, &shProg, NULL);
}
@@ -418,10 +535,9 @@ _mesa_delete_shader(GLcontext *ctx, GLui
}
sh->DeletePending = GL_TRUE;
- sh->RefCount--;
- if (sh->RefCount <= 0) {
- _mesa_free_shader(ctx, sh);
- }
+
+ /* effectively, decr sh's refcount */
+ _mesa_reference_shader(ctx, &sh, NULL);
}
@@ -441,14 +557,11 @@ _mesa_detach_shader(GLcontext *ctx, GLui
for (i = 0; i < n; i++) {
if (shProg->Shaders[i]->Name == shader) {
- struct gl_shader **newList;
/* found it */
+ struct gl_shader **newList;
- shProg->Shaders[i]->RefCount--;
- if (shProg->Shaders[i]->RefCount == 0) {
- /* delete now */
- _mesa_free_shader(ctx, shProg->Shaders[i]);
- }
+ /* derefernce */
+ _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
/* alloc new, smaller array */
newList = (struct gl_shader **)
@@ -876,6 +989,8 @@ _mesa_link_program(GLcontext *ctx, GLuin
void
_mesa_use_program(GLcontext *ctx, GLuint program)
{
+ struct gl_shader_program *shProg;
+
if (ctx->Shader.CurrentProgram &&
ctx->Shader.CurrentProgram->Name == program) {
/* no-op */
@@ -884,30 +999,19 @@ _mesa_use_program(GLcontext *ctx, GLuint
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
- /* unbind old */
- if (ctx->Shader.CurrentProgram) {
- ctx->Shader.CurrentProgram->RefCount--;
- if (ctx->Shader.CurrentProgram->RefCount <= 0) {
- _mesa_free_shader_program(ctx, ctx->Shader.CurrentProgram);
- }
- ctx->Shader.CurrentProgram = NULL;
- }
-
if (program) {
- struct gl_shader_program *shProg;
shProg = _mesa_lookup_shader_program(ctx, program);
if (!shProg) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glUseProgramObjectARB(programObj)");
return;
}
- ctx->Shader.CurrentProgram = shProg;
- shProg->RefCount++;
}
else {
- /* don't use a shader program */
- ctx->Shader.CurrentProgram = NULL;
- }
+ shProg = NULL;
+ }
+
+ _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
}
diff --git a/src/mesa/shader/shader_api.h b/src/mesa/shader/shader_api.h
index 16ed1a0..27e5870 100644
--- a/src/mesa/shader/shader_api.h
+++ b/src/mesa/shader/shader_api.h
@@ -45,12 +45,21 @@ extern struct gl_shader_program *
_mesa_new_shader_program(GLcontext *ctx, GLuint name);
extern void
+_mesa_clear_shader_program_data(GLcontext *ctx,
+ struct gl_shader_program *shProg);
+
+extern void
_mesa_free_shader_program_data(GLcontext *ctx,
struct gl_shader_program *shProg);
extern void
_mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg);
+extern void
+_mesa_reference_shader_program(GLcontext *ctx,
+ struct gl_shader_program **ptr,
+ struct gl_shader_program *shProg);
+
extern struct gl_shader_program *
_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
@@ -61,6 +70,10 @@ _mesa_new_shader(GLcontext *ctx, GLuint
extern void
_mesa_free_shader(GLcontext *ctx, struct gl_shader *sh);
+extern void
+_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+ struct gl_shader *sh);
+
extern struct gl_shader *
_mesa_lookup_shader(GLcontext *ctx, GLuint name);
diff-tree bf287356cfc806f9df862a05620f046f8980a8e7 (from bce7043ebcbb75cec727553341af4c66b03732ef)
Author: Brian <brian at yutani.localnet.net>
Date: Wed Apr 11 14:09:32 2007 -0600
restore 200x200 window size, animation, version check
diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c
index 736cc48..493ce0e 100644
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -45,7 +45,7 @@ static GLint uTexture;
static GLuint SphereList, RectList, CurList;
static GLint win = 0;
-static GLboolean anim = GL_FALSE;
+static GLboolean anim = GL_TRUE;
static GLboolean wire = GL_FALSE;
static GLboolean pixelLight = GL_TRUE;
@@ -477,8 +477,8 @@ Init(void)
version = (const char *) glGetString(GL_VERSION);
if (version[0] != '2' || version[1] != '.') {
- printf("Warning: this program expects OpenGL 2.0\n");
- /*exit(1);*/
+ printf("This program requires OpenGL 2.x, found %s\n", version);
+ exit(1);
}
GetExtensionFuncs();
@@ -579,6 +579,8 @@ Init(void)
#if 0
TestFunctions();
+#else
+ (void) TestFunctions;
#endif
}
@@ -603,7 +605,7 @@ main(int argc, char *argv[])
{
glutInit(&argc, argv);
glutInitWindowPosition( 0, 0);
- glutInitWindowSize(100, 100);
+ glutInitWindowSize(200, 200);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
win = glutCreateWindow(argv[0]);
glutReshapeFunc(Reshape);
More information about the mesa-commit
mailing list