Mesa (master): mesa: don' t use drivers NewShader function when creating shader objects

Timothy Arceri tarceri at kemper.freedesktop.org
Thu Jun 30 08:05:22 UTC 2016


Module: Mesa
Branch: master
Commit: 9e9d01cbe802df386586db3fde1a531151b6d66a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e9d01cbe802df386586db3fde1a531151b6d66a

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Mon Jun 27 16:10:35 2016 +1000

mesa: don't use drivers NewShader function when creating shader objects

The drivers function only needs to be used when creating a struct for
linked shaders.

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

---

 src/mesa/main/shaderapi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 07250cd..142e750 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -334,8 +334,7 @@ create_shader(struct gl_context *ctx, GLenum type)
 
    _mesa_HashLockMutex(ctx->Shared->ShaderObjects);
    name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-   sh = ctx->Driver.NewShader(ctx, name,
-                              _mesa_shader_enum_to_shader_stage(type));
+   sh = _mesa_new_shader(ctx, name, _mesa_shader_enum_to_shader_stage(type));
    sh->Type = type;
    _mesa_HashInsertLocked(ctx->Shared->ShaderObjects, name, sh);
    _mesa_HashUnlockMutex(ctx->Shared->ShaderObjects);




More information about the mesa-commit mailing list