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 5cd37d7e4c49317b3f23f1f295ab045525a6e041..203ccef7fc400ff09f336d8672168179812b9c32 100644
(file)
--- a/
src/mesa/main/shaderobj.c
+++ b/
src/mesa/main/shaderobj.c
@@
-74,7
+74,7
@@
_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
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;
@@
-116,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);
@@
-210,7
+209,7
@@
_mesa_reference_shader_program_(struct gl_context *ctx,
if (deleteFlag) {
if (old->Name != 0)
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
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;
@@
-246,9
+245,8
@@
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 *
+struct gl_shader_program *
_mesa_new_shader_program(GLuint name)
{
struct gl_shader_program *shProg;
_mesa_new_shader_program(GLuint name)
{
struct gl_shader_program *shProg;
@@
-292,12
+290,12
@@
_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;
+ ralloc_free(shProg->
BufferInterface
Blocks);
+ shProg->
BufferInterface
Blocks = NULL;
shProg->NumBufferInterfaceBlocks = 0;
for (i = 0; i < MESA_SHADER_STAGES; i++) {
shProg->NumBufferInterfaceBlocks = 0;
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);
}
ralloc_free(shProg->AtomicBuffers);
@@
-362,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;
}
}
@@
-374,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);
@@
-439,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;
}