mesa: Branch 'master' - 4 commits
Brian Paul
brianp at kemper.freedesktop.org
Thu Apr 12 21:24:25 UTC 2007
progs/demos/fslight.c | 10 +
src/mesa/shader/shader_api.c | 202 +++++++++++++++++++++++++---------
src/mesa/shader/shader_api.h | 13 ++
src/mesa/shader/slang/slang_codegen.c | 95 +++++++++++----
src/mesa/shader/slang/slang_link.c | 2
5 files changed, 241 insertions(+), 81 deletions(-)
New commits:
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