projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: improve debug log in atifragshader
[mesa.git]
/
src
/
mesa
/
main
/
shaderobj.c
diff --git
a/src/mesa/main/shaderobj.c
b/src/mesa/main/shaderobj.c
index e703d42738fdfb8bdb004a289a5a2e05fe2201f9..203ccef7fc400ff09f336d8672168179812b9c32 100644
(file)
--- a/
src/mesa/main/shaderobj.c
+++ b/
src/mesa/main/shaderobj.c
@@
-67,16
+67,14
@@
_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
GLboolean deleteFlag = GL_FALSE;
struct gl_shader *old = *ptr;
GLboolean deleteFlag = GL_FALSE;
struct gl_shader *old = *ptr;
-
ASSERT
(old->RefCount > 0);
+
assert
(old->RefCount > 0);
old->RefCount--;
old->RefCount--;
- /*printf("SHADER DECR %p (%d) to %d\n",
- (void*) old, old->Name, old->RefCount);*/
deleteFlag = (old->RefCount == 0);
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
deleteFlag = (old->RefCount == 0);
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-
ctx->Driver.DeleteS
hader(ctx, old);
+
_mesa_delete_s
hader(ctx, old);
}
*ptr = NULL;
}
*ptr = NULL;
@@
-86,8
+84,6
@@
_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
if (sh) {
/* reference new */
sh->RefCount++;
if (sh) {
/* reference new */
sh->RefCount++;
- /*printf("SHADER INCR %p (%d) to %d\n",
- (void*) sh, sh->Name, sh->RefCount);*/
*ptr = sh;
}
}
*ptr = sh;
}
}
@@
-120,9
+116,8
@@
_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)
/**
* Delete a shader object.
/**
* Delete a shader object.
- * Called via ctx->Driver.DeleteShader().
*/
*/
-
static
void
+void
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
{
free((void *)sh->Source);
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
{
free((void *)sh->Source);
@@
-193,9
+188,9
@@
_mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller)
* Then set ptr to point to shProg, incrementing its refcount.
*/
void
* Then set ptr to point to shProg, incrementing its refcount.
*/
void
-_mesa_reference_shader_program(struct gl_context *ctx,
- struct gl_shader_program **ptr,
- struct gl_shader_program *shProg)
+_mesa_reference_shader_program
_
(struct gl_context *ctx,
+
struct gl_shader_program **ptr,
+
struct gl_shader_program *shProg)
{
assert(ptr);
if (*ptr == shProg) {
{
assert(ptr);
if (*ptr == shProg) {
@@
-207,18
+202,14
@@
_mesa_reference_shader_program(struct gl_context *ctx,
GLboolean deleteFlag = GL_FALSE;
struct gl_shader_program *old = *ptr;
GLboolean deleteFlag = GL_FALSE;
struct gl_shader_program *old = *ptr;
-
ASSERT
(old->RefCount > 0);
+
assert
(old->RefCount > 0);
old->RefCount--;
old->RefCount--;
-#if 0
- printf("ShaderProgram %p ID=%u RefCount-- to %d\n",
- (void *) old, old->Name, old->RefCount);
-#endif
deleteFlag = (old->RefCount == 0);
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
deleteFlag = (old->RefCount == 0);
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-
ctx->Driver.DeleteShaderP
rogram(ctx, old);
+
_mesa_delete_shader_p
rogram(ctx, old);
}
*ptr = NULL;
}
*ptr = NULL;
@@
-227,16
+218,12
@@
_mesa_reference_shader_program(struct gl_context *ctx,
if (shProg) {
shProg->RefCount++;
if (shProg) {
shProg->RefCount++;
-#if 0
- printf("ShaderProgram %p ID=%u RefCount++ to %d\n",
- (void *) shProg, shProg->Name, shProg->RefCount);
-#endif
*ptr = shProg;
}
}
*ptr = shProg;
}
}
-void
-
_mesa_
init_shader_program(struct gl_shader_program *prog)
+
static
void
+init_shader_program(struct gl_shader_program *prog)
{
prog->Type = GL_SHADER_PROGRAM_MESA;
prog->RefCount = 1;
{
prog->Type = GL_SHADER_PROGRAM_MESA;
prog->RefCount = 1;
@@
-258,16
+245,15
@@
_mesa_init_shader_program(struct gl_shader_program *prog)
/**
* Allocate a new gl_shader_program object, initialize it.
/**
* Allocate a new gl_shader_program object, initialize it.
- * Called via ctx->Driver.NewShaderProgram()
*/
*/
-st
atic st
ruct gl_shader_program *
-_mesa_new_shader_program(
struct gl_context *ctx,
GLuint name)
+struct gl_shader_program *
+_mesa_new_shader_program(GLuint name)
{
struct gl_shader_program *shProg;
shProg = rzalloc(NULL, struct gl_shader_program);
if (shProg) {
shProg->Name = name;
{
struct gl_shader_program *shProg;
shProg = rzalloc(NULL, struct gl_shader_program);
if (shProg) {
shProg->Name = name;
-
_mesa_
init_shader_program(shProg);
+ init_shader_program(shProg);
}
return shProg;
}
}
return shProg;
}
@@
-282,10
+268,10
@@
_mesa_clear_shader_program_data(struct gl_shader_program *shProg)
unsigned i;
if (shProg->UniformStorage) {
unsigned i;
if (shProg->UniformStorage) {
- for (i = 0; i < shProg->NumU
serU
niformStorage; ++i)
+ for (i = 0; i < shProg->NumUniformStorage; ++i)
_mesa_uniform_detach_all_driver_storage(&shProg->UniformStorage[i]);
ralloc_free(shProg->UniformStorage);
_mesa_uniform_detach_all_driver_storage(&shProg->UniformStorage[i]);
ralloc_free(shProg->UniformStorage);
- shProg->NumU
serU
niformStorage = 0;
+ shProg->NumUniformStorage = 0;
shProg->UniformStorage = NULL;
}
shProg->UniformStorage = NULL;
}
@@
-304,17
+290,23
@@
_mesa_clear_shader_program_data(struct gl_shader_program *shProg)
ralloc_free(shProg->InfoLog);
shProg->InfoLog = ralloc_strdup(shProg, "");
ralloc_free(shProg->InfoLog);
shProg->InfoLog = ralloc_strdup(shProg, "");
- ralloc_free(shProg->
Uniform
Blocks);
- shProg->
Uniform
Blocks = NULL;
- shProg->Num
Uniform
Blocks = 0;
+ ralloc_free(shProg->
BufferInterface
Blocks);
+ shProg->
BufferInterface
Blocks = NULL;
+ shProg->Num
BufferInterface
Blocks = 0;
for (i = 0; i < MESA_SHADER_STAGES; i++) {
for (i = 0; i < MESA_SHADER_STAGES; i++) {
- ralloc_free(shProg->
Uniform
BlockStageIndex[i]);
- shProg->
Uniform
BlockStageIndex[i] = NULL;
+ ralloc_free(shProg->
Interface
BlockStageIndex[i]);
+ shProg->
Interface
BlockStageIndex[i] = NULL;
}
ralloc_free(shProg->AtomicBuffers);
shProg->AtomicBuffers = NULL;
shProg->NumAtomicBuffers = 0;
}
ralloc_free(shProg->AtomicBuffers);
shProg->AtomicBuffers = NULL;
shProg->NumAtomicBuffers = 0;
+
+ if (shProg->ProgramResourceList) {
+ ralloc_free(shProg->ProgramResourceList);
+ shProg->ProgramResourceList = NULL;
+ shProg->NumProgramResourceList = 0;
+ }
}
}
@@
-368,7
+360,7
@@
_mesa_free_shader_program_data(struct gl_context *ctx,
for (sh = 0; sh < MESA_SHADER_STAGES; sh++) {
if (shProg->_LinkedShaders[sh] != NULL) {
for (sh = 0; sh < MESA_SHADER_STAGES; sh++) {
if (shProg->_LinkedShaders[sh] != NULL) {
-
ctx->Driver.DeleteS
hader(ctx, shProg->_LinkedShaders[sh]);
+
_mesa_delete_s
hader(ctx, shProg->_LinkedShaders[sh]);
shProg->_LinkedShaders[sh] = NULL;
}
}
shProg->_LinkedShaders[sh] = NULL;
}
}
@@
-380,10
+372,10
@@
_mesa_free_shader_program_data(struct gl_context *ctx,
/**
* Free/delete a shader program object.
/**
* Free/delete a shader program object.
- * Called via ctx->Driver.DeleteShaderProgram().
*/
*/
-static void
-_mesa_delete_shader_program(struct gl_context *ctx, struct gl_shader_program *shProg)
+void
+_mesa_delete_shader_program(struct gl_context *ctx,
+ struct gl_shader_program *shProg)
{
_mesa_free_shader_program_data(ctx, shProg);
{
_mesa_free_shader_program_data(ctx, shProg);
@@
-445,8
+437,5
@@
void
_mesa_init_shader_object_functions(struct dd_function_table *driver)
{
driver->NewShader = _mesa_new_shader;
_mesa_init_shader_object_functions(struct dd_function_table *driver)
{
driver->NewShader = _mesa_new_shader;
- driver->DeleteShader = _mesa_delete_shader;
- driver->NewShaderProgram = _mesa_new_shader_program;
- driver->DeleteShaderProgram = _mesa_delete_shader_program;
driver->LinkShader = _mesa_ir_link_shader;
}
driver->LinkShader = _mesa_ir_link_shader;
}